Merge #692: update nixpkgs (bitcoind, lnd)

42bae23 update nixpkgs (Erik Arvstedt)
64e9998 update-flake.sh: support Nix >= 2.19 (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 42bae23

Tree-SHA512: 2f64e12adec726b97b8c9ed8cc5e0a95217902099233ab6c891d7098f3371327b86ba5eaab22a75833e71a3640067b1c7a688fe2259eb7501a1d156be0a3a7f1

Author: jonasnick

flake.lock

@@ -39,8 +39,22 @@ if [[ $forceRun ]] && ! git diff --quiet ../flake.{nix,lock}; then
     exit 1
 fi
 
+# Support Nix >2.18
+{
+    versionGreaterThan() {
+        [[ $1 != $(echo -e "$1\n$2" | sort -V | head -n1) ]]
+    }
+    nixVersion=$(nix --version | cut -d\  -f 3)
+    if versionGreaterThan "$nixVersion" 2.18; then
+        # https://nixos.org/manual/nix/stable/release-notes/rl-2.19#:~:text=nix%20flake%20update
+        nixUpdateArg=--flake
+    else
+        nixUpdateArg=
+    fi
+}
+
 echo "Updating flake 'nixos-search'"
-nix flake update ../test/nixos-search
+nix flake update $nixUpdateArg ../test/nixos-search
 echo
 
 versions=$(nix eval --json -f update-flake.nix versions)
@@ -52,7 +66,7 @@ echo "Updating main flake"
 if [[ $nixosVersion ]]; then
     sed -Ei "s|(nixpkgs.url = .*nixos-)[^\"]+|\1$nixosVersion|" ../flake.nix
 fi
-nix flake update ..
+nix flake update $nixUpdateArg ..
 
 echo
 nix eval --raw -f update-flake.nix --argstr prevVersions "$versions" showUpdates; echo

helper/update-flake.sh

@@ -10,22 +10,6 @@ in
   }
 }:
 let self = {
-  # TODO-EXTERNAL:
-  # Remove bitcoin and bitcoind 26.x packages and replace with 27.0 from nixpkgs
-  # when a version of lnd is released that is compatible with 27.0
-  # (https://github.com/lightningnetwork/lnd/pull/8664).
-  bitcoin = let inherit (pkgsUnstable) libsForQt5 stdenv darwin; in
-    libsForQt5.callPackage ./bitcoin {
-      stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
-      withGui = true;
-      inherit (darwin) autoSignDarwinBinariesHook;
-  };
-
-  bitcoind = let inherit (pkgsUnstable) callPackage darwin; in
-    callPackage ./bitcoin {
-      withGui = false;
-      inherit (darwin) autoSignDarwinBinariesHook;
-  };
   clightning-rest = pkgs.callPackage ./clightning-rest { inherit (self) fetchNodeModules; };
   clboss = pkgs.callPackage ./clboss { };
   clightning-plugins = pkgs.recurseIntoAttrs (import ./clightning-plugins pkgs self.nbPython3Packages);

pkgs/bitcoin/default.nix

@@ -10,6 +10,8 @@ pkgs: pkgsUnstable:
     lndconnect;
 
   inherit (pkgsUnstable)
+    bitcoin
+    bitcoind
     btcpayserver
     clightning
     elementsd