Merge #704: Update nixpkgs

47e5782 update nixpkgs (Jonas Nick)
2bb70e8 update-flake.sh: support 2.18.2 (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 47e5782

Tree-SHA512: 67290afde0bc7fb1df89f9afd59136fd5e6c0434cd8a9f3373f17cca70f334b43c9a7193f149c0a7f8eaf8d5cdc463de17b5b5b5b1e58338d28dfe34dbf9bb8d

Author: jonasnick

flake.lock

@@ -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

helper/update-flake.sh

@@ -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