From 43567e0b35ef0cf1eb7915a10db75337ab64a054 Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Tue, 24 Sep 2024 15:46:45 -0500 Subject: [PATCH 01/11] tmpl recipe: provide ssh|ip-module example cfg of no ipv6 --- templates/cardano-parts-project/Justfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/templates/cardano-parts-project/Justfile b/templates/cardano-parts-project/Justfile index 2455820..f78228c 100644 --- a/templates/cardano-parts-project/Justfile +++ b/templates/cardano-parts-project/Justfile @@ -789,7 +789,7 @@ ssh-config-example: HostName 1.2.3.5 Host machine-example-2.ipv6 - HostName ff00::02 + HostName unavailable.ipv6 EOF # Ssh using cluster bootstrap key @@ -1304,6 +1304,12 @@ update-ips-example: publicIpv4 = "1.2.3.4"; publicIpv6 = "ff00::01"; }; + + machine-example-2 = { + privateIpv4 = "172.16.0.2"; + publicIpv4 = "1.2.3.5"; + publicIpv6 = ""; + }; }; in { flake.nixosModules.ips = all; From 46d7649d872c60d20605c98df5cc28f7e6f94242 Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Tue, 24 Sep 2024 20:03:25 -0500 Subject: [PATCH 02/11] bump: capkgs for node 9.2.1, mithril 2437.1 --- flake.lock | 6 +++--- flakeModules/pkgs.nix | 39 ++++++++++++++++++++------------------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index a19f0dc..9a4b0ee 100644 --- a/flake.lock +++ b/flake.lock @@ -158,11 +158,11 @@ }, "capkgs": { "locked": { - "lastModified": 1726686039, - "narHash": "sha256-STgHoKX9xvVyYq4aCtA6JDOGGvBjB/FWXBZm78YevAw=", + "lastModified": 1727224209, + "narHash": "sha256-o1bsBy7ild7fDSMHwUOhPRDBsGol7ovqSKC2IFQDYGw=", "owner": "input-output-hk", "repo": "capkgs", - "rev": "d87a45698366a22be85f50da6f0546329c3450d0", + "rev": "6ef31cc3e5b2d16a11a050bd2acf6d5a6da8dee6", "type": "github" }, "original": { diff --git a/flakeModules/pkgs.nix b/flakeModules/pkgs.nix index 5252bfa..9226e4b 100644 --- a/flakeModules/pkgs.nix +++ b/flakeModules/pkgs.nix @@ -419,46 +419,47 @@ in pkgsSubmodule = submodule { options = foldl' recursiveUpdate {} [ # TODO: Fix the missing meta/version info upstream - (mkPkg "bech32" caPkgs."bech32-input-output-hk-cardano-node-9-2-0-341ea87") + (mkPkg "bech32" caPkgs."bech32-input-output-hk-cardano-node-9-2-1-5d3da8a") (mkPkg "blockperf" caPkgs.blockperf-cardano-foundation-blockperf-main-22180cb) (mkPkg "cardano-address" caPkgs.cardano-address-cardano-foundation-cardano-wallet-v2024-08-11-ece92a2) - (mkPkg "cardano-cli" (caPkgs."cardano-cli-input-output-hk-cardano-node-9-2-0-341ea87" // {version = "9.4.1.0";})) - (mkPkg "cardano-cli-ng" (caPkgs."cardano-cli-input-output-hk-cardano-node-9-2-0-341ea87" // {version = "9.4.1.0";})) + (mkPkg "cardano-cli" (caPkgs."cardano-cli-input-output-hk-cardano-node-9-2-1-5d3da8a" // {version = "9.4.1.0";})) + (mkPkg "cardano-cli-ng" (caPkgs."cardano-cli-input-output-hk-cardano-node-9-2-1-5d3da8a" // {version = "9.4.1.0";})) (mkPkg "cardano-db-sync" (caPkgs."\"cardano-db-sync:exe:cardano-db-sync\"-input-output-hk-cardano-db-sync-13-5-0-2-fe05fc5" // {meta.mainProgram = "cardano-db-sync";})) (mkPkg "cardano-db-sync-ng" (caPkgs."\"cardano-db-sync:exe:cardano-db-sync\"-input-output-hk-cardano-db-sync-13-5-0-2-fe05fc5" // {meta.mainProgram = "cardano-db-sync";})) (mkPkg "cardano-db-tool" caPkgs."\"cardano-db-tool:exe:cardano-db-tool\"-input-output-hk-cardano-db-sync-13-5-0-2-fe05fc5") (mkPkg "cardano-db-tool-ng" caPkgs."\"cardano-db-tool:exe:cardano-db-tool\"-input-output-hk-cardano-db-sync-13-5-0-2-fe05fc5") (mkPkg "cardano-faucet" caPkgs."\"cardano-faucet:exe:cardano-faucet\"-input-output-hk-cardano-faucet-9-1-0f9206e") (mkPkg "cardano-faucet-ng" caPkgs."\"cardano-faucet:exe:cardano-faucet\"-input-output-hk-cardano-faucet-9-1-0f9206e") - (mkPkg "cardano-node" (caPkgs."cardano-node-input-output-hk-cardano-node-9-2-0-341ea87" // {version = "9.2.0";})) - (mkPkg "cardano-node-ng" (caPkgs."cardano-node-input-output-hk-cardano-node-9-2-0-341ea87" // {version = "9.2.0";})) + (mkPkg "cardano-node" (caPkgs."cardano-node-input-output-hk-cardano-node-9-2-1-5d3da8a" // {version = "9.2.1";})) + (mkPkg "cardano-node-ng" (caPkgs."cardano-node-input-output-hk-cardano-node-9-2-1-5d3da8a" // {version = "9.2.1";})) (mkPkg "cardano-ogmios" caPkgs.ogmios-input-output-hk-cardano-ogmios-v6-3-0-8ab5fd6) (mkPkg "cardano-smash" caPkgs.cardano-smash-server-no-basic-auth-input-output-hk-cardano-db-sync-13-5-0-2-fe05fc5) (mkPkg "cardano-smash-ng" caPkgs.cardano-smash-server-no-basic-auth-input-output-hk-cardano-db-sync-13-5-0-2-fe05fc5) - (mkPkg "cardano-submit-api" caPkgs."cardano-submit-api-input-output-hk-cardano-node-9-2-0-341ea87") - (mkPkg "cardano-submit-api-ng" caPkgs."cardano-submit-api-input-output-hk-cardano-node-9-2-0-341ea87") - (mkPkg "cardano-tracer" caPkgs."cardano-tracer-input-output-hk-cardano-node-9-2-0-341ea87") - (mkPkg "cardano-tracer-ng" caPkgs."cardano-tracer-input-output-hk-cardano-node-9-2-0-341ea87") + (mkPkg "cardano-submit-api" caPkgs."cardano-submit-api-input-output-hk-cardano-node-9-2-1-5d3da8a") + (mkPkg "cardano-submit-api-ng" caPkgs."cardano-submit-api-input-output-hk-cardano-node-9-2-1-5d3da8a") + (mkPkg "cardano-tracer" caPkgs."cardano-tracer-input-output-hk-cardano-node-9-2-1-5d3da8a") + (mkPkg "cardano-tracer-ng" caPkgs."cardano-tracer-input-output-hk-cardano-node-9-2-1-5d3da8a") (mkPkg "cardano-wallet" (caPkgs.cardano-wallet-cardano-foundation-cardano-wallet-v2024-08-11-ece92a2 // { pname = "cardano-wallet"; meta.description = "HTTP server and command-line for managing UTxOs and HD wallets in Cardano."; })) - (mkPkg "db-analyser" caPkgs."db-analyser-input-output-hk-cardano-node-9-2-0-341ea87") - (mkPkg "db-analyser-ng" caPkgs."db-analyser-input-output-hk-cardano-node-9-2-0-341ea87") - (mkPkg "db-synthesizer" caPkgs."db-synthesizer-input-output-hk-cardano-node-9-2-0-341ea87") - (mkPkg "db-synthesizer-ng" caPkgs."db-synthesizer-input-output-hk-cardano-node-9-2-0-341ea87") - (mkPkg "db-truncater" caPkgs."db-truncater-input-output-hk-cardano-node-9-2-0-341ea87") - (mkPkg "db-truncater-ng" caPkgs."db-truncater-input-output-hk-cardano-node-9-2-0-341ea87") + (mkPkg "db-analyser" caPkgs."db-analyser-input-output-hk-cardano-node-9-2-1-5d3da8a") + (mkPkg "db-analyser-ng" caPkgs."db-analyser-input-output-hk-cardano-node-9-2-1-5d3da8a") + (mkPkg "db-synthesizer" caPkgs."db-synthesizer-input-output-hk-cardano-node-9-2-1-5d3da8a") + (mkPkg "db-synthesizer-ng" caPkgs."db-synthesizer-input-output-hk-cardano-node-9-2-1-5d3da8a") + (mkPkg "db-truncater" caPkgs."db-truncater-input-output-hk-cardano-node-9-2-1-5d3da8a") + (mkPkg "db-truncater-ng" caPkgs."db-truncater-input-output-hk-cardano-node-9-2-1-5d3da8a") (mkPkg "process-compose" caPkgs.process-compose-F1bonacc1-process-compose-v0-80-0-26bf212) (mkPkg "metadata-server" caPkgs.metadata-server-input-output-hk-offchain-metadata-tools-ops-1-0-0-f406c6d) (mkPkg "metadata-sync" caPkgs.metadata-sync-input-output-hk-offchain-metadata-tools-ops-1-0-0-f406c6d) (mkPkg "metadata-validator-github" caPkgs.metadata-validator-github-input-output-hk-offchain-metadata-tools-ops-1-0-0-f406c6d) (mkPkg "metadata-webhook" caPkgs.metadata-webhook-input-output-hk-offchain-metadata-tools-ops-1-0-0-f406c6d) - (mkPkg "mithril-client-cli" (recursiveUpdate caPkgs.mithril-client-cli-input-output-hk-mithril-2430-0-pre-52a7beb {meta.mainProgram = "mithril-client";})) - (mkPkg "mithril-client-cli-ng" (recursiveUpdate caPkgs.mithril-client-cli-input-output-hk-mithril-unstable-9fd9ae8 {meta.mainProgram = "mithril-client";})) - (mkPkg "mithril-signer" (recursiveUpdate caPkgs.mithril-signer-input-output-hk-mithril-2430-0-pre-52a7beb {meta.mainProgram = "mithril-signer";})) - (mkPkg "mithril-signer-ng" (recursiveUpdate caPkgs.mithril-signer-input-output-hk-mithril-unstable-9fd9ae8 {meta.mainProgram = "mithril-signer";})) + # Mithril unstable tag is unavailable likely due to upstream tag moving; re-assign unstable tag to sanchonet when availability to capkgs returns + (mkPkg "mithril-client-cli" (recursiveUpdate caPkgs.mithril-client-cli-input-output-hk-mithril-2437-1-pre-9fd9ae8 {meta.mainProgram = "mithril-client";})) + (mkPkg "mithril-client-cli-ng" (recursiveUpdate caPkgs.mithril-client-cli-input-output-hk-mithril-2437-1-pre-9fd9ae8 {meta.mainProgram = "mithril-client";})) + (mkPkg "mithril-signer" (recursiveUpdate caPkgs.mithril-signer-input-output-hk-mithril-2437-1-pre-9fd9ae8 {meta.mainProgram = "mithril-signer";})) + (mkPkg "mithril-signer-ng" (recursiveUpdate caPkgs.mithril-signer-input-output-hk-mithril-2437-1-pre-9fd9ae8 {meta.mainProgram = "mithril-signer";})) (mkPkg "token-metadata-creator" (recursiveUpdate caPkgs.token-metadata-creator-input-output-hk-offchain-metadata-tools-ops-1-0-0-f406c6d {meta.mainProgram = "token-metadata-creator";})) ]; }; From 803621fdb6b70d728f869e9b9b6e91d9cd4fd4f1 Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Thu, 26 Sep 2024 11:03:54 -0500 Subject: [PATCH 03/11] tmpl: add mkCustomNode in flake/colmena.nix --- templates/cardano-parts-project/flake/colmena.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/templates/cardano-parts-project/flake/colmena.nix b/templates/cardano-parts-project/flake/colmena.nix index 628f85e..d42286b 100644 --- a/templates/cardano-parts-project/flake/colmena.nix +++ b/templates/cardano-parts-project/flake/colmena.nix @@ -73,6 +73,14 @@ in ]; }; + # mkCustomNode = flakeInput: + # node + # // { + # cardano-parts.perNode = { + # pkgs = {inherit (inputs.${flakeInput}.packages.x86_64-linux) cardano-cli cardano-node cardano-submit-api;}; + # }; + # }; + # Mithril signing config # mithrilRelay = {imports = [inputs.cardano-parts.nixosModules.profile-mithril-relay];}; # declMRel = node: {services.mithril-signer.relayEndpoint = nixosConfigurations.${node}.config.ips.privateIpv4;}; From 45a4d85d6d3b9cb3a299e7a191192ffc9781e430 Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Thu, 26 Sep 2024 20:16:19 -0500 Subject: [PATCH 04/11] bump: nix -> 2.24-maint, nixpkgs-unstable, nvim for nix compat --- flake.lock | 120 +++++++++++++++++++++------ flake.nix | 2 +- flake/nixosModules/profile-basic.nix | 3 +- 3 files changed, 99 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index 9a4b0ee..414e950 100644 --- a/flake.lock +++ b/flake.lock @@ -414,11 +414,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -481,6 +481,27 @@ "type": "github" } }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": [ + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -544,6 +565,37 @@ "type": "github" } }, + "git-hooks-nix": { + "inputs": { + "flake-compat": [ + "nix" + ], + "gitignore": [ + "nix" + ], + "nixpkgs": [ + "nix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1721042469, + "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "hackage": { "flake": false, "locked": { @@ -775,23 +827,24 @@ "url": "https://gitlab.haskell.org/hamishmack/iserv-proxy.git" } }, - "lowdown-src": { + "libgit2": { "flake": false, "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "lastModified": 1715853528, + "narHash": "sha256-J2rCxTecyLbbDdsyBWn9w7r3pbKRMkI9E7RvRgAqBdY=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "36f7e21ad757a3dacc58cf7944329da6bc1d6e96", "type": "github" }, "original": { - "owner": "kristapsdz", - "repo": "lowdown", + "owner": "libgit2", + "ref": "v1.8.1", + "repo": "libgit2", "type": "github" } }, - "lowdown-src_2": { + "lowdown-src": { "flake": false, "locked": { "lastModified": 1633514407, @@ -831,21 +884,24 @@ "nix_2": { "inputs": { "flake-compat": "flake-compat_3", - "lowdown-src": "lowdown-src_2", + "flake-parts": "flake-parts_4", + "git-hooks-nix": "git-hooks-nix", + "libgit2": "libgit2", "nixpkgs": "nixpkgs_6", + "nixpkgs-23-11": "nixpkgs-23-11", "nixpkgs-regression": "nixpkgs-regression_2" }, "locked": { - "lastModified": 1701705406, - "narHash": "sha256-c7/VJH/3/NdmJQe3X7Hlf/tFQ265n2hXGWA+0conEO8=", + "lastModified": 1727313940, + "narHash": "sha256-mJJRmU4cLnIS3ByoWHsJCmoRroH3Oj6Gj6mKcdjJX8Y=", "owner": "nixos", "repo": "nix", - "rev": "aaeab0040126d7e0bf59886abd4a1e2855482ee9", + "rev": "b23812a59c6854378f042e33f5e006c4d9dc516a", "type": "github" }, "original": { "owner": "nixos", - "ref": "2.19-maintenance", + "ref": "2.24-maintenance", "repo": "nix", "type": "github" } @@ -946,6 +1002,22 @@ "type": "github" } }, + "nixpkgs-23-11": { + "locked": { + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + } + }, "nixpkgs-2305": { "locked": { "lastModified": 1690680713, @@ -1082,11 +1154,11 @@ }, "nixpkgs-unstable_2": { "locked": { - "lastModified": 1719826879, - "narHash": "sha256-xs7PlULe8O1SAcs/9e/HOjeUjBrU5FNtkAF/bSEcFto=", + "lastModified": 1727266098, + "narHash": "sha256-AHTKbJ9ffR7Nx+XcR2XP0AYLI4OlUh2IGh4SAkdG5Ig=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b9014df496d5b68bf7c0145d0e9b0f529ce4f2a8", + "rev": "4f31540079322e6013930b5b2563fd10f96917f0", "type": "github" }, "original": { @@ -1162,16 +1234,16 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1700748986, - "narHash": "sha256-/nqLrNU297h3PCw4QyDpZKZEUHmialJdZW2ceYFobds=", + "lastModified": 1723688146, + "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9ba29e2346bc542e9909d1021e8fd7d4b3f64db0", + "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05-small", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 88a98b8..78ff01c 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ inputs-check.url = "github:input-output-hk/inputs-check"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; - nix.url = "github:nixos/nix/2.19-maintenance"; + nix.url = "github:nixos/nix/2.24-maintenance"; opentofu-registry = { url = "github:opentofu/registry"; flake = false; diff --git a/flake/nixosModules/profile-basic.nix b/flake/nixosModules/profile-basic.nix index 5e554f7..311242e 100644 --- a/flake/nixosModules/profile-basic.nix +++ b/flake/nixosModules/profile-basic.nix @@ -69,7 +69,8 @@ jq lsof nano - neovim + # For nix >= 2.24 build compatibility + inputs.nixpkgs-unstable.legacyPackages.${system}.neovim ncdu # Add a localFlake pin to avoid downstream repo nixpkgs pins <= 23.05 causing a non-existent pkg failure inputs.nixpkgs.legacyPackages.${system}.nushellFull From f5234f5c21935eeac5c12ed586888c7c5118b034 Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Fri, 27 Sep 2024 09:56:42 -0500 Subject: [PATCH 05/11] bump: auth-keys-hub for startup fix when token is missing --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 414e950..577d1e8 100644 --- a/flake.lock +++ b/flake.lock @@ -26,11 +26,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1704983837, - "narHash": "sha256-J1oQdSqehbcslfHPjQbvRF7SgYpzk0Son6BJIiS6VjM=", + "lastModified": 1720648950, + "narHash": "sha256-KyWe8TtaS3luk/5kh0ZkQPIqVw0ubCHPaGg8VJ84HDU=", "owner": "input-output-hk", "repo": "auth-keys-hub", - "rev": "246d8d3d0d3cd8f13dfededa125a4bdee669cb57", + "rev": "fa14ce66c812509830e5703cfe00e03d06da57f0", "type": "github" }, "original": { From 86a313e89dce7b3a9402c7ea5c586673750962c5 Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Fri, 27 Sep 2024 10:35:08 -0500 Subject: [PATCH 06/11] imp: update the default mithril-signer metrics scrape port to 12778 --- flake/nixosModules/role-block-producer.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake/nixosModules/role-block-producer.nix b/flake/nixosModules/role-block-producer.nix index 75786e3..a127990 100644 --- a/flake/nixosModules/role-block-producer.nix +++ b/flake/nixosModules/role-block-producer.nix @@ -126,7 +126,7 @@ flake: { metricsPort = mkOption { type = port; - default = 9090; + default = 12778; description = "Set the port address to serve mithril-signer's built in prometheus metrics server."; }; From ca90781af04d15c82a990c69b07496db673f4ccc Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Fri, 27 Sep 2024 13:24:29 -0500 Subject: [PATCH 07/11] tmpl recipe: handle nix 2.21 colmena impure deploys, improve chk parsing --- templates/cardano-parts-project/Justfile | 63 +++++++++++++++++++----- 1 file changed, 50 insertions(+), 13 deletions(-) diff --git a/templates/cardano-parts-project/Justfile b/templates/cardano-parts-project/Justfile index f78228c..08d36d8 100644 --- a/templates/cardano-parts-project/Justfile +++ b/templates/cardano-parts-project/Justfile @@ -104,25 +104,29 @@ checkSshConfig := ''' # each respective host. let sshCfg = (open .ssh_config | parse --regex '(?m)Host (.*)\n\s+HostName (.*)' - | rename machine ip) + | rename machine ip + | sort-by machine) let ssh4Cfg = ($sshCfg | where not ($it.machine | str ends-with ".ipv6") - | rename machine ipv4) + | rename machine pubIpv4 + | sort-by machine) let ssh6Cfg = ($sshCfg | where ($it.machine | str ends-with ".ipv6") - | rename machine ipv6 + | rename machine pubIpv6 | update machine {$in | str replace '.ipv6' ''} - | update ipv6 {if ($in == "unavailable.ipv6") { null } else { $in }}) + | update pubIpv6 {if ($in == "unavailable.ipv6") { null } else { $in }} + | sort-by machine) let moduleIps = if ('flake/nixosModules/ips-DONT-COMMIT.nix' | path exists) { (open flake/nixosModules/ips-DONT-COMMIT.nix | parse --regex '(?ms)(.*)^ };\nin {.*' | get capture0 | parse --regex '(?m) (.*) = {$\n\s+privateIpv4 = \"(.*)";\n\s+publicIpv4 = \"(.*)";\n\s+publicIpv6 = \"(.*)";\n\s+};' - | rename machine privateIpv4 ipv4 ipv6) - | update ipv6 {if ($in == "") { null } else { $in }} + | rename machine privIpv4 pubIpv4 pubIpv6 + | update pubIpv6 {if ($in == "") { null } else { $in }} + | sort-by machine) } else { [] } @@ -142,14 +146,14 @@ checkSshConfig := ''' # Set up comparison between list of ssh public ipv4 and ip module public ipv4 values let ssh4CompareIps4 = if ('flake/nixosModules/ips-DONT-COMMIT.nix' | path exists) { - list-diff ($ssh4Cfg | get ipv4) ($moduleIps | get ipv4) onlyInSshCfg onlyInIpsModuleCfg | where where != "=" + list-diff ($ssh4Cfg | get pubIpv4) ($moduleIps | get pubIpv4) onlyInSshCfg onlyInIpsModuleCfg | where where != "=" } else { [] } # Set up comparison between list of ssh public ipv6 and ip module public ipv6 values let ssh6CompareIps6 = if ('flake/nixosModules/ips-DONT-COMMIT.nix' | path exists) { - list-diff ($ssh6Cfg | get ipv6) ($moduleIps | get ipv6) onlyInSshCfg onlyInIpsModuleCfg | where where != "=" + list-diff ($ssh6Cfg | get pubIpv6) ($moduleIps | get pubIpv6) onlyInSshCfg onlyInIpsModuleCfg | where where != "=" } else { [] } @@ -249,15 +253,30 @@ default: # Deploy select machines apply *ARGS: - colmena apply --verbose --on {{ARGS}} + #!/usr/bin/env bash + set -euo pipefail + + CLICOLOR_FORCE=1 colmena apply --impure --verbose --color always --on {{ARGS}} \ + 1> >(sed --regex '/.*colmena-assets-.*/ d; /.*• Added input .*/ {N;d}' >&1) \ + 2> >(sed --regex '/.*colmena-assets-.*/ d; /• Added input .*/ {N;d}' >&2) # Deploy all machines apply-all *ARGS: - colmena apply --verbose {{ARGS}} + #!/usr/bin/env bash + set -euo pipefail + + CLICOLOR_FORCE=1 colmena apply --impure --verbose --color always {{ARGS}} \ + 1> >(sed --regex '/.*colmena-assets-.*/ d; /.*• Added input .*/ {N;d}' >&1) \ + 2> >(sed --regex '/.*colmena-assets-.*/ d; /• Added input .*/ {N;d}' >&2) # Deploy select machines with the bootstrap key apply-bootstrap *ARGS: - SSH_CONFIG_FILE=<(sed '6i IdentityFile .ssh_key' .ssh_config) colmena apply --verbose --on {{ARGS}} + #!/usr/bin/env bash + set -euo pipefail + + sed '2i \ \ IdentityFile .ssh_key' .ssh_config > .ssh_config_bootstrap + SSH_CONFIG_FILE=".ssh_config_bootstrap" just apply {{ARGS}} + rm .ssh_config_bootstrap # Build a nixos configuration build-machine MACHINE *ARGS: @@ -459,15 +478,18 @@ list-machines: let ssh4Table = ($sshNodes.stdout | from json | where ('HostName' in $it) and not ($it.Host | str ends-with ".ipv6") + | select Host HostName | rename Host pubIpv4 ); let ssh6Table = ($sshNodes.stdout | from json | where ('HostName' in $it) and ($it.Host | str ends-with ".ipv6") + | select Host HostName | rename Host pubIpv6 | update Host {$in | str replace '.ipv6' ''} | update pubIpv6 {if ($in == "unavailable.ipv6") { null } else { $in }} + | select Host pubIpv6 ); let sshTable = ($ssh4Table @@ -494,7 +516,7 @@ list-machines: if ( (($row.inNixosCfg | str contains "Missing") or ($row.pubIpv4 | str contains "Missing")) and - ($row.ipv6 == null) + ($row.pubIpv6 == null) ) {$"(ansi bg_red)Missing(ansi reset)"} else {$in} } | where machine != "" ) @@ -771,6 +793,10 @@ ssh-config-example: echo "This may be used as a template if a custom .ssh_config file needs to be" echo "created and managed manually, for example, in a non-aws environment." echo + echo "Note that per host customization should come after the HostName line to preserve pattern parsing!" + echo + echo "---" + echo cat <<"EOF" Host * User root @@ -781,6 +807,8 @@ ssh-config-example: Host machine-example-1 HostName 1.2.3.4 + # Per host customization should come after the HostName line to preserve pattern parsing + ProxyJump machine-example-2 Host machine-example-1.ipv6 HostName ff00::01 @@ -807,7 +835,12 @@ ssh-for-all *ARGS: # Ssh for select ssh-for-each HOSTNAMES *ARGS: - colmena exec --verbose --parallel 0 --on {{HOSTNAMES}} {{ARGS}} + #!/usr/bin/env bash + set -euo pipefail + + CLICOLOR_FORCE=1 colmena exec --impure --verbose --parallel 0 --on {{HOSTNAMES}} {{ARGS}} \ + 1> >(sed --regex '/.*colmena-assets-.*/ d; /.*• Added input .*/ {N;d}' >&1) \ + 2> >(sed --regex '/.*colmena-assets-.*/ d; /• Added input .*/ {N;d}' >&2) # List machine ips based on regex pattern ssh-list-ips PATTERN: @@ -1296,6 +1329,10 @@ update-ips-example: echo "This may be used as a template if a custom flake/nixosModules/ips-DONT-COMMIT.nix file" echo "needs to be created and managed manually, for example, in a non-aws environment." echo + echo "Note that the line ordering of privateIpv4, publicIpv4, publicIpv6 matters!" + echo + echo "---" + echo cat <<"EOF" let all = { From 752820d0b1ad025cbf38e1140f81804d3f4ce368 Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Fri, 27 Sep 2024 15:06:22 -0500 Subject: [PATCH 08/11] imp: shorten the default ipv6 binding to ::0 --- flake/nixosModules/profile-cardano-parts.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake/nixosModules/profile-cardano-parts.nix b/flake/nixosModules/profile-cardano-parts.nix index 0a0f87b..c811508 100644 --- a/flake/nixosModules/profile-cardano-parts.nix +++ b/flake/nixosModules/profile-cardano-parts.nix @@ -250,7 +250,7 @@ flake @ {moduleWithSystem, ...}: { hostAddrIpv6 = mkOption { type = str; description = mdDoc "The hostAddr to associate with the nixos cardano-node for ipv6 binding."; - default = "0:0:0:0:0:0:0:0"; + default = "::0"; }; hostsList = mkOption { From e8b8f438de18097911d9233ac987117ae8c45833 Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Tue, 1 Oct 2024 16:59:51 -0500 Subject: [PATCH 09/11] tmpl recipe: update gitignore for ssh-bootstrap recipe --- templates/cardano-parts-project/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/cardano-parts-project/.gitignore b/templates/cardano-parts-project/.gitignore index f66abab..0aeff0b 100644 --- a/templates/cardano-parts-project/.gitignore +++ b/templates/cardano-parts-project/.gitignore @@ -12,6 +12,7 @@ __pycache__ /*.socket /.consistency-check-ts /.ssh_config +/.ssh_config_bootstrap /.ssh_key /state-demo/ /.terraform* From d8724f822edfbf4d9d7691d09a11529f200248d6 Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Tue, 1 Oct 2024 18:06:13 -0500 Subject: [PATCH 10/11] imp: use an ipv6 compatible faucet update --- flake.lock | 1041 +++++++++++++++++++++++++++++++++++++---- flake.nix | 3 + flakeModules/pkgs.nix | 7 +- 3 files changed, 959 insertions(+), 92 deletions(-) diff --git a/flake.lock b/flake.lock index 577d1e8..3ae97f8 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,22 @@ { "nodes": { + "CHaP": { + "flake": false, + "locked": { + "lastModified": 1725372492, + "narHash": "sha256-eQwfZIEHH5qHZQHXujgjj35dVAqSZa6EbTRWeppn1ME=", + "owner": "input-output-hk", + "repo": "cardano-haskell-packages", + "rev": "05c9f8fb28fde6e46d8768ce396a4482883d6bab", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "repo", + "repo": "cardano-haskell-packages", + "type": "github" + } + }, "HTTP": { "flake": false, "locked": { @@ -16,6 +33,22 @@ "type": "github" } }, + "HTTP_2": { + "flake": false, + "locked": { + "lastModified": 1451647621, + "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=", + "owner": "phadej", + "repo": "HTTP", + "rev": "9bc0996d412fef1787449d841277ef663ad9a915", + "type": "github" + }, + "original": { + "owner": "phadej", + "repo": "HTTP", + "type": "github" + } + }, "auth-keys-hub": { "inputs": { "flake-parts": "flake-parts", @@ -72,6 +105,23 @@ } }, "blst": { + "flake": false, + "locked": { + "lastModified": 1656163412, + "narHash": "sha256-xero1aTe2v4IhWIJaEDUsVDOfE77dOV5zKeHWntHogY=", + "owner": "supranational", + "repo": "blst", + "rev": "03b5124029979755c752eec45f3c29674b558446", + "type": "github" + }, + "original": { + "owner": "supranational", + "repo": "blst", + "rev": "03b5124029979755c752eec45f3c29674b558446", + "type": "github" + } + }, + "blst_2": { "flake": false, "locked": { "lastModified": 1691598027, @@ -88,7 +138,7 @@ "type": "github" } }, - "blst_2": { + "blst_3": { "flake": false, "locked": { "lastModified": 1691598027, @@ -122,6 +172,23 @@ "type": "github" } }, + "cabal-32_2": { + "flake": false, + "locked": { + "lastModified": 1603716527, + "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", + "owner": "haskell", + "repo": "cabal", + "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.2", + "repo": "cabal", + "type": "github" + } + }, "cabal-34": { "flake": false, "locked": { @@ -139,6 +206,23 @@ "type": "github" } }, + "cabal-34_2": { + "flake": false, + "locked": { + "lastModified": 1645834128, + "narHash": "sha256-wG3d+dOt14z8+ydz4SL7pwGfe7SiimxcD/LOuPCV6xM=", + "owner": "haskell", + "repo": "cabal", + "rev": "5ff598c67f53f7c4f48e31d722ba37172230c462", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.4", + "repo": "cabal", + "type": "github" + } + }, "cabal-36": { "flake": false, "locked": { @@ -156,6 +240,23 @@ "type": "github" } }, + "cabal-36_2": { + "flake": false, + "locked": { + "lastModified": 1669081697, + "narHash": "sha256-I5or+V7LZvMxfbYgZATU4awzkicBwwok4mVoje+sGmU=", + "owner": "haskell", + "repo": "cabal", + "rev": "8fd619e33d34924a94e691c5fea2c42f0fc7f144", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "3.6", + "repo": "cabal", + "type": "github" + } + }, "capkgs": { "locked": { "lastModified": 1727224209, @@ -221,6 +322,34 @@ "type": "github" } }, + "cardano-faucet": { + "inputs": { + "CHaP": "CHaP", + "flake-utils": "flake-utils", + "haskellNix": "haskellNix", + "incl": "incl", + "iohkNix": "iohkNix", + "nixpkgs": [ + "cardano-faucet", + "haskellNix", + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1727818446, + "narHash": "sha256-KYXA/pelKg3uKvzNbRoaDbusQ+ogQtFoUc4Pem7VAMo=", + "owner": "input-output-hk", + "repo": "cardano-faucet", + "rev": "d2de4c36449eeecb768d0d5bcf6939864e812d72", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "jl/ipv6-compat", + "repo": "cardano-faucet", + "type": "github" + } + }, "cardano-metadata-service": { "flake": false, "locked": { @@ -305,6 +434,22 @@ "type": "github" } }, + "cardano-shell_2": { + "flake": false, + "locked": { + "lastModified": 1608537748, + "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", + "owner": "input-output-hk", + "repo": "cardano-shell", + "rev": "9392c75087cb9a3d453998f4230930dea3a95725", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "cardano-shell", + "type": "github" + } + }, "cardano-tracer-service": { "flake": false, "locked": { @@ -341,8 +486,8 @@ }, "colmena": { "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ], @@ -379,6 +524,23 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1672831974, + "narHash": "sha256-z9k3MfslLjWQfnjBtEtJZdq3H7kyi2kQtUThfTgdRk0=", + "owner": "input-output-hk", + "repo": "flake-compat", + "rev": "45f2638735f8cdc40fe302742b79f248d23eb368", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "hkm/gitlab-fix", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1650374568, @@ -394,7 +556,7 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1672831974, @@ -411,7 +573,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1696426674, @@ -503,6 +665,25 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1681378341, + "narHash": "sha256-2qUN04W6X9cHHytEsJTM41CmusifPTC0bgTtYsHSNY8=", + "owner": "hamishmack", + "repo": "flake-utils", + "rev": "2767bafdb189cd623354620c2dacbeca8fd58b17", + "type": "github" + }, + "original": { + "owner": "hamishmack", + "ref": "hkm/nested-hydraJobs", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -517,7 +698,7 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_3": { "locked": { "lastModified": 1679360468, "narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=", @@ -533,7 +714,7 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_4": { "locked": { "lastModified": 1634851050, "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", @@ -565,6 +746,23 @@ "type": "github" } }, + "ghc-8.6.5-iohk_2": { + "flake": false, + "locked": { + "lastModified": 1600920045, + "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", + "owner": "input-output-hk", + "repo": "ghc", + "rev": "95713a6ecce4551240da7c96b6176f980af75cae", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "ref": "release/8.6.5-iohk", + "repo": "ghc", + "type": "github" + } + }, "git-hooks-nix": { "inputs": { "flake-compat": [ @@ -597,6 +795,22 @@ } }, "hackage": { + "flake": false, + "locked": { + "lastModified": 1725409900, + "narHash": "sha256-XfSA7YyjHUfuNsCw4cE6p0kQcmrJgQq3nW36Cw/PAv0=", + "owner": "input-output-hk", + "repo": "hackage.nix", + "rev": "d86e544dec33ce5fb0ad3981be91074d397b700d", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "hackage.nix", + "type": "github" + } + }, + "hackage_2": { "flake": false, "locked": { "lastModified": 1692145451, @@ -613,23 +827,77 @@ } }, "haskell-nix": { + "inputs": { + "HTTP": "HTTP_2", + "cabal-32": "cabal-32_2", + "cabal-34": "cabal-34_2", + "cabal-36": "cabal-36_2", + "cardano-shell": "cardano-shell_2", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_3", + "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_2", + "hackage": "hackage_2", + "hls-1.10": "hls-1.10_2", + "hls-2.0": "hls-2.0_2", + "hpc-coveralls": "hpc-coveralls_2", + "hydra": "hydra_2", + "iserv-proxy": "iserv-proxy_2", + "nixpkgs": [ + "haskell-nix", + "nixpkgs-unstable" + ], + "nixpkgs-2003": "nixpkgs-2003_2", + "nixpkgs-2105": "nixpkgs-2105_2", + "nixpkgs-2111": "nixpkgs-2111_2", + "nixpkgs-2205": "nixpkgs-2205_2", + "nixpkgs-2211": "nixpkgs-2211_2", + "nixpkgs-2305": "nixpkgs-2305_2", + "nixpkgs-unstable": "nixpkgs-unstable_2", + "old-ghc-nix": "old-ghc-nix_2", + "stackage": [ + "empty-flake" + ] + }, + "locked": { + "lastModified": 1692147008, + "narHash": "sha256-ZiRaryaboJbNZ7y7XKZs2xuSfydZyGeupJNOfYpgQSw=", + "owner": "input-output-hk", + "repo": "haskell.nix", + "rev": "1970bb2d5b0eb8152f89b305f32d055dbd6857d9", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "haskell.nix", + "type": "github" + } + }, + "haskellNix": { "inputs": { "HTTP": "HTTP", "cabal-32": "cabal-32", "cabal-34": "cabal-34", "cabal-36": "cabal-36", "cardano-shell": "cardano-shell", - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", + "flake-compat": "flake-compat", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", "hackage": "hackage", "hls-1.10": "hls-1.10", "hls-2.0": "hls-2.0", + "hls-2.2": "hls-2.2", + "hls-2.3": "hls-2.3", + "hls-2.4": "hls-2.4", + "hls-2.5": "hls-2.5", + "hls-2.6": "hls-2.6", + "hls-2.7": "hls-2.7", + "hls-2.8": "hls-2.8", + "hls-2.9": "hls-2.9", "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", "nixpkgs": [ - "haskell-nix", + "cardano-faucet", + "haskellNix", "nixpkgs-unstable" ], "nixpkgs-2003": "nixpkgs-2003", @@ -638,18 +906,18 @@ "nixpkgs-2205": "nixpkgs-2205", "nixpkgs-2211": "nixpkgs-2211", "nixpkgs-2305": "nixpkgs-2305", + "nixpkgs-2311": "nixpkgs-2311", + "nixpkgs-2405": "nixpkgs-2405", "nixpkgs-unstable": "nixpkgs-unstable", "old-ghc-nix": "old-ghc-nix", - "stackage": [ - "empty-flake" - ] + "stackage": "stackage" }, "locked": { - "lastModified": 1692147008, - "narHash": "sha256-ZiRaryaboJbNZ7y7XKZs2xuSfydZyGeupJNOfYpgQSw=", + "lastModified": 1725411053, + "narHash": "sha256-cW999pULNLOZHlV9sqBFIrWTkSxuVAVR6xJR7GndHdQ=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "1970bb2d5b0eb8152f89b305f32d055dbd6857d9", + "rev": "63783ecc949e99b2396ca821275cee26385adaba", "type": "github" }, "original": { @@ -675,6 +943,23 @@ "type": "github" } }, + "hls-1.10_2": { + "flake": false, + "locked": { + "lastModified": 1680000865, + "narHash": "sha256-rc7iiUAcrHxwRM/s0ErEsSPxOR3u8t7DvFeWlMycWgo=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "b08691db779f7a35ff322b71e72a12f6e3376fd9", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "1.10.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, "hls-2.0": { "flake": false, "locked": { @@ -692,25 +977,218 @@ "type": "github" } }, - "hpc-coveralls": { + "hls-2.0_2": { "flake": false, "locked": { - "lastModified": 1607498076, - "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", + "lastModified": 1687698105, + "narHash": "sha256-OHXlgRzs/kuJH8q7Sxh507H+0Rb8b7VOiPAjcY9sM1k=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "783905f211ac63edf982dd1889c671653327e441", "type": "github" }, "original": { - "owner": "sevanspowell", - "repo": "hpc-coveralls", + "owner": "haskell", + "ref": "2.0.0.1", + "repo": "haskell-language-server", "type": "github" } }, - "hydra": { + "hls-2.2": { + "flake": false, + "locked": { + "lastModified": 1693064058, + "narHash": "sha256-8DGIyz5GjuCFmohY6Fa79hHA/p1iIqubfJUTGQElbNk=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "b30f4b6cf5822f3112c35d14a0cba51f3fe23b85", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.2.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.3": { + "flake": false, + "locked": { + "lastModified": 1695910642, + "narHash": "sha256-tR58doOs3DncFehHwCLczJgntyG/zlsSd7DgDgMPOkI=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "458ccdb55c9ea22cd5d13ec3051aaefb295321be", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.3.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.4": { + "flake": false, + "locked": { + "lastModified": 1699862708, + "narHash": "sha256-YHXSkdz53zd0fYGIYOgLt6HrA0eaRJi9mXVqDgmvrjk=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "54507ef7e85fa8e9d0eb9a669832a3287ffccd57", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.4.0.1", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.5": { + "flake": false, + "locked": { + "lastModified": 1701080174, + "narHash": "sha256-fyiR9TaHGJIIR0UmcCb73Xv9TJq3ht2ioxQ2mT7kVdc=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "27f8c3d3892e38edaef5bea3870161815c4d014c", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.5.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.6": { + "flake": false, + "locked": { + "lastModified": 1705325287, + "narHash": "sha256-+P87oLdlPyMw8Mgoul7HMWdEvWP/fNlo8jyNtwME8E8=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "6e0b342fa0327e628610f2711f8c3e4eaaa08b1e", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.6.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.7": { + "flake": false, + "locked": { + "lastModified": 1708965829, + "narHash": "sha256-LfJ+TBcBFq/XKoiNI7pc4VoHg4WmuzsFxYJ3Fu+Jf+M=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "50322b0a4aefb27adc5ec42f5055aaa8f8e38001", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.7.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.8": { + "flake": false, + "locked": { + "lastModified": 1715153580, + "narHash": "sha256-Vi/iUt2pWyUJlo9VrYgTcbRviWE0cFO6rmGi9rmALw0=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "dd1be1beb16700de59e0d6801957290bcf956a0a", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.8.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hls-2.9": { + "flake": false, + "locked": { + "lastModified": 1718469202, + "narHash": "sha256-THXSz+iwB1yQQsr/PY151+2GvtoJnTIB2pIQ4OzfjD4=", + "owner": "haskell", + "repo": "haskell-language-server", + "rev": "40891bccb235ebacce020b598b083eab9dda80f1", + "type": "github" + }, + "original": { + "owner": "haskell", + "ref": "2.9.0.0", + "repo": "haskell-language-server", + "type": "github" + } + }, + "hpc-coveralls": { + "flake": false, + "locked": { + "lastModified": 1607498076, + "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", + "type": "github" + }, + "original": { + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "type": "github" + } + }, + "hpc-coveralls_2": { + "flake": false, + "locked": { + "lastModified": 1607498076, + "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", + "type": "github" + }, + "original": { + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "type": "github" + } + }, + "hydra": { "inputs": { "nix": "nix", + "nixpkgs": [ + "cardano-faucet", + "haskellNix", + "hydra", + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1671755331, + "narHash": "sha256-hXsgJj0Cy0ZiCiYdW2OdBz5WmFyOMKuw4zyxKpgUKm4=", + "owner": "NixOS", + "repo": "hydra", + "rev": "f48f00ee6d5727ae3e488cbf9ce157460853fea8", + "type": "github" + }, + "original": { + "id": "hydra", + "type": "indirect" + } + }, + "hydra_2": { + "inputs": { + "nix": "nix_2", "nixpkgs": [ "haskell-nix", "hydra", @@ -731,6 +1209,24 @@ "type": "indirect" } }, + "incl": { + "inputs": { + "nixlib": "nixlib" + }, + "locked": { + "lastModified": 1693483555, + "narHash": "sha256-Beq4WhSeH3jRTZgC1XopTSU10yLpK1nmMcnGoXO0XYo=", + "owner": "divnix", + "repo": "incl", + "rev": "526751ad3d1e23b07944b14e3f6b7a5948d3007b", + "type": "github" + }, + "original": { + "owner": "divnix", + "repo": "incl", + "type": "github" + } + }, "inclusive": { "inputs": { "stdlib": "stdlib" @@ -752,7 +1248,7 @@ "inputs-check": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1692633913, @@ -770,10 +1266,10 @@ }, "iohk-nix": { "inputs": { - "blst": "blst", - "nixpkgs": "nixpkgs_4", - "secp256k1": "secp256k1", - "sodium": "sodium" + "blst": "blst_2", + "nixpkgs": "nixpkgs_6", + "secp256k1": "secp256k1_2", + "sodium": "sodium_2" }, "locked": { "lastModified": 1721825987, @@ -791,10 +1287,10 @@ }, "iohk-nix-ng": { "inputs": { - "blst": "blst_2", - "nixpkgs": "nixpkgs_5", - "secp256k1": "secp256k1_2", - "sodium": "sodium_2" + "blst": "blst_3", + "nixpkgs": "nixpkgs_7", + "secp256k1": "secp256k1_3", + "sodium": "sodium_3" }, "locked": { "lastModified": 1721825987, @@ -810,7 +1306,45 @@ "type": "github" } }, + "iohkNix": { + "inputs": { + "blst": "blst", + "nixpkgs": "nixpkgs_3", + "secp256k1": "secp256k1", + "sodium": "sodium" + }, + "locked": { + "lastModified": 1702362799, + "narHash": "sha256-cU8cZXNuo5GRwrSvWqdaqoW5tJ2HWwDEOvWwIVPDPmo=", + "owner": "input-output-hk", + "repo": "iohk-nix", + "rev": "b426fb9e0b109a9d1dd2e1476f9e0bd8bb715142", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "iohk-nix", + "type": "github" + } + }, "iserv-proxy": { + "flake": false, + "locked": { + "lastModified": 1717479972, + "narHash": "sha256-7vE3RQycHI1YT9LHJ1/fUaeln2vIpYm6Mmn8FTpYeVo=", + "owner": "stable-haskell", + "repo": "iserv-proxy", + "rev": "2ed34002247213fc435d0062350b91bab920626e", + "type": "github" + }, + "original": { + "owner": "stable-haskell", + "ref": "iserv-syms", + "repo": "iserv-proxy", + "type": "github" + } + }, + "iserv-proxy_2": { "flake": false, "locked": { "lastModified": 1688517130, @@ -860,6 +1394,22 @@ "type": "github" } }, + "lowdown-src_2": { + "flake": false, + "locked": { + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" + } + }, "nix": { "inputs": { "lowdown-src": "lowdown-src", @@ -883,13 +1433,34 @@ }, "nix_2": { "inputs": { - "flake-compat": "flake-compat_3", + "lowdown-src": "lowdown-src_2", + "nixpkgs": "nixpkgs_4", + "nixpkgs-regression": "nixpkgs-regression_2" + }, + "locked": { + "lastModified": 1661606874, + "narHash": "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=", + "owner": "NixOS", + "repo": "nix", + "rev": "11e45768b34fdafdcf019ddbd337afa16127ff0f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "2.11.0", + "repo": "nix", + "type": "github" + } + }, + "nix_3": { + "inputs": { + "flake-compat": "flake-compat_4", "flake-parts": "flake-parts_4", "git-hooks-nix": "git-hooks-nix", "libgit2": "libgit2", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_8", "nixpkgs-23-11": "nixpkgs-23-11", - "nixpkgs-regression": "nixpkgs-regression_2" + "nixpkgs-regression": "nixpkgs-regression_3" }, "locked": { "lastModified": 1727313940, @@ -906,6 +1477,21 @@ "type": "github" } }, + "nixlib": { + "locked": { + "lastModified": 1667696192, + "narHash": "sha256-hOdbIhnpWvtmVynKcsj10nxz9WROjZja+1wRAJ/C9+s=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "babd9cd2ca6e413372ed59fbb1ecc3c3a5fd3e5b", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1680945546, @@ -933,60 +1519,140 @@ }, "original": { "owner": "NixOS", - "ref": "nixpkgs-20.03-darwin", + "ref": "nixpkgs-20.03-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2003_2": { + "locked": { + "lastModified": 1620055814, + "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-20.03-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2105": { + "locked": { + "lastModified": 1659914493, + "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2105_2": { + "locked": { + "lastModified": 1659914493, + "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2111": { + "locked": { + "lastModified": 1659446231, + "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2111_2": { + "locked": { + "lastModified": 1659446231, + "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-21.11-darwin", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-2105": { + "nixpkgs-2205": { "locked": { - "lastModified": 1659914493, - "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", + "lastModified": 1685573264, + "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", + "rev": "380be19fbd2d9079f677978361792cb25e8a3635", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-21.05-darwin", + "ref": "nixpkgs-22.05-darwin", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-2111": { + "nixpkgs-2205_2": { "locked": { - "lastModified": 1659446231, - "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", + "lastModified": 1685573264, + "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", + "rev": "380be19fbd2d9079f677978361792cb25e8a3635", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-21.11-darwin", + "ref": "nixpkgs-22.05-darwin", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-2205": { + "nixpkgs-2211": { "locked": { - "lastModified": 1685573264, - "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=", + "lastModified": 1688392541, + "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "380be19fbd2d9079f677978361792cb25e8a3635", + "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-22.05-darwin", + "ref": "nixpkgs-22.11-darwin", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-2211": { + "nixpkgs-2211_2": { "locked": { "lastModified": 1688392541, "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", @@ -1019,6 +1685,22 @@ } }, "nixpkgs-2305": { + "locked": { + "lastModified": 1705033721, + "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-23.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2305_2": { "locked": { "lastModified": 1690680713, "narHash": "sha256-NXCWA8N+GfSQyoN7ZNiOgq/nDJKOp5/BHEpiZP8sUZw=", @@ -1034,6 +1716,38 @@ "type": "github" } }, + "nixpkgs-2311": { + "locked": { + "lastModified": 1719957072, + "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-23.11-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-2405": { + "locked": { + "lastModified": 1720122915, + "narHash": "sha256-Nby8WWxj0elBu1xuRaUcRjPi/rU3xVbkAt2kj4QwX2U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "835cf2d3f37989c5db6585a28de967a667a75fb1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-24.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-lib": { "locked": { "dir": "lib", @@ -1120,6 +1834,22 @@ "type": "github" } }, + "nixpkgs-regression_3": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1702777222, @@ -1137,6 +1867,22 @@ } }, "nixpkgs-unstable": { + "locked": { + "lastModified": 1720181791, + "narHash": "sha256-i4vJL12/AdyuQuviMMd1Hk2tsGt02hDNhA0Zj1m16N8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable_2": { "locked": { "lastModified": 1690720142, "narHash": "sha256-GywuiZjBKfFkntQwpNQfL+Ksa2iGjPprBGL0/psgRZM=", @@ -1152,7 +1898,7 @@ "type": "github" } }, - "nixpkgs-unstable_2": { + "nixpkgs-unstable_3": { "locked": { "lastModified": 1727266098, "narHash": "sha256-AHTKbJ9ffR7Nx+XcR2XP0AYLI4OlUh2IGh4SAkdG5Ig=", @@ -1168,6 +1914,37 @@ "type": "github" } }, + "nixpkgs_10": { + "locked": { + "lastModified": 1702539185, + "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "locked": { + "lastModified": 1636823747, + "narHash": "sha256-oWo1nElRAOZqEf90Yek2ixdHyjD+gqtS/pAgwaQ9UhQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "f6a2ed2082d9a51668c86ba27d0b5496f7a2ea93", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1657693803, @@ -1185,6 +1962,38 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1684171562, + "narHash": "sha256-BMUWjVWAUdyMWKk0ATMC9H0Bv4qAV/TXwwPUvTiC5IQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "55af203d468a6f5032a519cba4f41acf5a74b638", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "release-22.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1657693803, + "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-22.05-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1692339729, "narHash": "sha256-TUK76/Pqm9qIDjEGd27Lz9EiBIvn5F70JWDmEQ4Y5DQ=", @@ -1200,7 +2009,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_6": { "locked": { "lastModified": 1684171562, "narHash": "sha256-BMUWjVWAUdyMWKk0ATMC9H0Bv4qAV/TXwwPUvTiC5IQ=", @@ -1216,7 +2025,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_7": { "locked": { "lastModified": 1684171562, "narHash": "sha256-BMUWjVWAUdyMWKk0ATMC9H0Bv4qAV/TXwwPUvTiC5IQ=", @@ -1232,7 +2041,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_8": { "locked": { "lastModified": 1723688146, "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", @@ -1248,7 +2057,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_9": { "locked": { "lastModified": 1717281328, "narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=", @@ -1264,38 +2073,24 @@ "type": "github" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1702539185, - "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { + "old-ghc-nix": { + "flake": false, "locked": { - "lastModified": 1636823747, - "narHash": "sha256-oWo1nElRAOZqEf90Yek2ixdHyjD+gqtS/pAgwaQ9UhQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "f6a2ed2082d9a51668c86ba27d0b5496f7a2ea93", + "lastModified": 1631092763, + "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=", + "owner": "angerman", + "repo": "old-ghc-nix", + "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8", "type": "github" }, "original": { - "owner": "nixos", - "repo": "nixpkgs", + "owner": "angerman", + "ref": "master", + "repo": "old-ghc-nix", "type": "github" } }, - "old-ghc-nix": { + "old-ghc-nix_2": { "flake": false, "locked": { "lastModified": 1631092763, @@ -1350,6 +2145,7 @@ "cardano-db-sync-schema": "cardano-db-sync-schema", "cardano-db-sync-schema-ng": "cardano-db-sync-schema-ng", "cardano-db-sync-service": "cardano-db-sync-service", + "cardano-faucet": "cardano-faucet", "cardano-metadata-service": "cardano-metadata-service", "cardano-node-service": "cardano-node-service", "cardano-node-service-ng": "cardano-node-service-ng", @@ -1363,9 +2159,9 @@ "inputs-check": "inputs-check", "iohk-nix": "iohk-nix", "iohk-nix-ng": "iohk-nix-ng", - "nix": "nix_2", - "nixpkgs": "nixpkgs_7", - "nixpkgs-unstable": "nixpkgs-unstable_2", + "nix": "nix_3", + "nixpkgs": "nixpkgs_9", + "nixpkgs-unstable": "nixpkgs-unstable_3", "opentofu-registry": "opentofu-registry", "process-compose-flake": "process-compose-flake", "services-flake": "services-flake", @@ -1408,6 +2204,23 @@ "type": "github" } }, + "secp256k1_3": { + "flake": false, + "locked": { + "lastModified": 1683999695, + "narHash": "sha256-9nJJVENMXjXEJZzw8DHzin1DkFkF8h9m/c6PuM7Uk4s=", + "owner": "bitcoin-core", + "repo": "secp256k1", + "rev": "acf5c55ae6a94e5ca847e07def40427547876101", + "type": "github" + }, + "original": { + "owner": "bitcoin-core", + "ref": "v0.3.2", + "repo": "secp256k1", + "type": "github" + } + }, "services-flake": { "locked": { "lastModified": 1705690208, @@ -1457,9 +2270,26 @@ "type": "github" } }, + "sodium_3": { + "flake": false, + "locked": { + "lastModified": 1675156279, + "narHash": "sha256-0uRcN5gvMwO7MCXVYnoqG/OmeBFi8qRVnDWJLnBb9+Y=", + "owner": "input-output-hk", + "repo": "libsodium", + "rev": "dbb48cce5429cb6585c9034f002568964f1ce567", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "libsodium", + "rev": "dbb48cce5429cb6585c9034f002568964f1ce567", + "type": "github" + } + }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_10", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -1492,6 +2322,22 @@ "type": "github" } }, + "stackage": { + "flake": false, + "locked": { + "lastModified": 1725408838, + "narHash": "sha256-tHw95xcMElCqI6xOLmdTAEvQ0/4IS7WBZc+RF7HT/uk=", + "owner": "input-output-hk", + "repo": "stackage.nix", + "rev": "2ab3b5a823933ef199a289fbf39bbf0da0023100", + "type": "github" + }, + "original": { + "owner": "input-output-hk", + "repo": "stackage.nix", + "type": "github" + } + }, "stdlib": { "locked": { "lastModified": 1590026685, @@ -1507,12 +2353,27 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "terranix": { "inputs": { "bats-assert": "bats-assert", "bats-support": "bats-support", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_9", + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_11", "terranix-examples": "terranix-examples" }, "locked": { diff --git a/flake.nix b/flake.nix index 78ff01c..ffeb2b5 100644 --- a/flake.nix +++ b/flake.nix @@ -20,6 +20,9 @@ treefmt-nix.url = "github:numtide/treefmt-nix"; treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; + cardano-faucet.url = "github:input-output-hk/cardano-faucet/jl/ipv6-compat"; + # cardano-faucet.url = "path:/home/jlotoski/work/iohk/cardano-faucet-wt/jl/ipv6-compat"; + # Process compose related process-compose-flake.url = "github:Platonic-systems/process-compose-flake"; services-flake.url = "github:juspay/services-flake"; diff --git a/flakeModules/pkgs.nix b/flakeModules/pkgs.nix index 9226e4b..d53e31c 100644 --- a/flakeModules/pkgs.nix +++ b/flakeModules/pkgs.nix @@ -428,8 +428,11 @@ in (mkPkg "cardano-db-sync-ng" (caPkgs."\"cardano-db-sync:exe:cardano-db-sync\"-input-output-hk-cardano-db-sync-13-5-0-2-fe05fc5" // {meta.mainProgram = "cardano-db-sync";})) (mkPkg "cardano-db-tool" caPkgs."\"cardano-db-tool:exe:cardano-db-tool\"-input-output-hk-cardano-db-sync-13-5-0-2-fe05fc5") (mkPkg "cardano-db-tool-ng" caPkgs."\"cardano-db-tool:exe:cardano-db-tool\"-input-output-hk-cardano-db-sync-13-5-0-2-fe05fc5") - (mkPkg "cardano-faucet" caPkgs."\"cardano-faucet:exe:cardano-faucet\"-input-output-hk-cardano-faucet-9-1-0f9206e") - (mkPkg "cardano-faucet-ng" caPkgs."\"cardano-faucet:exe:cardano-faucet\"-input-output-hk-cardano-faucet-9-1-0f9206e") + # (mkPkg "cardano-faucet" caPkgs."\"cardano-faucet:exe:cardano-faucet\"-input-output-hk-cardano-faucet-9-1-0f9206e") + # (mkPkg "cardano-faucet-ng" caPkgs."\"cardano-faucet:exe:cardano-faucet\"-input-output-hk-cardano-faucet-9-1-0f9206e") + (mkPkg "cardano-faucet" localFlake.inputs.cardano-faucet.packages.x86_64-linux."cardano-faucet:exe:cardano-faucet") + (mkPkg "cardano-faucet-ng" localFlake.inputs.cardano-faucet.packages.x86_64-linux."cardano-faucet:exe:cardano-faucet") + (mkPkg "cardano-node" (caPkgs."cardano-node-input-output-hk-cardano-node-9-2-1-5d3da8a" // {version = "9.2.1";})) (mkPkg "cardano-node-ng" (caPkgs."cardano-node-input-output-hk-cardano-node-9-2-1-5d3da8a" // {version = "9.2.1";})) (mkPkg "cardano-ogmios" caPkgs.ogmios-input-output-hk-cardano-ogmios-v6-3-0-8ab5fd6) From 0e49263732383e659a08f811bf86d5d14bbd72e2 Mon Sep 17 00:00:00 2001 From: John Lotoski Date: Thu, 3 Oct 2024 10:22:29 -0500 Subject: [PATCH 11/11] bump: capkgs for cardano-faucet 9.2 --- flake.lock | 1047 ++++------------------------------------- flake.nix | 7 +- flakeModules/pkgs.nix | 10 +- 3 files changed, 103 insertions(+), 961 deletions(-) diff --git a/flake.lock b/flake.lock index 3ae97f8..9522f4d 100644 --- a/flake.lock +++ b/flake.lock @@ -1,22 +1,5 @@ { "nodes": { - "CHaP": { - "flake": false, - "locked": { - "lastModified": 1725372492, - "narHash": "sha256-eQwfZIEHH5qHZQHXujgjj35dVAqSZa6EbTRWeppn1ME=", - "owner": "input-output-hk", - "repo": "cardano-haskell-packages", - "rev": "05c9f8fb28fde6e46d8768ce396a4482883d6bab", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "repo", - "repo": "cardano-haskell-packages", - "type": "github" - } - }, "HTTP": { "flake": false, "locked": { @@ -33,22 +16,6 @@ "type": "github" } }, - "HTTP_2": { - "flake": false, - "locked": { - "lastModified": 1451647621, - "narHash": "sha256-oHIyw3x0iKBexEo49YeUDV1k74ZtyYKGR2gNJXXRxts=", - "owner": "phadej", - "repo": "HTTP", - "rev": "9bc0996d412fef1787449d841277ef663ad9a915", - "type": "github" - }, - "original": { - "owner": "phadej", - "repo": "HTTP", - "type": "github" - } - }, "auth-keys-hub": { "inputs": { "flake-parts": "flake-parts", @@ -105,23 +72,6 @@ } }, "blst": { - "flake": false, - "locked": { - "lastModified": 1656163412, - "narHash": "sha256-xero1aTe2v4IhWIJaEDUsVDOfE77dOV5zKeHWntHogY=", - "owner": "supranational", - "repo": "blst", - "rev": "03b5124029979755c752eec45f3c29674b558446", - "type": "github" - }, - "original": { - "owner": "supranational", - "repo": "blst", - "rev": "03b5124029979755c752eec45f3c29674b558446", - "type": "github" - } - }, - "blst_2": { "flake": false, "locked": { "lastModified": 1691598027, @@ -138,7 +88,7 @@ "type": "github" } }, - "blst_3": { + "blst_2": { "flake": false, "locked": { "lastModified": 1691598027, @@ -172,23 +122,6 @@ "type": "github" } }, - "cabal-32_2": { - "flake": false, - "locked": { - "lastModified": 1603716527, - "narHash": "sha256-X0TFfdD4KZpwl0Zr6x+PLxUt/VyKQfX7ylXHdmZIL+w=", - "owner": "haskell", - "repo": "cabal", - "rev": "48bf10787e27364730dd37a42b603cee8d6af7ee", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "3.2", - "repo": "cabal", - "type": "github" - } - }, "cabal-34": { "flake": false, "locked": { @@ -206,23 +139,6 @@ "type": "github" } }, - "cabal-34_2": { - "flake": false, - "locked": { - "lastModified": 1645834128, - "narHash": "sha256-wG3d+dOt14z8+ydz4SL7pwGfe7SiimxcD/LOuPCV6xM=", - "owner": "haskell", - "repo": "cabal", - "rev": "5ff598c67f53f7c4f48e31d722ba37172230c462", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "3.4", - "repo": "cabal", - "type": "github" - } - }, "cabal-36": { "flake": false, "locked": { @@ -240,30 +156,13 @@ "type": "github" } }, - "cabal-36_2": { - "flake": false, - "locked": { - "lastModified": 1669081697, - "narHash": "sha256-I5or+V7LZvMxfbYgZATU4awzkicBwwok4mVoje+sGmU=", - "owner": "haskell", - "repo": "cabal", - "rev": "8fd619e33d34924a94e691c5fea2c42f0fc7f144", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "3.6", - "repo": "cabal", - "type": "github" - } - }, "capkgs": { "locked": { - "lastModified": 1727224209, - "narHash": "sha256-o1bsBy7ild7fDSMHwUOhPRDBsGol7ovqSKC2IFQDYGw=", + "lastModified": 1727968530, + "narHash": "sha256-40vaqMh09VmQo4hBOVjId82U7ASUOmMNR7aGGZbVwdQ=", "owner": "input-output-hk", "repo": "capkgs", - "rev": "6ef31cc3e5b2d16a11a050bd2acf6d5a6da8dee6", + "rev": "cc9373555eb2dd13791adc7128b6869241d33c36", "type": "github" }, "original": { @@ -322,34 +221,6 @@ "type": "github" } }, - "cardano-faucet": { - "inputs": { - "CHaP": "CHaP", - "flake-utils": "flake-utils", - "haskellNix": "haskellNix", - "incl": "incl", - "iohkNix": "iohkNix", - "nixpkgs": [ - "cardano-faucet", - "haskellNix", - "nixpkgs-unstable" - ] - }, - "locked": { - "lastModified": 1727818446, - "narHash": "sha256-KYXA/pelKg3uKvzNbRoaDbusQ+ogQtFoUc4Pem7VAMo=", - "owner": "input-output-hk", - "repo": "cardano-faucet", - "rev": "d2de4c36449eeecb768d0d5bcf6939864e812d72", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "jl/ipv6-compat", - "repo": "cardano-faucet", - "type": "github" - } - }, "cardano-metadata-service": { "flake": false, "locked": { @@ -434,22 +305,6 @@ "type": "github" } }, - "cardano-shell_2": { - "flake": false, - "locked": { - "lastModified": 1608537748, - "narHash": "sha256-PulY1GfiMgKVnBci3ex4ptk2UNYMXqGjJOxcPy2KYT4=", - "owner": "input-output-hk", - "repo": "cardano-shell", - "rev": "9392c75087cb9a3d453998f4230930dea3a95725", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "cardano-shell", - "type": "github" - } - }, "cardano-tracer-service": { "flake": false, "locked": { @@ -486,8 +341,8 @@ }, "colmena": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ], @@ -524,23 +379,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1672831974, - "narHash": "sha256-z9k3MfslLjWQfnjBtEtJZdq3H7kyi2kQtUThfTgdRk0=", - "owner": "input-output-hk", - "repo": "flake-compat", - "rev": "45f2638735f8cdc40fe302742b79f248d23eb368", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "hkm/gitlab-fix", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1650374568, @@ -556,7 +394,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1672831974, @@ -573,7 +411,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -665,25 +503,6 @@ } }, "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1681378341, - "narHash": "sha256-2qUN04W6X9cHHytEsJTM41CmusifPTC0bgTtYsHSNY8=", - "owner": "hamishmack", - "repo": "flake-utils", - "rev": "2767bafdb189cd623354620c2dacbeca8fd58b17", - "type": "github" - }, - "original": { - "owner": "hamishmack", - "ref": "hkm/nested-hydraJobs", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -698,7 +517,7 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "locked": { "lastModified": 1679360468, "narHash": "sha256-LGnza3cfXF10Biw3ZTg0u9o9t7s680Ww200t5KkHTh8=", @@ -714,7 +533,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "locked": { "lastModified": 1634851050, "narHash": "sha256-N83GlSGPJJdcqhUxSCS/WwW5pksYf3VP1M13cDRTSVA=", @@ -746,23 +565,6 @@ "type": "github" } }, - "ghc-8.6.5-iohk_2": { - "flake": false, - "locked": { - "lastModified": 1600920045, - "narHash": "sha256-DO6kxJz248djebZLpSzTGD6s8WRpNI9BTwUeOf5RwY8=", - "owner": "input-output-hk", - "repo": "ghc", - "rev": "95713a6ecce4551240da7c96b6176f980af75cae", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "release/8.6.5-iohk", - "repo": "ghc", - "type": "github" - } - }, "git-hooks-nix": { "inputs": { "flake-compat": [ @@ -795,22 +597,6 @@ } }, "hackage": { - "flake": false, - "locked": { - "lastModified": 1725409900, - "narHash": "sha256-XfSA7YyjHUfuNsCw4cE6p0kQcmrJgQq3nW36Cw/PAv0=", - "owner": "input-output-hk", - "repo": "hackage.nix", - "rev": "d86e544dec33ce5fb0ad3981be91074d397b700d", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "hackage.nix", - "type": "github" - } - }, - "hackage_2": { "flake": false, "locked": { "lastModified": 1692145451, @@ -827,77 +613,23 @@ } }, "haskell-nix": { - "inputs": { - "HTTP": "HTTP_2", - "cabal-32": "cabal-32_2", - "cabal-34": "cabal-34_2", - "cabal-36": "cabal-36_2", - "cardano-shell": "cardano-shell_2", - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_3", - "ghc-8.6.5-iohk": "ghc-8.6.5-iohk_2", - "hackage": "hackage_2", - "hls-1.10": "hls-1.10_2", - "hls-2.0": "hls-2.0_2", - "hpc-coveralls": "hpc-coveralls_2", - "hydra": "hydra_2", - "iserv-proxy": "iserv-proxy_2", - "nixpkgs": [ - "haskell-nix", - "nixpkgs-unstable" - ], - "nixpkgs-2003": "nixpkgs-2003_2", - "nixpkgs-2105": "nixpkgs-2105_2", - "nixpkgs-2111": "nixpkgs-2111_2", - "nixpkgs-2205": "nixpkgs-2205_2", - "nixpkgs-2211": "nixpkgs-2211_2", - "nixpkgs-2305": "nixpkgs-2305_2", - "nixpkgs-unstable": "nixpkgs-unstable_2", - "old-ghc-nix": "old-ghc-nix_2", - "stackage": [ - "empty-flake" - ] - }, - "locked": { - "lastModified": 1692147008, - "narHash": "sha256-ZiRaryaboJbNZ7y7XKZs2xuSfydZyGeupJNOfYpgQSw=", - "owner": "input-output-hk", - "repo": "haskell.nix", - "rev": "1970bb2d5b0eb8152f89b305f32d055dbd6857d9", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "haskell.nix", - "type": "github" - } - }, - "haskellNix": { "inputs": { "HTTP": "HTTP", "cabal-32": "cabal-32", "cabal-34": "cabal-34", "cabal-36": "cabal-36", "cardano-shell": "cardano-shell", - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", "ghc-8.6.5-iohk": "ghc-8.6.5-iohk", "hackage": "hackage", "hls-1.10": "hls-1.10", "hls-2.0": "hls-2.0", - "hls-2.2": "hls-2.2", - "hls-2.3": "hls-2.3", - "hls-2.4": "hls-2.4", - "hls-2.5": "hls-2.5", - "hls-2.6": "hls-2.6", - "hls-2.7": "hls-2.7", - "hls-2.8": "hls-2.8", - "hls-2.9": "hls-2.9", "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", "nixpkgs": [ - "cardano-faucet", - "haskellNix", + "haskell-nix", "nixpkgs-unstable" ], "nixpkgs-2003": "nixpkgs-2003", @@ -906,18 +638,18 @@ "nixpkgs-2205": "nixpkgs-2205", "nixpkgs-2211": "nixpkgs-2211", "nixpkgs-2305": "nixpkgs-2305", - "nixpkgs-2311": "nixpkgs-2311", - "nixpkgs-2405": "nixpkgs-2405", "nixpkgs-unstable": "nixpkgs-unstable", "old-ghc-nix": "old-ghc-nix", - "stackage": "stackage" + "stackage": [ + "empty-flake" + ] }, "locked": { - "lastModified": 1725411053, - "narHash": "sha256-cW999pULNLOZHlV9sqBFIrWTkSxuVAVR6xJR7GndHdQ=", + "lastModified": 1692147008, + "narHash": "sha256-ZiRaryaboJbNZ7y7XKZs2xuSfydZyGeupJNOfYpgQSw=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "63783ecc949e99b2396ca821275cee26385adaba", + "rev": "1970bb2d5b0eb8152f89b305f32d055dbd6857d9", "type": "github" }, "original": { @@ -943,23 +675,6 @@ "type": "github" } }, - "hls-1.10_2": { - "flake": false, - "locked": { - "lastModified": 1680000865, - "narHash": "sha256-rc7iiUAcrHxwRM/s0ErEsSPxOR3u8t7DvFeWlMycWgo=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "b08691db779f7a35ff322b71e72a12f6e3376fd9", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "1.10.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, "hls-2.0": { "flake": false, "locked": { @@ -977,218 +692,25 @@ "type": "github" } }, - "hls-2.0_2": { + "hpc-coveralls": { "flake": false, "locked": { - "lastModified": 1687698105, - "narHash": "sha256-OHXlgRzs/kuJH8q7Sxh507H+0Rb8b7VOiPAjcY9sM1k=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "783905f211ac63edf982dd1889c671653327e441", + "lastModified": 1607498076, + "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", + "owner": "sevanspowell", + "repo": "hpc-coveralls", + "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", "type": "github" }, "original": { - "owner": "haskell", - "ref": "2.0.0.1", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.2": { - "flake": false, - "locked": { - "lastModified": 1693064058, - "narHash": "sha256-8DGIyz5GjuCFmohY6Fa79hHA/p1iIqubfJUTGQElbNk=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "b30f4b6cf5822f3112c35d14a0cba51f3fe23b85", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.2.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.3": { - "flake": false, - "locked": { - "lastModified": 1695910642, - "narHash": "sha256-tR58doOs3DncFehHwCLczJgntyG/zlsSd7DgDgMPOkI=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "458ccdb55c9ea22cd5d13ec3051aaefb295321be", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.3.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.4": { - "flake": false, - "locked": { - "lastModified": 1699862708, - "narHash": "sha256-YHXSkdz53zd0fYGIYOgLt6HrA0eaRJi9mXVqDgmvrjk=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "54507ef7e85fa8e9d0eb9a669832a3287ffccd57", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.4.0.1", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.5": { - "flake": false, - "locked": { - "lastModified": 1701080174, - "narHash": "sha256-fyiR9TaHGJIIR0UmcCb73Xv9TJq3ht2ioxQ2mT7kVdc=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "27f8c3d3892e38edaef5bea3870161815c4d014c", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.5.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.6": { - "flake": false, - "locked": { - "lastModified": 1705325287, - "narHash": "sha256-+P87oLdlPyMw8Mgoul7HMWdEvWP/fNlo8jyNtwME8E8=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "6e0b342fa0327e628610f2711f8c3e4eaaa08b1e", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.6.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.7": { - "flake": false, - "locked": { - "lastModified": 1708965829, - "narHash": "sha256-LfJ+TBcBFq/XKoiNI7pc4VoHg4WmuzsFxYJ3Fu+Jf+M=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "50322b0a4aefb27adc5ec42f5055aaa8f8e38001", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.7.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.8": { - "flake": false, - "locked": { - "lastModified": 1715153580, - "narHash": "sha256-Vi/iUt2pWyUJlo9VrYgTcbRviWE0cFO6rmGi9rmALw0=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "dd1be1beb16700de59e0d6801957290bcf956a0a", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.8.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hls-2.9": { - "flake": false, - "locked": { - "lastModified": 1718469202, - "narHash": "sha256-THXSz+iwB1yQQsr/PY151+2GvtoJnTIB2pIQ4OzfjD4=", - "owner": "haskell", - "repo": "haskell-language-server", - "rev": "40891bccb235ebacce020b598b083eab9dda80f1", - "type": "github" - }, - "original": { - "owner": "haskell", - "ref": "2.9.0.0", - "repo": "haskell-language-server", - "type": "github" - } - }, - "hpc-coveralls": { - "flake": false, - "locked": { - "lastModified": 1607498076, - "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", - "type": "github" - }, - "original": { - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "type": "github" - } - }, - "hpc-coveralls_2": { - "flake": false, - "locked": { - "lastModified": 1607498076, - "narHash": "sha256-8uqsEtivphgZWYeUo5RDUhp6bO9j2vaaProQxHBltQk=", - "owner": "sevanspowell", - "repo": "hpc-coveralls", - "rev": "14df0f7d229f4cd2e79f8eabb1a740097fdfa430", - "type": "github" - }, - "original": { - "owner": "sevanspowell", - "repo": "hpc-coveralls", + "owner": "sevanspowell", + "repo": "hpc-coveralls", "type": "github" } }, "hydra": { "inputs": { "nix": "nix", - "nixpkgs": [ - "cardano-faucet", - "haskellNix", - "hydra", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1671755331, - "narHash": "sha256-hXsgJj0Cy0ZiCiYdW2OdBz5WmFyOMKuw4zyxKpgUKm4=", - "owner": "NixOS", - "repo": "hydra", - "rev": "f48f00ee6d5727ae3e488cbf9ce157460853fea8", - "type": "github" - }, - "original": { - "id": "hydra", - "type": "indirect" - } - }, - "hydra_2": { - "inputs": { - "nix": "nix_2", "nixpkgs": [ "haskell-nix", "hydra", @@ -1209,24 +731,6 @@ "type": "indirect" } }, - "incl": { - "inputs": { - "nixlib": "nixlib" - }, - "locked": { - "lastModified": 1693483555, - "narHash": "sha256-Beq4WhSeH3jRTZgC1XopTSU10yLpK1nmMcnGoXO0XYo=", - "owner": "divnix", - "repo": "incl", - "rev": "526751ad3d1e23b07944b14e3f6b7a5948d3007b", - "type": "github" - }, - "original": { - "owner": "divnix", - "repo": "incl", - "type": "github" - } - }, "inclusive": { "inputs": { "stdlib": "stdlib" @@ -1248,7 +752,7 @@ "inputs-check": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1692633913, @@ -1266,10 +770,10 @@ }, "iohk-nix": { "inputs": { - "blst": "blst_2", - "nixpkgs": "nixpkgs_6", - "secp256k1": "secp256k1_2", - "sodium": "sodium_2" + "blst": "blst", + "nixpkgs": "nixpkgs_4", + "secp256k1": "secp256k1", + "sodium": "sodium" }, "locked": { "lastModified": 1721825987, @@ -1287,10 +791,10 @@ }, "iohk-nix-ng": { "inputs": { - "blst": "blst_3", - "nixpkgs": "nixpkgs_7", - "secp256k1": "secp256k1_3", - "sodium": "sodium_3" + "blst": "blst_2", + "nixpkgs": "nixpkgs_5", + "secp256k1": "secp256k1_2", + "sodium": "sodium_2" }, "locked": { "lastModified": 1721825987, @@ -1306,45 +810,7 @@ "type": "github" } }, - "iohkNix": { - "inputs": { - "blst": "blst", - "nixpkgs": "nixpkgs_3", - "secp256k1": "secp256k1", - "sodium": "sodium" - }, - "locked": { - "lastModified": 1702362799, - "narHash": "sha256-cU8cZXNuo5GRwrSvWqdaqoW5tJ2HWwDEOvWwIVPDPmo=", - "owner": "input-output-hk", - "repo": "iohk-nix", - "rev": "b426fb9e0b109a9d1dd2e1476f9e0bd8bb715142", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "iohk-nix", - "type": "github" - } - }, "iserv-proxy": { - "flake": false, - "locked": { - "lastModified": 1717479972, - "narHash": "sha256-7vE3RQycHI1YT9LHJ1/fUaeln2vIpYm6Mmn8FTpYeVo=", - "owner": "stable-haskell", - "repo": "iserv-proxy", - "rev": "2ed34002247213fc435d0062350b91bab920626e", - "type": "github" - }, - "original": { - "owner": "stable-haskell", - "ref": "iserv-syms", - "repo": "iserv-proxy", - "type": "github" - } - }, - "iserv-proxy_2": { "flake": false, "locked": { "lastModified": 1688517130, @@ -1394,22 +860,6 @@ "type": "github" } }, - "lowdown-src_2": { - "flake": false, - "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "repo": "lowdown", - "type": "github" - } - }, "nix": { "inputs": { "lowdown-src": "lowdown-src", @@ -1433,34 +883,13 @@ }, "nix_2": { "inputs": { - "lowdown-src": "lowdown-src_2", - "nixpkgs": "nixpkgs_4", - "nixpkgs-regression": "nixpkgs-regression_2" - }, - "locked": { - "lastModified": 1661606874, - "narHash": "sha256-9+rpYzI+SmxJn+EbYxjGv68Ucp22bdFUSy/4LkHkkDQ=", - "owner": "NixOS", - "repo": "nix", - "rev": "11e45768b34fdafdcf019ddbd337afa16127ff0f", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "2.11.0", - "repo": "nix", - "type": "github" - } - }, - "nix_3": { - "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_4", "git-hooks-nix": "git-hooks-nix", "libgit2": "libgit2", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_6", "nixpkgs-23-11": "nixpkgs-23-11", - "nixpkgs-regression": "nixpkgs-regression_3" + "nixpkgs-regression": "nixpkgs-regression_2" }, "locked": { "lastModified": 1727313940, @@ -1477,21 +906,6 @@ "type": "github" } }, - "nixlib": { - "locked": { - "lastModified": 1667696192, - "narHash": "sha256-hOdbIhnpWvtmVynKcsj10nxz9WROjZja+1wRAJ/C9+s=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "babd9cd2ca6e413372ed59fbb1ecc3c3a5fd3e5b", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1680945546, @@ -1514,145 +928,65 @@ "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-20.03-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2003_2": { - "locked": { - "lastModified": 1620055814, - "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-20.03-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2105": { - "locked": { - "lastModified": 1659914493, - "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2105_2": { - "locked": { - "lastModified": 1659914493, - "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2111": { - "locked": { - "lastModified": 1659446231, - "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-21.11-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2111_2": { - "locked": { - "lastModified": 1659446231, - "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", + "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-21.11-darwin", + "ref": "nixpkgs-20.03-darwin", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-2205": { + "nixpkgs-2105": { "locked": { - "lastModified": 1685573264, - "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=", + "lastModified": 1659914493, + "narHash": "sha256-lkA5X3VNMKirvA+SUzvEhfA7XquWLci+CGi505YFAIs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "380be19fbd2d9079f677978361792cb25e8a3635", + "rev": "022caabb5f2265ad4006c1fa5b1ebe69fb0c3faf", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-22.05-darwin", + "ref": "nixpkgs-21.05-darwin", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-2205_2": { + "nixpkgs-2111": { "locked": { - "lastModified": 1685573264, - "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=", + "lastModified": 1659446231, + "narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "380be19fbd2d9079f677978361792cb25e8a3635", + "rev": "eabc38219184cc3e04a974fe31857d8e0eac098d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-22.05-darwin", + "ref": "nixpkgs-21.11-darwin", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-2211": { + "nixpkgs-2205": { "locked": { - "lastModified": 1688392541, - "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", + "lastModified": 1685573264, + "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ea4c80b39be4c09702b0cb3b42eab59e2ba4f24b", + "rev": "380be19fbd2d9079f677978361792cb25e8a3635", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-22.11-darwin", + "ref": "nixpkgs-22.05-darwin", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-2211_2": { + "nixpkgs-2211": { "locked": { "lastModified": 1688392541, "narHash": "sha256-lHrKvEkCPTUO+7tPfjIcb7Trk6k31rz18vkyqmkeJfY=", @@ -1685,22 +1019,6 @@ } }, "nixpkgs-2305": { - "locked": { - "lastModified": 1705033721, - "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-23.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2305_2": { "locked": { "lastModified": 1690680713, "narHash": "sha256-NXCWA8N+GfSQyoN7ZNiOgq/nDJKOp5/BHEpiZP8sUZw=", @@ -1716,38 +1034,6 @@ "type": "github" } }, - "nixpkgs-2311": { - "locked": { - "lastModified": 1719957072, - "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-23.11-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-2405": { - "locked": { - "lastModified": 1720122915, - "narHash": "sha256-Nby8WWxj0elBu1xuRaUcRjPi/rU3xVbkAt2kj4QwX2U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "835cf2d3f37989c5db6585a28de967a667a75fb1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-24.05-darwin", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-lib": { "locked": { "dir": "lib", @@ -1834,22 +1120,6 @@ "type": "github" } }, - "nixpkgs-regression_3": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, "nixpkgs-stable": { "locked": { "lastModified": 1702777222, @@ -1867,22 +1137,6 @@ } }, "nixpkgs-unstable": { - "locked": { - "lastModified": 1720181791, - "narHash": "sha256-i4vJL12/AdyuQuviMMd1Hk2tsGt02hDNhA0Zj1m16N8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4284c2b73c8bce4b46a6adf23e16d9e2ec8da4bb", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable_2": { "locked": { "lastModified": 1690720142, "narHash": "sha256-GywuiZjBKfFkntQwpNQfL+Ksa2iGjPprBGL0/psgRZM=", @@ -1898,7 +1152,7 @@ "type": "github" } }, - "nixpkgs-unstable_3": { + "nixpkgs-unstable_2": { "locked": { "lastModified": 1727266098, "narHash": "sha256-AHTKbJ9ffR7Nx+XcR2XP0AYLI4OlUh2IGh4SAkdG5Ig=", @@ -1914,37 +1168,6 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1702539185, - "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1636823747, - "narHash": "sha256-oWo1nElRAOZqEf90Yek2ixdHyjD+gqtS/pAgwaQ9UhQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "f6a2ed2082d9a51668c86ba27d0b5496f7a2ea93", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1657693803, @@ -1962,38 +1185,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1684171562, - "narHash": "sha256-BMUWjVWAUdyMWKk0ATMC9H0Bv4qAV/TXwwPUvTiC5IQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "55af203d468a6f5032a519cba4f41acf5a74b638", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-22.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1657693803, - "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.05-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1692339729, "narHash": "sha256-TUK76/Pqm9qIDjEGd27Lz9EiBIvn5F70JWDmEQ4Y5DQ=", @@ -2009,7 +1200,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_4": { "locked": { "lastModified": 1684171562, "narHash": "sha256-BMUWjVWAUdyMWKk0ATMC9H0Bv4qAV/TXwwPUvTiC5IQ=", @@ -2025,7 +1216,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_5": { "locked": { "lastModified": 1684171562, "narHash": "sha256-BMUWjVWAUdyMWKk0ATMC9H0Bv4qAV/TXwwPUvTiC5IQ=", @@ -2041,7 +1232,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_6": { "locked": { "lastModified": 1723688146, "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", @@ -2057,7 +1248,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_7": { "locked": { "lastModified": 1717281328, "narHash": "sha256-evZPzpf59oNcDUXxh2GHcxHkTEG4fjae2ytWP85jXRo=", @@ -2073,24 +1264,38 @@ "type": "github" } }, - "old-ghc-nix": { - "flake": false, + "nixpkgs_8": { "locked": { - "lastModified": 1631092763, - "narHash": "sha256-sIKgO+z7tj4lw3u6oBZxqIhDrzSkvpHtv0Kki+lh9Fg=", - "owner": "angerman", - "repo": "old-ghc-nix", - "rev": "af48a7a7353e418119b6dfe3cd1463a657f342b8", + "lastModified": 1702539185, + "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", "type": "github" }, "original": { - "owner": "angerman", - "ref": "master", - "repo": "old-ghc-nix", + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_9": { + "locked": { + "lastModified": 1636823747, + "narHash": "sha256-oWo1nElRAOZqEf90Yek2ixdHyjD+gqtS/pAgwaQ9UhQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "f6a2ed2082d9a51668c86ba27d0b5496f7a2ea93", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", "type": "github" } }, - "old-ghc-nix_2": { + "old-ghc-nix": { "flake": false, "locked": { "lastModified": 1631092763, @@ -2145,7 +1350,6 @@ "cardano-db-sync-schema": "cardano-db-sync-schema", "cardano-db-sync-schema-ng": "cardano-db-sync-schema-ng", "cardano-db-sync-service": "cardano-db-sync-service", - "cardano-faucet": "cardano-faucet", "cardano-metadata-service": "cardano-metadata-service", "cardano-node-service": "cardano-node-service", "cardano-node-service-ng": "cardano-node-service-ng", @@ -2159,9 +1363,9 @@ "inputs-check": "inputs-check", "iohk-nix": "iohk-nix", "iohk-nix-ng": "iohk-nix-ng", - "nix": "nix_3", - "nixpkgs": "nixpkgs_9", - "nixpkgs-unstable": "nixpkgs-unstable_3", + "nix": "nix_2", + "nixpkgs": "nixpkgs_7", + "nixpkgs-unstable": "nixpkgs-unstable_2", "opentofu-registry": "opentofu-registry", "process-compose-flake": "process-compose-flake", "services-flake": "services-flake", @@ -2204,23 +1408,6 @@ "type": "github" } }, - "secp256k1_3": { - "flake": false, - "locked": { - "lastModified": 1683999695, - "narHash": "sha256-9nJJVENMXjXEJZzw8DHzin1DkFkF8h9m/c6PuM7Uk4s=", - "owner": "bitcoin-core", - "repo": "secp256k1", - "rev": "acf5c55ae6a94e5ca847e07def40427547876101", - "type": "github" - }, - "original": { - "owner": "bitcoin-core", - "ref": "v0.3.2", - "repo": "secp256k1", - "type": "github" - } - }, "services-flake": { "locked": { "lastModified": 1705690208, @@ -2270,26 +1457,9 @@ "type": "github" } }, - "sodium_3": { - "flake": false, - "locked": { - "lastModified": 1675156279, - "narHash": "sha256-0uRcN5gvMwO7MCXVYnoqG/OmeBFi8qRVnDWJLnBb9+Y=", - "owner": "input-output-hk", - "repo": "libsodium", - "rev": "dbb48cce5429cb6585c9034f002568964f1ce567", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "libsodium", - "rev": "dbb48cce5429cb6585c9034f002568964f1ce567", - "type": "github" - } - }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_8", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -2322,22 +1492,6 @@ "type": "github" } }, - "stackage": { - "flake": false, - "locked": { - "lastModified": 1725408838, - "narHash": "sha256-tHw95xcMElCqI6xOLmdTAEvQ0/4IS7WBZc+RF7HT/uk=", - "owner": "input-output-hk", - "repo": "stackage.nix", - "rev": "2ab3b5a823933ef199a289fbf39bbf0da0023100", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "repo": "stackage.nix", - "type": "github" - } - }, "stdlib": { "locked": { "lastModified": 1590026685, @@ -2353,27 +1507,12 @@ "type": "github" } }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "terranix": { "inputs": { "bats-assert": "bats-assert", "bats-support": "bats-support", - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_11", + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_9", "terranix-examples": "terranix-examples" }, "locked": { diff --git a/flake.nix b/flake.nix index ffeb2b5..6f92b7b 100644 --- a/flake.nix +++ b/flake.nix @@ -20,9 +20,6 @@ treefmt-nix.url = "github:numtide/treefmt-nix"; treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; - cardano-faucet.url = "github:input-output-hk/cardano-faucet/jl/ipv6-compat"; - # cardano-faucet.url = "path:/home/jlotoski/work/iohk/cardano-faucet-wt/jl/ipv6-compat"; - # Process compose related process-compose-flake.url = "github:Platonic-systems/process-compose-flake"; services-flake.url = "github:juspay/services-flake"; @@ -34,6 +31,10 @@ iohk-nix.url = "github:input-output-hk/iohk-nix"; iohk-nix-ng.url = "github:input-output-hk/iohk-nix"; + # For tmp local faucet testing + # cardano-faucet.url = "github:input-output-hk/cardano-faucet/jl/node-9.2"; + # cardano-faucet.url = "path:/home/jlotoski/work/iohk/cardano-faucet-wt/jl/node-9.2"; + # Cardano-db-sync schema input pins, which must match the # versioning of the release and pre-release (-ng) dbsync # definitions found in flakeModule/pkgs.nix. diff --git a/flakeModules/pkgs.nix b/flakeModules/pkgs.nix index d53e31c..b798e00 100644 --- a/flakeModules/pkgs.nix +++ b/flakeModules/pkgs.nix @@ -428,10 +428,12 @@ in (mkPkg "cardano-db-sync-ng" (caPkgs."\"cardano-db-sync:exe:cardano-db-sync\"-input-output-hk-cardano-db-sync-13-5-0-2-fe05fc5" // {meta.mainProgram = "cardano-db-sync";})) (mkPkg "cardano-db-tool" caPkgs."\"cardano-db-tool:exe:cardano-db-tool\"-input-output-hk-cardano-db-sync-13-5-0-2-fe05fc5") (mkPkg "cardano-db-tool-ng" caPkgs."\"cardano-db-tool:exe:cardano-db-tool\"-input-output-hk-cardano-db-sync-13-5-0-2-fe05fc5") - # (mkPkg "cardano-faucet" caPkgs."\"cardano-faucet:exe:cardano-faucet\"-input-output-hk-cardano-faucet-9-1-0f9206e") - # (mkPkg "cardano-faucet-ng" caPkgs."\"cardano-faucet:exe:cardano-faucet\"-input-output-hk-cardano-faucet-9-1-0f9206e") - (mkPkg "cardano-faucet" localFlake.inputs.cardano-faucet.packages.x86_64-linux."cardano-faucet:exe:cardano-faucet") - (mkPkg "cardano-faucet-ng" localFlake.inputs.cardano-faucet.packages.x86_64-linux."cardano-faucet:exe:cardano-faucet") + + # For tmp local faucet testing: + # (mkPkg "cardano-faucet" localFlake.inputs.cardano-faucet.packages.x86_64-linux."cardano-faucet:exe:cardano-faucet") + # (mkPkg "cardano-faucet-ng" localFlake.inputs.cardano-faucet.packages.x86_64-linux."cardano-faucet:exe:cardano-faucet") + (mkPkg "cardano-faucet" caPkgs."\"cardano-faucet:exe:cardano-faucet\"-input-output-hk-cardano-faucet-9-2-78124cd") + (mkPkg "cardano-faucet-ng" caPkgs."\"cardano-faucet:exe:cardano-faucet\"-input-output-hk-cardano-faucet-9-2-78124cd") (mkPkg "cardano-node" (caPkgs."cardano-node-input-output-hk-cardano-node-9-2-1-5d3da8a" // {version = "9.2.1";})) (mkPkg "cardano-node-ng" (caPkgs."cardano-node-input-output-hk-cardano-node-9-2-1-5d3da8a" // {version = "9.2.1";}))