From 8cbd3cb2debff97c13112f7b5be4addc2444c752 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 16 Oct 2022 01:24:25 +0000 Subject: [PATCH 01/10] 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/6acb1fe5f8597d5ce63fc82bc7fcac7774b1cdf0' (2022-09-25) → 'github:ryantm/agenix/a630400067c6d03c9b3e0455347dc8559db14288' (2022-10-15) • Updated input 'dream2nix': 'github:nix-community/dream2nix/b54f6403f4e0b4696f0502fbf4ead24d874fadd4' (2022-09-20) → 'github:nix-community/dream2nix/cfd0f9f368dec38011ff48dd831e8b166266bab7' (2022-10-15) • Added input 'dream2nix/all-cabal-json': 'github:nix-community/all-cabal-json/d7c0434eebffb305071404edcf9d5cd99703878e' (2022-10-12) • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/45298bd207b26e1bcd030a0bb075aa2da29f8e30' (2022-09-28) → 'github:hercules-ci/flake-parts/08ce9a42392cf8c7fdabf7c51069381ba5455dc7' (2022-10-11) • Removed input 'flake-parts/nixpkgs' • Added input 'flake-parts/nixpkgs-lib': 'github:NixOS/nixpkgs/34c5293a71ffdb2fe054eb5288adc1882c1eb0b1?dir=lib' (2022-10-09) • Updated input 'hercules-ci-agent': 'github:hercules-ci/hercules-ci-agent/64d13d65d757170eb733058b578276cc51d5de2d' (2022-09-07) → 'github:hercules-ci/hercules-ci-agent/b0207f60cab691961ae98c2807f2bf443ebfc2d8' (2022-10-14) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/9cac45850280978a21a3eb67b15a18f34cbffa2d' (2022-10-01) → 'github:NixOS/nixpkgs/588d57d82fc7592a5a09a7054e3857352f77faf1' (2022-10-14) --- flake.lock | 70 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 52 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index c3d125d..a590754 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1664140963, - "narHash": "sha256-pFxDtOLduRFlol0Y4ShE+soRQX4kbhaCNBtDOvx7ykw=", + "lastModified": 1665870395, + "narHash": "sha256-Tsbqb27LDNxOoPLh0gw2hIb6L/6Ow/6lIBvqcHzEKBI=", "owner": "ryantm", "repo": "agenix", - "rev": "6acb1fe5f8597d5ce63fc82bc7fcac7774b1cdf0", + "rev": "a630400067c6d03c9b3e0455347dc8559db14288", "type": "github" }, "original": { @@ -43,6 +43,23 @@ "type": "github" } }, + "all-cabal-json": { + "flake": false, + "locked": { + "lastModified": 1665552503, + "narHash": "sha256-r14RmRSwzv5c+bWKUDaze6pXM7nOsiz1H8nvFHJvufc=", + "owner": "nix-community", + "repo": "all-cabal-json", + "rev": "d7c0434eebffb305071404edcf9d5cd99703878e", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "hackage", + "repo": "all-cabal-json", + "type": "github" + } + }, "crane": { "flake": false, "locked": { @@ -129,6 +146,7 @@ "dream2nix": { "inputs": { "alejandra": "alejandra", + "all-cabal-json": "all-cabal-json", "crane": "crane", "devshell": "devshell_2", "flake-utils-pre-commit": [ @@ -143,11 +161,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1663716058, - "narHash": "sha256-VT/JDqI/OHr68fVcOl4dr+ob2GPAKQIIG9FATr+0b0U=", + "lastModified": 1665838603, + "narHash": "sha256-fMcodLUF7ze7lmV7uCsIf/MUcEDF08ISKcP4lPjLDOk=", "owner": "nix-community", "repo": "dream2nix", - "rev": "b54f6403f4e0b4696f0502fbf4ead24d874fadd4", + "rev": "cfd0f9f368dec38011ff48dd831e8b166266bab7", "type": "github" }, "original": { @@ -181,16 +199,14 @@ }, "flake-parts": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1664385320, - "narHash": "sha256-uSCHb9RUqHRjTpI8OzyaUuHckFnnxwZqlXEuo+yUpYQ=", + "lastModified": 1665512413, + "narHash": "sha256-IeuXVWD+VkmdVdC3d2i7mdEWhNSEvc2GUdui09zAGpE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "45298bd207b26e1bcd030a0bb075aa2da29f8e30", + "rev": "08ce9a42392cf8c7fdabf7c51069381ba5455dc7", "type": "github" }, "original": { @@ -258,11 +274,11 @@ "pre-commit-hooks-nix": "pre-commit-hooks-nix" }, "locked": { - "lastModified": 1662558281, - "narHash": "sha256-FOsw9gQo4aATPKI0y2zW0PQGu+eoMcscj8ulScadbis=", + "lastModified": 1665739697, + "narHash": "sha256-UvjnKP3kMtW/UzV8x/ltzO16cIf/wS+a4LlEpXA/GPw=", "owner": "hercules-ci", "repo": "hercules-ci-agent", - "rev": "64d13d65d757170eb733058b578276cc51d5de2d", + "rev": "b0207f60cab691961ae98c2807f2bf443ebfc2d8", "type": "github" }, "original": { @@ -437,11 +453,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1664594436, - "narHash": "sha256-YHowMADGzdi7fKnGlg47qe0PIljq+11VqLarmXDuKxQ=", + "lastModified": 1665778117, + "narHash": "sha256-dXjvYaWFpTAwnOy395FFHTjmPC//V7AdzKAJjNdNX+A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9cac45850280978a21a3eb67b15a18f34cbffa2d", + "rev": "588d57d82fc7592a5a09a7054e3857352f77faf1", "type": "github" }, "original": { @@ -451,6 +467,24 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1665349835, + "narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-regression": { "locked": { "lastModified": 1643052045, From afa3f8ed0447b52e982bf40984fd5e6a41935e86 Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 16 Oct 2022 21:20:08 +0200 Subject: [PATCH 02/10] meta: pin nixpkgs-lib for flake-parts --- flake.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index ab1cc39..c567964 100644 --- a/flake.nix +++ b/flake.nix @@ -93,6 +93,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05-small"; + nixpkgs-lib.url = "github:NixOS/nixpkgs/nixos-22.05-small?dir=lib"; nix-super = { url = "gitlab:max/nix-super?host=git.privatevoid.net"; @@ -164,7 +165,7 @@ flake-parts = { url = "github:hercules-ci/flake-parts"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs-lib.follows = "nixpkgs-lib"; }; nix-filter.url = "github:numtide/nix-filter"; From 2de754776389c7e056ede89df2ba6c0b2c8d42a3 Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 16 Oct 2022 21:20:59 +0200 Subject: [PATCH 03/10] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'flake-parts/nixpkgs-lib': 'github:NixOS/nixpkgs/34c5293a71ffdb2fe054eb5288adc1882c1eb0b1?dir=lib' (2022-10-09) → follows 'nixpkgs-lib' • Added input 'nixpkgs-lib': 'github:NixOS/nixpkgs/945a85cb7ee31f5f8c49432d77b610b777662d4f?dir=lib' (2022-10-15) --- flake.lock | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index a590754..93b43bd 100644 --- a/flake.lock +++ b/flake.lock @@ -199,7 +199,9 @@ }, "flake-parts": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": [ + "nixpkgs-lib" + ] }, "locked": { "lastModified": 1665512413, @@ -470,17 +472,17 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1665349835, - "narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=", + "lastModified": 1665870850, + "narHash": "sha256-EkC/Kkc9cr2orI868OHnh6F8/aqS4TZy38ie+KnhfS8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1", + "rev": "945a85cb7ee31f5f8c49432d77b610b777662d4f", "type": "github" }, "original": { "dir": "lib", "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-22.05-small", "repo": "nixpkgs", "type": "github" } @@ -611,6 +613,7 @@ "nix-filter": "nix-filter", "nix-super": "nix-super", "nixpkgs": "nixpkgs", + "nixpkgs-lib": "nixpkgs-lib", "repin-flake-compat": "repin-flake-compat", "repin-flake-utils": "repin-flake-utils" } From 8e28151e0384d7cde2f4fc94ce17915705b6a390 Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 16 Oct 2022 21:21:34 +0200 Subject: [PATCH 04/10] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'dream2nix': 'github:nix-community/dream2nix/cfd0f9f368dec38011ff48dd831e8b166266bab7' (2022-10-15) → 'github:nix-community/dream2nix/fa708ced6f97b266092a54fc881b8f373290f505' (2022-10-16) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/588d57d82fc7592a5a09a7054e3857352f77faf1' (2022-10-14) → 'github:NixOS/nixpkgs/945a85cb7ee31f5f8c49432d77b610b777662d4f' (2022-10-15) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 93b43bd..684ba0d 100644 --- a/flake.lock +++ b/flake.lock @@ -161,11 +161,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1665838603, - "narHash": "sha256-fMcodLUF7ze7lmV7uCsIf/MUcEDF08ISKcP4lPjLDOk=", + "lastModified": 1665936754, + "narHash": "sha256-eAugmGOb0OtfZPBikOIbfZg0BV/sBui4EY1yfVFotAs=", "owner": "nix-community", "repo": "dream2nix", - "rev": "cfd0f9f368dec38011ff48dd831e8b166266bab7", + "rev": "fa708ced6f97b266092a54fc881b8f373290f505", "type": "github" }, "original": { @@ -455,11 +455,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1665778117, - "narHash": "sha256-dXjvYaWFpTAwnOy395FFHTjmPC//V7AdzKAJjNdNX+A=", + "lastModified": 1665870850, + "narHash": "sha256-EkC/Kkc9cr2orI868OHnh6F8/aqS4TZy38ie+KnhfS8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "588d57d82fc7592a5a09a7054e3857352f77faf1", + "rev": "945a85cb7ee31f5f8c49432d77b610b777662d4f", "type": "github" }, "original": { From a776b8eeb6760d0d4211f94b20a4a407d420863d Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 16 Oct 2022 21:59:11 +0200 Subject: [PATCH 05/10] meta: stub out all unnecessary inputs --- flake.nix | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index c567964..1ac4c9d 100644 --- a/flake.nix +++ b/flake.nix @@ -97,14 +97,17 @@ nix-super = { url = "gitlab:max/nix-super?host=git.privatevoid.net"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs = { + nixpkgs.follows = "nixpkgs"; + nixpkgs-regression.follows = "blank"; + }; }; deploy-rs = { url = "gitlab:max/deploy-rs?host=git.privatevoid.net"; inputs = { nixpkgs.follows = "nixpkgs"; - flake-compat.follows = "repin-flake-compat"; + flake-compat.follows = "blank"; utils.follows = "repin-flake-utils"; }; }; @@ -126,8 +129,15 @@ url = "github:nix-community/dream2nix"; inputs = { nixpkgs.follows = "nixpkgs"; - #alejandra.inputs.flakeCompat.follows = "repin-flake-compat"; - flake-utils-pre-commit.follows = "repin-flake-utils"; + alejandra.follows = "blank"; + all-cabal-json.follows = "blank"; + crane.follows = "blank"; + devshell.follows = "blank"; + flake-utils-pre-commit.follows = "blank"; + gomod2nix.follows = "blank"; + mach-nix.follows = "blank"; + poetry2nix.follows = "poetry2nix"; + pre-commit-hooks.follows = "blank"; }; }; @@ -144,7 +154,7 @@ inputs = { nixpkgs.follows = "nixpkgs"; nix.follows = "nix-super"; - flake-compat.follows = "repin-flake-compat"; + flake-compat.follows = "blank"; flake-utils.follows = "repin-flake-utils"; }; }; @@ -154,6 +164,7 @@ inputs = { nixpkgs.follows = "nixpkgs"; flake-parts.follows = "flake-parts"; + nix-darwin.follows = "blank"; }; }; hercules-ci-effects = { @@ -170,10 +181,16 @@ nix-filter.url = "github:numtide/nix-filter"; - repin-flake-compat = { - url = "github:edolstra/flake-compat"; - flake = false; - }; repin-flake-utils.url = "github:numtide/flake-utils"; + + blank.url = "github:divnix/blank"; + + poetry2nix = { + url = "github:nix-community/poetry2nix"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "repin-flake-utils"; + }; + }; }; } From 0174b707ff6d99a658f2a73fa3d7d99efbf2d7eb Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 17 Oct 2022 09:47:11 +0200 Subject: [PATCH 06/10] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Added input 'blank': 'github:divnix/blank/5a5d2684073d9f563072ed07c871d577a6c614a8' (2021-07-06) • Updated input 'deploy-rs/flake-compat': follows 'repin-flake-compat' → follows 'blank' • Updated input 'dream2nix/alejandra': 'github:kamadorueda/alejandra/f5a22afd2adfb249b4e68e0b33aa1f0fb73fb1be' (2022-07-21) → follows 'blank' • Removed input 'dream2nix/alejandra/fenix' • Removed input 'dream2nix/alejandra/fenix/nixpkgs' • Removed input 'dream2nix/alejandra/fenix/rust-analyzer-src' • Removed input 'dream2nix/alejandra/flakeCompat' • Removed input 'dream2nix/alejandra/nixpkgs' • Updated input 'dream2nix/all-cabal-json': 'github:nix-community/all-cabal-json/d7c0434eebffb305071404edcf9d5cd99703878e' (2022-10-12) → follows 'blank' • Updated input 'dream2nix/crane': 'github:ipetkov/crane/d9f394e4e20e97c2a60c3ad82c2b6ef99be19e24' (2022-08-30) → follows 'blank' • Updated input 'dream2nix/devshell': 'github:numtide/devshell/fc7a3e3adde9bbcab68af6d1e3c6eb738e296a92' (2022-05-30) → follows 'blank' • Updated input 'dream2nix/flake-utils-pre-commit': follows 'repin-flake-utils' → follows 'blank' • Updated input 'dream2nix/gomod2nix': 'github:tweag/gomod2nix/67f22dd738d092c6ba88e420350ada0ed4992ae8' (2021-07-29) → follows 'blank' • Updated input 'dream2nix/mach-nix': 'github:DavHau/mach-nix/4433f74a97b94b596fa6cd9b9c0402104aceef5d' (2021-10-20) → follows 'blank' • Updated input 'dream2nix/poetry2nix': 'github:nix-community/poetry2nix/aee8f04296c39d88155e05d25cfc59dfdd41cc77' (2021-09-30) → follows 'poetry2nix' • Updated input 'dream2nix/pre-commit-hooks': 'github:cachix/pre-commit-hooks.nix/b6bc0b21e1617e2b07d8205e7fae7224036dfa4b' (2022-03-01) → follows 'blank' • Removed input 'dream2nix/pre-commit-hooks/flake-utils' • Removed input 'dream2nix/pre-commit-hooks/nixpkgs' • Updated input 'hercules-ci-agent/nix-darwin': 'github:LnL7/nix-darwin/54a24f042f93c79f5679f133faddedec61955cf2' (2022-07-14) → follows 'blank' • Removed input 'hercules-ci-agent/nix-darwin/nixpkgs' • Updated input 'mms/flake-compat': follows 'repin-flake-compat' → follows 'blank' • Updated input 'nix-super/nixpkgs-regression': 'github:NixOS/nixpkgs/215d4d0fd80ca5163643b03a33fde804a29cc1e2' (2022-01-24) → follows 'blank' • Added input 'poetry2nix': 'github:nix-community/poetry2nix/d62ba59f1e28c382665c57203a4b9ad11fd7f449' (2022-10-11) • Added input 'poetry2nix/flake-utils': follows 'repin-flake-utils' • Added input 'poetry2nix/nixpkgs': follows 'nixpkgs' • Removed input 'repin-flake-compat' --- flake.lock | 299 ++++++++++------------------------------------------- 1 file changed, 52 insertions(+), 247 deletions(-) diff --git a/flake.lock b/flake.lock index 684ba0d..5e950e4 100644 --- a/flake.lock +++ b/flake.lock @@ -20,66 +20,25 @@ "type": "github" } }, - "alejandra": { - "inputs": { - "fenix": "fenix", - "flakeCompat": "flakeCompat", - "nixpkgs": [ - "dream2nix", - "nixpkgs" - ] - }, + "blank": { "locked": { - "lastModified": 1658427149, - "narHash": "sha256-ToD/1z/q5VHsLMrS2h96vjJoLho59eNRtknOUd19ey8=", - "owner": "kamadorueda", - "repo": "alejandra", - "rev": "f5a22afd2adfb249b4e68e0b33aa1f0fb73fb1be", + "lastModified": 1625557891, + "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=", + "owner": "divnix", + "repo": "blank", + "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8", "type": "github" }, "original": { - "owner": "kamadorueda", - "repo": "alejandra", - "type": "github" - } - }, - "all-cabal-json": { - "flake": false, - "locked": { - "lastModified": 1665552503, - "narHash": "sha256-r14RmRSwzv5c+bWKUDaze6pXM7nOsiz1H8nvFHJvufc=", - "owner": "nix-community", - "repo": "all-cabal-json", - "rev": "d7c0434eebffb305071404edcf9d5cd99703878e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "hackage", - "repo": "all-cabal-json", - "type": "github" - } - }, - "crane": { - "flake": false, - "locked": { - "lastModified": 1661875961, - "narHash": "sha256-f1h/2c6Teeu1ofAHWzrS8TwBPcnN+EEu+z1sRVmMQTk=", - "owner": "ipetkov", - "repo": "crane", - "rev": "d9f394e4e20e97c2a60c3ad82c2b6ef99be19e24", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", + "owner": "divnix", + "repo": "blank", "type": "github" } }, "deploy-rs": { "inputs": { "flake-compat": [ - "repin-flake-compat" + "blank" ], "nixpkgs": [ "nixpkgs" @@ -127,38 +86,38 @@ "type": "github" } }, - "devshell_2": { - "flake": false, - "locked": { - "lastModified": 1653917170, - "narHash": "sha256-FyxOnEE/V4PNEcMU62ikY4FfYPo349MOhMM97HS0XEo=", - "owner": "numtide", - "repo": "devshell", - "rev": "fc7a3e3adde9bbcab68af6d1e3c6eb738e296a92", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "dream2nix": { "inputs": { - "alejandra": "alejandra", - "all-cabal-json": "all-cabal-json", - "crane": "crane", - "devshell": "devshell_2", - "flake-utils-pre-commit": [ - "repin-flake-utils" + "alejandra": [ + "blank" + ], + "all-cabal-json": [ + "blank" + ], + "crane": [ + "blank" + ], + "devshell": [ + "blank" + ], + "flake-utils-pre-commit": [ + "blank" + ], + "gomod2nix": [ + "blank" + ], + "mach-nix": [ + "blank" ], - "gomod2nix": "gomod2nix", - "mach-nix": "mach-nix", "nixpkgs": [ "nixpkgs" ], - "poetry2nix": "poetry2nix", - "pre-commit-hooks": "pre-commit-hooks" + "poetry2nix": [ + "poetry2nix" + ], + "pre-commit-hooks": [ + "blank" + ] }, "locked": { "lastModified": 1665936754, @@ -174,29 +133,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "dream2nix", - "alejandra", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1657607339, - "narHash": "sha256-HaqoAwlbVVZH2n4P3jN2FFPMpVuhxDy1poNOR7kzODc=", - "owner": "nix-community", - "repo": "fenix", - "rev": "b814c83d9e6aa5a28d0cf356ecfdafb2505ad37d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -232,44 +168,14 @@ "type": "github" } }, - "flakeCompat": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "gomod2nix": { - "flake": false, - "locked": { - "lastModified": 1627572165, - "narHash": "sha256-MFpwnkvQpauj799b4QTBJQFEddbD02+Ln5k92QyHOSk=", - "owner": "tweag", - "repo": "gomod2nix", - "rev": "67f22dd738d092c6ba88e420350ada0ed4992ae8", - "type": "github" - }, - "original": { - "owner": "tweag", - "repo": "gomod2nix", - "type": "github" - } - }, "hercules-ci-agent": { "inputs": { "flake-parts": [ "flake-parts" ], - "nix-darwin": "nix-darwin", + "nix-darwin": [ + "blank" + ], "nixpkgs": [ "nixpkgs" ], @@ -325,25 +231,10 @@ "type": "github" } }, - "mach-nix": { - "flake": false, - "locked": { - "lastModified": 1634711045, - "narHash": "sha256-m5A2Ty88NChLyFhXucECj6+AuiMZPHXNbw+9Kcs7F6Y=", - "owner": "DavHau", - "repo": "mach-nix", - "rev": "4433f74a97b94b596fa6cd9b9c0402104aceef5d", - "type": "github" - }, - "original": { - "id": "mach-nix", - "type": "indirect" - } - }, "mms": { "inputs": { "flake-compat": [ - "repin-flake-compat" + "blank" ], "flake-utils": [ "repin-flake-utils" @@ -393,27 +284,6 @@ "type": "github" } }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "hercules-ci-agent", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1657835815, - "narHash": "sha256-CnZszAYpNKydh6N7+xg+eRtWNVoAAGqc6bg+Lpgq1xc=", - "owner": "LnL7", - "repo": "nix-darwin", - "rev": "54a24f042f93c79f5679f133faddedec61955cf2", - "type": "github" - }, - "original": { - "owner": "LnL7", - "repo": "nix-darwin", - "type": "github" - } - }, "nix-filter": { "locked": { "lastModified": 1661201956, @@ -435,7 +305,9 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-regression": "nixpkgs-regression" + "nixpkgs-regression": [ + "blank" + ] }, "locked": { "host": "git.privatevoid.net", @@ -487,61 +359,26 @@ "type": "github" } }, - "nixpkgs-regression": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, "poetry2nix": { - "flake": false, - "locked": { - "lastModified": 1632969109, - "narHash": "sha256-jPDclkkiAy5m2gGLBlKgH+lQtbF7tL4XxBrbSzw+Ioc=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "aee8f04296c39d88155e05d25cfc59dfdd41cc77", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "1.21.0", - "repo": "poetry2nix", - "type": "github" - } - }, - "pre-commit-hooks": { "inputs": { "flake-utils": [ - "dream2nix", - "flake-utils-pre-commit" + "repin-flake-utils" ], "nixpkgs": [ - "dream2nix", "nixpkgs" ] }, "locked": { - "lastModified": 1646153636, - "narHash": "sha256-AlWHMzK+xJ1mG267FdT8dCq/HvLCA6jwmx2ZUy5O8tY=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "b6bc0b21e1617e2b07d8205e7fae7224036dfa4b", + "lastModified": 1665455310, + "narHash": "sha256-gEG1UiKz65SNWDU1NJmxLneo+kn7WjxrfucSk1zhU6o=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "d62ba59f1e28c382665c57203a4b9ad11fd7f449", "type": "github" }, "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", + "owner": "nix-community", + "repo": "poetry2nix", "type": "github" } }, @@ -568,22 +405,6 @@ "type": "github" } }, - "repin-flake-compat": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "repin-flake-utils": { "locked": { "lastModified": 1659877975, @@ -602,6 +423,7 @@ "root": { "inputs": { "agenix": "agenix", + "blank": "blank", "deploy-rs": "deploy-rs", "devshell": "devshell", "dream2nix": "dream2nix", @@ -614,26 +436,9 @@ "nix-super": "nix-super", "nixpkgs": "nixpkgs", "nixpkgs-lib": "nixpkgs-lib", - "repin-flake-compat": "repin-flake-compat", + "poetry2nix": "poetry2nix", "repin-flake-utils": "repin-flake-utils" } - }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1657557289, - "narHash": "sha256-PRW+nUwuqNTRAEa83SfX+7g+g8nQ+2MMbasQ9nt6+UM=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "caf23f29144b371035b864a1017dbc32573ad56d", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } } }, "root": "root", From 282fff603a882c285ab362d1130c7671067051df Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 16 Oct 2022 22:02:35 +0200 Subject: [PATCH 07/10] packages/excalidraw: unknown -> unknown --- packages/sources/sources.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/sources/sources.json b/packages/sources/sources.json index bcb6d49..2231527 100644 --- a/packages/sources/sources.json +++ b/packages/sources/sources.json @@ -22,9 +22,9 @@ "repo": "excalidraw" }, "branch": "master", - "revision": "76cf560914b4d1ed2212fd6033aab36f114ad549", - "url": "https://github.com/excalidraw/excalidraw/archive/76cf560914b4d1ed2212fd6033aab36f114ad549.tar.gz", - "hash": "0rawdrajbwlc55k1537v2v4bfd8mjvyplvwjn3ykbcc6bycjm770" + "revision": "fdc462ec013d59536bf40e95cdec89c1ccda340d", + "url": "https://github.com/excalidraw/excalidraw/archive/fdc462ec013d59536bf40e95cdec89c1ccda340d.tar.gz", + "hash": "050v3n8i7vbicxp91mc9ivvzk260if7l6qgd9xly3bvph3812vab" }, "searxng": { "type": "Git", From b7e1893992d7dcdd27f5c12d3dce1cf8b60f5d98 Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 16 Oct 2022 22:02:46 +0200 Subject: [PATCH 08/10] packages/searxng: 1.0.0pre_666cd1f -> 1.0.0pre_1a5b096 --- packages/sources/sources.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/sources/sources.json b/packages/sources/sources.json index 2231527..c365c57 100644 --- a/packages/sources/sources.json +++ b/packages/sources/sources.json @@ -34,9 +34,9 @@ "repo": "searxng" }, "branch": "master", - "revision": "666cd1f6355a4ac72255637707a764235fd8c907", - "url": "https://github.com/searxng/searxng/archive/666cd1f6355a4ac72255637707a764235fd8c907.tar.gz", - "hash": "0h2f8n9w9za1hbn2k9zscycxwh1jy9frxnxbcv2canpxdl6qwal9" + "revision": "1a5b0965789d100a33fad69cf6779b23e6595ef4", + "url": "https://github.com/searxng/searxng/archive/1a5b0965789d100a33fad69cf6779b23e6595ef4.tar.gz", + "hash": "11sjh9za9pj5s1g1i2f2jsmrrw4c1p6ln72nqi6n50xxklxikfsd" }, "stevenblack-hosts": { "type": "GitRelease", From e7ebedcdf823c3e9e5b73884b78054fb9f9ccca3 Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 16 Oct 2022 22:03:40 +0200 Subject: [PATCH 09/10] packages/stevenblack-hosts: 3.11.20 -> 3.11.23 --- packages/sources/sources.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/sources/sources.json b/packages/sources/sources.json index c365c57..d6471b4 100644 --- a/packages/sources/sources.json +++ b/packages/sources/sources.json @@ -47,10 +47,10 @@ }, "pre_releases": false, "version_upper_bound": null, - "version": "3.11.20", - "revision": "488f44fd942121dca8f91ead1cd25693816bab6b", - "url": "https://api.github.com/repos/StevenBlack/hosts/tarball/3.11.20", - "hash": "1lc715d851czs66s1azv5r3y8b8q4i0klb1l06cd394q0ig4239b" + "version": "3.11.23", + "revision": "ca5397fc85e64381eb79e4494eab3fe13cc90547", + "url": "https://api.github.com/repos/StevenBlack/hosts/tarball/3.11.23", + "hash": "0dsf9hknvahvz23jjqvbj0zkl0gcp3j3a50skh3bksqsk5yjgsgb" }, "tempo": { "type": "GitRelease", From 31694ed5c61d5ef8dfb7ba3da80ff5f12636b2af Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 16 Oct 2022 22:03:51 +0200 Subject: [PATCH 10/10] packages/uptime-kuma: 1.18.3 -> 1.18.5 --- packages/sources/sources.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/sources/sources.json b/packages/sources/sources.json index d6471b4..1a6eacb 100644 --- a/packages/sources/sources.json +++ b/packages/sources/sources.json @@ -75,10 +75,10 @@ }, "pre_releases": false, "version_upper_bound": null, - "version": "1.18.3", - "revision": "60460442f869f2cc581690bd7c8930b3eb7777b8", - "url": "https://api.github.com/repos/louislam/uptime-kuma/tarball/1.18.3", - "hash": "1jcjpdzbaz5hhhb2gzb9pi0kzwmvp954n90qv4hp4b02h79a66gh" + "version": "1.18.5", + "revision": "2ee8378814d5cf92dceabcf2d9e4e79505001f16", + "url": "https://api.github.com/repos/louislam/uptime-kuma/tarball/1.18.5", + "hash": "1g59652436q993ngyyizrpac8g9i3n85dd7n90kvg1daqdiww4p1" } }, "version": 2