From 2bb70e84be8206a9b43ffb33f8c16ed8cc7e3b08 Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Fri, 24 May 2024 17:03:34 +0000 Subject: [PATCH 1/2] update-flake.sh: support 2.18.2 2.18.2 is greater than 2.18 but does not support --flake. --- helper/update-flake.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/helper/update-flake.sh b/helper/update-flake.sh index 9bbfd4abf..002fd0b89 100755 --- a/helper/update-flake.sh +++ b/helper/update-flake.sh @@ -39,13 +39,13 @@ if [[ $forceRun ]] && ! git diff --quiet ../flake.{nix,lock}; then exit 1 fi -# Support Nix >2.18 +# Support Nix >=2.19 { - versionGreaterThan() { - [[ $1 != $(echo -e "$1\n$2" | sort -V | head -n1) ]] + versionGreaterThanOrEqual() { + [[ $1 != $(echo -e "$1\n$2" | sort -V | head -n1) || $1 == "$2" ]] } nixVersion=$(nix --version | cut -d\ -f 3) - if versionGreaterThan "$nixVersion" 2.18; then + if versionGreaterThanOrEqual "$nixVersion" 2.19; then # https://nixos.org/manual/nix/stable/release-notes/rl-2.19#:~:text=nix%20flake%20update nixUpdateArg=--flake else From 47e57821f6a49616667f5a04e903ef4b23c4b979 Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Fri, 24 May 2024 17:04:39 +0000 Subject: [PATCH 2/2] update nixpkgs electrs: 0.10.1 -> 0.10.5 --- flake.lock | 12 +++++------ pkgs/pinned.nix | 2 +- test/nixos-search/flake.lock | 42 +++++++++++++++++++++++++----------- 3 files changed, 37 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index 240b3c337..ad02e46f4 100644 --- a/flake.lock +++ b/flake.lock @@ -43,11 +43,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1714782413, - "narHash": "sha256-tbg0MEuKaPcUrnmGCu4xiY5F+7LW2+ECPKVAJd2HLwM=", + "lastModified": 1716361217, + "narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "651b4702e27a388f0f18e1b970534162dec09aff", + "rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f", "type": "github" }, "original": { @@ -59,11 +59,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1714809261, - "narHash": "sha256-hfBmnYFyz9I1mdrC3tX1A+dF9cOUcds5PIMPxrT+cRk=", + "lastModified": 1716451822, + "narHash": "sha256-0lT5RVelqN+dgXWWneXvV5ufSksW0r0TDQi8O6U2+o8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d32560238207b8e26d88b265207b216ee46b8450", + "rev": "3305b2b25e4ae4baee872346eae133cf6f611783", "type": "github" }, "original": { diff --git a/pkgs/pinned.nix b/pkgs/pinned.nix index 20a217ad7..f8a8d95f2 100644 --- a/pkgs/pinned.nix +++ b/pkgs/pinned.nix @@ -3,7 +3,6 @@ pkgs: pkgsUnstable: { inherit (pkgs) charge-lnd - electrs extra-container lightning-loop lightning-pool @@ -14,6 +13,7 @@ pkgs: pkgsUnstable: bitcoind btcpayserver clightning + electrs elementsd fulcrum hwi diff --git a/test/nixos-search/flake.lock b/test/nixos-search/flake.lock index db1842523..f454405e8 100644 --- a/test/nixos-search/flake.lock +++ b/test/nixos-search/flake.lock @@ -1,12 +1,15 @@ { "nodes": { "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -18,11 +21,11 @@ "nixos-infra": { "flake": false, "locked": { - "lastModified": 1709405783, - "narHash": "sha256-qZ1lM5kTiqQT/jbhim0CxYaEqlfJKTQvytyaBflkDnM=", + "lastModified": 1714782417, + "narHash": "sha256-AhnsgqwOvK7Ftv1Sw9uzJGxov0cx9ygSjcKQSAWbiPg=", "owner": "NixOS", "repo": "infra", - "rev": "1261d183ad0c1cf036853087be306e7c792e0cdd", + "rev": "0b39213973d7a4bab9f710dadb8ea1b14d206627", "type": "github" }, "original": { @@ -39,11 +42,11 @@ "npmlock2nix": "npmlock2nix" }, "locked": { - "lastModified": 1714664183, - "narHash": "sha256-qceVzCWtdfEvfNgAnhf+X4CfaEJ3XjC1bBVvX3dTH1I=", + "lastModified": 1715356306, + "narHash": "sha256-PRGw/1gCYDsLVXFwSGfOWe9vJhiQ7lE0XHpKXLDcsRw=", "owner": "nixos", "repo": "nixos-search", - "rev": "0c6625918268410ed0f62731b865284536bf91ce", + "rev": "1242aebd1438548fa1e3699824599337cce4cd32", "type": "github" }, "original": { @@ -54,11 +57,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1680213900, - "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=", + "lastModified": 1714635257, + "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e3652e0735fbec227f342712f180f4f21f0594f2", + "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", "type": "github" }, "original": { @@ -87,6 +90,21 @@ "inputs": { "nixos-search": "nixos-search" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root",