From ca8d2fe78f9646bc1aedc003e5005c392aa7861d Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 22 Apr 2022 19:58:12 +0200 Subject: [PATCH 1/3] meta: switch to nixpkgs/nixos-21.11-small --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index dc5b462..476c513 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Private Void system configurations"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11-small"; nix-super.url = "git+https://git.privatevoid.net/max/nix-super-fork"; nix-super.inputs.nixpkgs.follows = "nixpkgs"; From 087b59780df738ca1185fb7762ff60befb0322a1 Mon Sep 17 00:00:00 2001 From: Max Date: Fri, 22 Apr 2022 19:59:11 +0200 Subject: [PATCH 2/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'agenix': 'github:ryantm/agenix/764c975e74bce2f89a5106b68ec48e2b586f893c' (2022-03-09) → 'github:ryantm/agenix/0d5e59ed645e4c7b60174bc6f6aac6a203dc0b01' (2022-04-02) • Updated input 'devshell': 'github:numtide/devshell/0a5ff74dacb9ea22614f64e61aeb3ca0bf0e7311' (2022-03-21) → 'github:numtide/devshell/5a53bbf3eb4c908d83884d725a86b3a3bde35979' (2022-04-19) • Updated input 'dream2nix': 'github:nix-community/dream2nix/170a157b1f5c145d4dfd4ce7620e265e0cbb3775' (2022-03-30) → 'github:nix-community/dream2nix/890183d2c6b48558497039b632389c6c805cb807' (2022-04-20) • Updated input 'dream2nix/alejandra': 'github:kamadorueda/alejandra/511c3f6a88b6964e1496fb6f441f4ae5e58bd3ea' (2022-03-04) → 'github:kamadorueda/alejandra/5cbb3486c7959646f452830c0a223edc5db5b951' (2022-03-26) • Updated input 'dream2nix/alejandra/flakeCompat': 'github:edolstra/flake-compat/b7547d3eed6f32d06102ead8991ec52ab0a4f1a7' (2022-01-03) → 'github:edolstra/flake-compat/64a525ee38886ab9028e6f61790de0832aa3ef03' (2022-03-25) • Updated input 'hercules-ci-agent': 'github:hercules-ci/hercules-ci-agent/dd464d52c067a95f05379781ad455d87dee68231' (2022-04-01) → 'github:hercules-ci/hercules-ci-agent/56a8925fb519ce25a4ff8376ab76607a7d1b49ec' (2022-04-08) • Removed input 'hercules-ci-agent/flake-compat' • Updated input 'hercules-ci-agent/nix-darwin': 'github:LnL7/nix-darwin/17fbc68a6110edbff67e55f7450230a697ecb17e' (2022-03-13) → 'github:LnL7/nix-darwin/4fdbb8168f61d31d3f90bb0d07f48de709c4fe79' (2022-03-26) • Updated input 'hercules-ci-agent/nixos-unstable': 'github:hercules-ci/nixpkgs/70e6eb9ec8d548b836f8dedbf63d86a6bd737dc3' (2022-03-16) → 'github:NixOS/nixpkgs/5df8b35e4f4074bd8b77eed10b267b6e5d029d6c' (2022-04-08) • Updated input 'home-manager': 'github:nix-community/home-manager/e1fab012e872c129099535b5b535fc2347cfa6f4' (2022-04-01) → 'github:nix-community/home-manager/93a69d07389311ffd6ce1f4d01836bbc2faec644' (2022-04-20) • Updated input 'nix-super': 'git+https://git.privatevoid.net/max/nix-super-fork?ref=master&rev=72a3790b643ed8817c8cdb900056261d9e5922be' (2022-03-31) → 'git+https://git.privatevoid.net/max/nix-super-fork?ref=master&rev=0883a093d9d23401ddac12b3a94f38c8ed135428' (2022-04-15) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/efea022d6fe0da84aa6613d4ddeafb80de713457' (2022-03-30) → 'github:NixOS/nixpkgs/692729210d05e0ae2f33edfc072318520dd12666' (2022-04-22) --- flake.lock | 94 ++++++++++++++++++++++-------------------------------- 1 file changed, 38 insertions(+), 56 deletions(-) diff --git a/flake.lock b/flake.lock index fc58c12..47fd11b 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1646845404, - "narHash": "sha256-JENXFCI2HVqi0whBzt7MAW9PX3ziEaYqBhMux+4g+VM=", + "lastModified": 1648942457, + "narHash": "sha256-i29Z1t3sVfCNfpp+KAfeExvpqHQSbLO1KWylTtfradU=", "owner": "ryantm", "repo": "agenix", - "rev": "764c975e74bce2f89a5106b68ec48e2b586f893c", + "rev": "0d5e59ed645e4c7b60174bc6f6aac6a203dc0b01", "type": "github" }, "original": { @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1646360966, - "narHash": "sha256-fJ/WHSU45bMJRDqz9yA3B2lwXtW5DKooU+Pzn13GyZI=", + "lastModified": 1648332543, + "narHash": "sha256-9FWmFNLCOp4y0I8Yb4GvgGXxtDq3nBDSTI9qyCi2LJ4=", "owner": "kamadorueda", "repo": "alejandra", - "rev": "511c3f6a88b6964e1496fb6f441f4ae5e58bd3ea", + "rev": "5cbb3486c7959646f452830c0a223edc5db5b951", "type": "github" }, "original": { @@ -86,11 +86,11 @@ ] }, "locked": { - "lastModified": 1647857022, - "narHash": "sha256-Aw70NWLOIwKhT60MHDGjgWis3DP3faCzr6ap9CSayek=", + "lastModified": 1650389807, + "narHash": "sha256-GFRBdHMJ/T/ifaE2GS58RWpxyufH0LqI3oGS6oWAnHk=", "owner": "numtide", "repo": "devshell", - "rev": "0a5ff74dacb9ea22614f64e61aeb3ca0bf0e7311", + "rev": "5a53bbf3eb4c908d83884d725a86b3a3bde35979", "type": "github" }, "original": { @@ -114,11 +114,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1648633606, - "narHash": "sha256-Xsnq7f1zXj4wyZTuwhlOQV3naVAeOoevXAFYtOtYRA0=", + "lastModified": 1650467218, + "narHash": "sha256-jh7wrVxVuX32GMr1pXWkF3DAJS991mj00SwyIfI98iw=", "owner": "nix-community", "repo": "dream2nix", - "rev": "170a157b1f5c145d4dfd4ce7620e265e0cbb3775", + "rev": "890183d2c6b48558497039b632389c6c805cb807", "type": "github" }, "original": { @@ -144,22 +144,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1641205782, - "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1603796912, @@ -274,11 +258,11 @@ "flakeCompat": { "flake": false, "locked": { - "lastModified": 1641205782, - "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", + "lastModified": 1648199409, + "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", + "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", "type": "github" }, "original": { @@ -305,18 +289,17 @@ }, "hercules-ci-agent": { "inputs": { - "flake-compat": "flake-compat_2", "flake-modules-core": "flake-modules-core", "nix-darwin": "nix-darwin", "nixos-unstable": "nixos-unstable", "pre-commit-hooks-nix": "pre-commit-hooks-nix" }, "locked": { - "lastModified": 1648833539, - "narHash": "sha256-t9zOxuiN4rT9TZp/0GKrIWjt/qihNCyow+AEs/1P7+I=", + "lastModified": 1649443307, + "narHash": "sha256-R5WJbQtGeE+sLciMRefrosyLSwOR4VB52gJSgDyKH7c=", "owner": "hercules-ci", "repo": "hercules-ci-agent", - "rev": "dd464d52c067a95f05379781ad455d87dee68231", + "rev": "56a8925fb519ce25a4ff8376ab76607a7d1b49ec", "type": "github" }, "original": { @@ -332,11 +315,11 @@ ] }, "locked": { - "lastModified": 1648827187, - "narHash": "sha256-lNQqw80uMiUb1GgD4QTCc4bsAXPk7/jwH70J9/0e+QA=", + "lastModified": 1650478719, + "narHash": "sha256-308c2cM4hW9AW6dSQ080ycXGyEJGkG/OwOINkYL9Mnw=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1fab012e872c129099535b5b535fc2347cfa6f4", + "rev": "93a69d07389311ffd6ce1f4d01836bbc2faec644", "type": "github" }, "original": { @@ -395,7 +378,7 @@ }, "mms": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_3", "nix": "nix", "nixpkgs": [ @@ -462,11 +445,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1647173930, - "narHash": "sha256-8oca3Pc68VrCp8HeOtHmzs5g0rdQnPO9beDEEZJ02W0=", + "lastModified": 1648278671, + "narHash": "sha256-1WrR9ex+rKTjZtODNUZQhkWYUprtfOkjOyo9YWL2NMs=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "17fbc68a6110edbff67e55f7450230a697ecb17e", + "rev": "4fdbb8168f61d31d3f90bb0d07f48de709c4fe79", "type": "github" }, "original": { @@ -484,11 +467,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1648684941, - "narHash": "sha256-OW5b5UmvWhEm8Nj3tNtQ0v7566Ym7o8kh3LuUQ3ZicI=", + "lastModified": 1650040615, + "narHash": "sha256-kUpPsz2XRBaXuJ/z9tAtL5TLTApdwrcHCmzzfmARn58=", "ref": "master", - "rev": "72a3790b643ed8817c8cdb900056261d9e5922be", - "revCount": 11807, + "rev": "0883a093d9d23401ddac12b3a94f38c8ed135428", + "revCount": 11896, "type": "git", "url": "https://git.privatevoid.net/max/nix-super-fork" }, @@ -499,16 +482,15 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1647445921, - "narHash": "sha256-lNPvVxLLSN6V9nbEzh1XJpusI4W1M1QHBQVEVqkg1+Q=", - "owner": "hercules-ci", + "lastModified": 1649417654, + "narHash": "sha256-IKC+25OiNIGPIGs0iBg/gx1lrGR4N5MGe5x+sGi7vzw=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "70e6eb9ec8d548b836f8dedbf63d86a6bd737dc3", + "rev": "5df8b35e4f4074bd8b77eed10b267b6e5d029d6c", "type": "github" }, "original": { - "owner": "hercules-ci", - "ref": "haskell-updates-ghc-9.0-stack", + "owner": "NixOS", "repo": "nixpkgs", "type": "github" } @@ -589,16 +571,16 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1648648646, - "narHash": "sha256-pHAq/GvsP7zRHkUTCs+4d31C0IEtTIuC6/TFASIA+zg=", + "lastModified": 1650610227, + "narHash": "sha256-ofSO6FrMfC8+wmYy6ItxOfXpN0E6sumnQYQCauMjKvM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "efea022d6fe0da84aa6613d4ddeafb80de713457", + "rev": "692729210d05e0ae2f33edfc072318520dd12666", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-21.11", + "ref": "nixos-21.11-small", "repo": "nixpkgs", "type": "github" } From c8a35032922c73b480fd5234e5f5a1e4a5e1fd02 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 27 Apr 2022 02:06:18 +0200 Subject: [PATCH 3/3] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'devshell': 'github:numtide/devshell/5a53bbf3eb4c908d83884d725a86b3a3bde35979' (2022-04-19) → 'github:numtide/devshell/d97df53b5ddaa1cfbea7cddbd207eb2634304733' (2022-04-25) • Updated input 'dream2nix': 'github:nix-community/dream2nix/890183d2c6b48558497039b632389c6c805cb807' (2022-04-20) → 'github:nix-community/dream2nix/c93972bd52977de332812fcc97ff77f8b85bcf42' (2022-04-25) • Updated input 'hercules-ci-agent': 'github:hercules-ci/hercules-ci-agent/56a8925fb519ce25a4ff8376ab76607a7d1b49ec' (2022-04-08) → 'github:hercules-ci/hercules-ci-agent/2da921cf6f6d95fba10ba7ec93578bcb02d89231' (2022-04-26) • Updated input 'home-manager': 'github:nix-community/home-manager/93a69d07389311ffd6ce1f4d01836bbc2faec644' (2022-04-20) → 'github:nix-community/home-manager/778af87a981eb2bfa3566dff8c3fb510856329ef' (2022-04-26) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/692729210d05e0ae2f33edfc072318520dd12666' (2022-04-22) → 'github:NixOS/nixpkgs/a3917caedfead19f853aa5769de4c3ea4e4db584' (2022-04-26) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 47fd11b..94a65e3 100644 --- a/flake.lock +++ b/flake.lock @@ -86,11 +86,11 @@ ] }, "locked": { - "lastModified": 1650389807, - "narHash": "sha256-GFRBdHMJ/T/ifaE2GS58RWpxyufH0LqI3oGS6oWAnHk=", + "lastModified": 1650900878, + "narHash": "sha256-qhNncMBSa9STnhiLfELEQpYC1L4GrYHNIzyCZ/pilsI=", "owner": "numtide", "repo": "devshell", - "rev": "5a53bbf3eb4c908d83884d725a86b3a3bde35979", + "rev": "d97df53b5ddaa1cfbea7cddbd207eb2634304733", "type": "github" }, "original": { @@ -114,11 +114,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1650467218, - "narHash": "sha256-jh7wrVxVuX32GMr1pXWkF3DAJS991mj00SwyIfI98iw=", + "lastModified": 1650924659, + "narHash": "sha256-tWF0/yM+5yB5NSvc3NXAhkya4KSswKczzrTkFR6DucY=", "owner": "nix-community", "repo": "dream2nix", - "rev": "890183d2c6b48558497039b632389c6c805cb807", + "rev": "c93972bd52977de332812fcc97ff77f8b85bcf42", "type": "github" }, "original": { @@ -295,11 +295,11 @@ "pre-commit-hooks-nix": "pre-commit-hooks-nix" }, "locked": { - "lastModified": 1649443307, - "narHash": "sha256-R5WJbQtGeE+sLciMRefrosyLSwOR4VB52gJSgDyKH7c=", + "lastModified": 1650986041, + "narHash": "sha256-D3tzjgLOt7I25iT0THEP2dz8PQHpWgJ2zPt7C5VeOrY=", "owner": "hercules-ci", "repo": "hercules-ci-agent", - "rev": "56a8925fb519ce25a4ff8376ab76607a7d1b49ec", + "rev": "2da921cf6f6d95fba10ba7ec93578bcb02d89231", "type": "github" }, "original": { @@ -315,11 +315,11 @@ ] }, "locked": { - "lastModified": 1650478719, - "narHash": "sha256-308c2cM4hW9AW6dSQ080ycXGyEJGkG/OwOINkYL9Mnw=", + "lastModified": 1651007090, + "narHash": "sha256-C/OoQRzTUOWEr1sd3xTKA2GudA1YG1XB3MlL6KfTchg=", "owner": "nix-community", "repo": "home-manager", - "rev": "93a69d07389311ffd6ce1f4d01836bbc2faec644", + "rev": "778af87a981eb2bfa3566dff8c3fb510856329ef", "type": "github" }, "original": { @@ -571,11 +571,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1650610227, - "narHash": "sha256-ofSO6FrMfC8+wmYy6ItxOfXpN0E6sumnQYQCauMjKvM=", + "lastModified": 1650998007, + "narHash": "sha256-NcJnbGDBBN023x8s3ll3HZxBcQoPq1ry9E2sjg+4flc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "692729210d05e0ae2f33edfc072318520dd12666", + "rev": "a3917caedfead19f853aa5769de4c3ea4e4db584", "type": "github" }, "original": {