Merge fort-nix/nix-bitcoin#670: update nixpkgs

3afe639215 update nixpkgs (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 3afe639215

Tree-SHA512: 915ef75d8a7ee19a85ee2ef83c885ff0b641f7b21eb5955f039c47bf983bba6c6cac6a3451414fb7c6013cd6289a16ab07dfc24c91ca8b1d70a126955c55d4de

flake.lock

@@ -28,11 +28,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "lastModified": 1705309234,
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1702233072,
-        "narHash": "sha256-H5G2wgbim2Ku6G6w+NSaQaauv6B6DlPhY9fMvArKqRo=",
+        "lastModified": 1705183652,
+        "narHash": "sha256-rnfkyUH0x72oHfiSDhuCHDHg3gFgF+lF8zkkg5Zihsw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "781e2a9797ecf0f146e81425c822dca69fe4a348",
+        "rev": "428544ae95eec077c7f823b422afae5f174dee4b",
         "type": "github"
       },
       "original": {
@@ -59,11 +59,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1701336116,
-        "narHash": "sha256-kEmpezCR/FpITc6yMbAh4WrOCiT2zg5pSjnKrq51h5Y=",
+        "lastModified": 1705242415,
+        "narHash": "sha256-a8DRYrNrzTudvO7XHUPNJD89Wbf1ZZT0VbwCsPnHWaE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f5c27c6136db4d76c30e533c20517df6864c46ee",
+        "rev": "ea780f3de2d169f982564128804841500e85e373",
         "type": "github"
       },
       "original": {

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

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;

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 {};

pkgs/python-packages/specific-versions/bitstring.nix

@@ -1,40 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, fetchpatch
-, unittestCheckHook
-}:
-
-buildPythonPackage rec {
-  pname = "bitstring";
-  version = "3.1.9";
-
-  src = fetchFromGitHub {
-    owner = "scott-griffiths";
-    repo = pname;
-    rev = "bitstring-${version}";
-    sha256 = "0y2kcq58psvl038r6dhahhlhp1wjgr5zsms45wyz1naq6ri8x9qa";
-  };
-
-  patches = [
-    (fetchpatch {
-      name = "fix-running-unit-tests-using-unittest-hook.patch";
-      url = "https://github.com/scott-griffiths/bitstring/commit/e5ee3fd41cad2ea761f4450b13b0424ae7262331.patch";
-      hash = "sha256-+ZGywIfQQcYXJlYZBi402ONnysYm66G5zE4duJE40h8=";
-    })
-  ];
-
-  checkInputs = [ unittestCheckHook ];
-
-  unittestFlagsArray = [ "-s" "test" ];
-
-  pythonImportsCheck = [ "bitstring" ];
-
-  meta = with lib; {
-    description = "Module for binary data manipulation";
-    homepage = "https://github.com/scott-griffiths/bitstring";
-    license = licenses.mit;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ bjornfor ];
-  };
-}