From 6bdf0ac3fb485438098b668341dcf205066dcdaf Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Thu, 5 May 2022 09:55:05 +0000 Subject: [PATCH] update nixpkgs{,-unstable} This commit does not pass the tests. Fixup is in the next commit. bitcoin: 22.0 -> 23.0 bitcoind: 22.0 -> 23.0 btcpayserver: 1.4.7 -> 1.5.1 clightning: 0.10.2 -> 0.11.0.1 electrs: 0.9.6 -> 0.9.7 hwi: 2.0.2 -> 2.1.0 lightning-loop: 0.17.0-beta -> 0.18.0-beta lnd: 0.14.2-beta -> 0.14.3-beta nbxplorer: 2.2.20 -> 2.3.20 --- flake.lock | 18 +++++++++--------- pkgs/pinned.nix | 8 ++++---- test/nixos-search/flake.lock | 35 ++++++++++++++++++++++++++--------- 3 files changed, 39 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index e9addae..7d91083 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1648297722, - "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", + "lastModified": 1649676176, + "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", "owner": "numtide", "repo": "flake-utils", - "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", + "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", "type": "github" }, "original": { @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1648965846, - "narHash": "sha256-xaO0KS+sgZLYrhaQNjVe6eRcOUIM1mEkAjT+dRbPblU=", + "lastModified": 1651571855, + "narHash": "sha256-KZie6c2J2DUPLjG2PkYSwGLvD6RygA3TxZSPQpctbNI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0aac710801aec4ba545527cf41a5706028fe6271", + "rev": "fd43ce017d4c95f47166d28664a004f57458a0b1", "type": "github" }, "original": { @@ -33,11 +33,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1648219316, - "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", + "lastModified": 1651634615, + "narHash": "sha256-VtvcS61bLh5mIBm9cV3idUHdlfPRFus/NwdJfaj5s8o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634", + "rev": "abfd31179174133ab8131139d650297bf4da63b7", "type": "github" }, "original": { diff --git a/pkgs/pinned.nix b/pkgs/pinned.nix index 951a70d..3bb2f03 100644 --- a/pkgs/pinned.nix +++ b/pkgs/pinned.nix @@ -2,18 +2,18 @@ pkgs: pkgsUnstable: { inherit (pkgs) - bitcoin - bitcoind charge-lnd - clightning extra-container - hwi lndconnect; inherit (pkgsUnstable) + bitcoin + bitcoind btcpayserver + clightning electrs elementsd + hwi lightning-loop lightning-pool lnd diff --git a/test/nixos-search/flake.lock b/test/nixos-search/flake.lock index 20e2c6e..904dd3b 100644 --- a/test/nixos-search/flake.lock +++ b/test/nixos-search/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", + "lastModified": 1649676176, + "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", "owner": "numtide", "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", + "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", "type": "github" }, "original": { @@ -15,17 +15,34 @@ "type": "github" } }, + "nixos-org-configurations": { + "flake": false, + "locked": { + "lastModified": 1648674978, + "narHash": "sha256-7lVlPb9/Lu3M9xPzwdvtgqkeQI4FAMv+T3v+yT54ZZ0=", + "owner": "NixOS", + "repo": "nixos-org-configurations", + "rev": "76c0687ac275235142dae7c855aab2885302298c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixos-org-configurations", + "type": "github" + } + }, "nixos-search": { "inputs": { "flake-utils": "flake-utils", + "nixos-org-configurations": "nixos-org-configurations", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1648850703, - "narHash": "sha256-nZeV3sV3UU9NzJPSGrPN8/clecTqx9byQUtTjS7XMXk=", + "lastModified": 1650836881, + "narHash": "sha256-FKsTNQWq8lv6+Qr6LouEukTsJIGEU51H1cWc1PSOtvU=", "owner": "nixos", "repo": "nixos-search", - "rev": "6ba56bc7e96ce83a5d33868b38acb04ebbc688e1", + "rev": "eea6cd3ffb4d3d39956316d6e976b9d5ce52d508", "type": "github" }, "original": { @@ -36,11 +53,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1642903813, - "narHash": "sha256-0lNfGW8sNfyTrixoQhVG00Drl/ECaf5GbfKAQ1ZDoyE=", + "lastModified": 1650701402, + "narHash": "sha256-XKfstdtqDg+O+gNBx1yGVKWIhLgfEDg/e2lvJSsp9vU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "689b76bcf36055afdeb2e9852f5ecdd2bf483f87", + "rev": "bc41b01dd7a9fdffd32d9b03806798797532a5fe", "type": "github" }, "original": {