Merge #670: update nixpkgs

3afe639 update nixpkgs (Jonas Nick) Pull request description: ACKs for top commit: erikarvstedt: ACK 3afe639 Tree-SHA512: 915ef75d8a7ee19a85ee2ef83c885ff0b641f7b21eb5955f039c47bf983bba6c6cac6a3451414fb7c6013cd6289a16ab07dfc24c91ca8b1d70a126955c55d4de
fort-nix · Jan 16, 2024 · b2e4adf · b2e4adf
2 parents 88c2a1c + 3afe639
commit b2e4adf
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 54 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/modules/joinmarket.nix b/modules/joinmarket.nix
@@ -282,6 +282,11 @@ in {
     services.bitcoind = {
       enable = true;
       disablewallet = false;
+      # TODO-EXTERNAL: remove when joinmarket supports descriptor wallets
+      # (https://github.com/JoinMarket-Org/joinmarket-clientserver/issues/1571).
+      extraConfig = ''
+        deprecatedrpc=create_bdb
+      '';
     };
 
     # Joinmarket is Tor-only

diff --git a/pkgs/pinned.nix b/pkgs/pinned.nix
@@ -6,9 +6,7 @@ pkgs: pkgsUnstable:
     bitcoind
     btcpayserver
     charge-lnd
-    clightning
     electrs
-    elementsd
     extra-container
     hwi
     lightning-loop
@@ -18,6 +16,8 @@ pkgs: pkgsUnstable:
     nbxplorer;
 
   inherit (pkgsUnstable)
+    clightning
+    elementsd
     fulcrum;
 
   inherit pkgs pkgsUnstable;

diff --git a/pkgs/python-packages/default.nix b/pkgs/python-packages/default.nix
@@ -13,9 +13,6 @@ rec {
       pyln-bolt7 = clightningPkg ./pyln-bolt7;
       pylightning = clightningPkg ./pylightning;
 
-      # bitstring 3.1.9, required by pyln-proto
-      bitstring = callPackage ./specific-versions/bitstring.nix {};
-
       # Packages only used by joinmarket
       bencoderpyx = callPackage ./bencoderpyx {};
       chromalog = callPackage ./chromalog {};

diff --git a/pkgs/python-packages/specific-versions/bitstring.nix b/pkgs/python-packages/specific-versions/bitstring.nix