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

f51460749a ci: disable the nixos-search test (Jonas Nick)
3b798f5ebf test: increase VM memory to 4 GiB (Jonas Nick)
17f0d98c22 update nixpkgs (Jonas Nick)

Pull request description:

Top commit has no ACKs.

Tree-SHA512: 0e40353d9d7937dd7a80c05416360c30ada7ee231d6263883072d60a707443e765d35f6a393e718ed1ef66f2e2cdbd1deadd6cd720dccb5c5e18711159cda38a

.github/workflows/test.yml

@@ -49,5 +49,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v31
       - run: nix flake check --all-systems
-      - run: ./test/nixos-search/ci-test.sh
+      # FIXME: Re-enable when the nixos-search input is usable again.
+      # This is also disabled in ./test/run-tests.sh.
+      # - run: ./test/nixos-search/ci-test.sh
       - run: ./test/shellcheck.sh

flake.lock

@@ -44,11 +44,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1784432872,
+        "lastModified": 1786313170,
-        "narHash": "sha256-n3gKTBIV4ZA5VQpUakffBe3KGu4+mhPoA34rrqS0GkA=",
+        "narHash": "sha256-9BG7OgUWdu0ONDO5X2q6+K4bsuBITkX/3W4nNJu1Ito=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fd1462031fdee08f65fd0b4c6b64e22239a77870",
+        "rev": "fcb8fcd6bf2d0adecae5bd491afaaaf8311b758d",
         "type": "github"
       },
       "original": {
@@ -76,11 +76,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1784453100,
+        "lastModified": 1786348146,
-        "narHash": "sha256-zpGZb8FYui+i8KLtC0nlcmb0voR2zB80Qn8pe7lzIbk=",
+        "narHash": "sha256-we5zDEFfn8TgzeWKjKDMIjeQZ59omEPl23NIF+13/ys=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b471514bed69eff5255c8e63c1f80e5fe56c616f",
+        "rev": "d482ef84049d9b7276b83a06e4e4d76983830097",
         "type": "github"
       },
       "original": {

modules/btcpayserver.nix

@@ -239,6 +239,11 @@ in {
             --datadir='${cfg.btcpayserver.dataDir}'
         '';
         User = cfg.btcpayserver.user;
+        # Since 2.4.0, btcpayserver uses `Host.CreateDefaultBuilder`, which sets the
+        # ASP.NET content root to the working directory instead of the app directory.
+        # The web root (`wwwroot`) is resolved relative to the content root, so
+        # btcpayserver must be started from its app directory.
+        WorkingDirectory = "${cfg.btcpayserver.package}/lib/btcpayserver";
         # Also restart after the program has exited successfully.
         # This is required to support restarting from the web interface after
         # interactive plugin installation.

pkgs/pinned.nix

@@ -6,7 +6,6 @@ pkgs: pkgsUnstable: pkgs-25_05:
     bitcoind
     btcpayserver
     charge-lnd
-    clboss
     clightning
     electrs
     elementsd
@@ -16,6 +15,7 @@ pkgs: pkgsUnstable: pkgs-25_05:
 
   inherit (pkgsUnstable)
     bitcoind-knots
+    clboss
     fulcrum
     lightning-loop
     lnd;

test/lib/make-test.nix

@@ -128,8 +128,9 @@ let
       # Needed because duplicity requires 270 MB of free temp space, regardless of backup size
       diskSize = 1024;
 
-      # Min. 800 MiB needed to avoid 'out of memory' errors
+      # The `netns` scenarios need more than 2 GiB: netns-isolation adds a
-      memorySize = lib.mkDefault 2048;
+      # network namespace per service, which costs a few hundred MiB of slab.
+      memorySize = lib.mkDefault 4096;
 
       # There are no perf gains beyond 3 cores.
       # Benchmark: Ryzen 7 2700 (8 cores), VM test `default` as of 34f6eb90.

test/nixos-search/flake.lock

@@ -1,31 +1,49 @@
 {
   "nodes": {
-    "flake-utils": {
+    "flake-parts": {
       "inputs": {
-        "systems": "systems"
+        "nixpkgs-lib": [
+          "nixos-search",
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1731533236,
+        "lastModified": 1785627969,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=",
-        "owner": "numtide",
+        "owner": "hercules-ci",
-        "repo": "flake-utils",
+        "repo": "flake-parts",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a",
         "type": "github"
       },
       "original": {
-        "owner": "numtide",
+        "owner": "hercules-ci",
-        "repo": "flake-utils",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-schemas": {
+      "locked": {
+        "lastModified": 1780327564,
+        "narHash": "sha256-HiRPtA0spK+Dkgbhz/1zW9glXxNVB+L4Rj2VYmdawb8=",
+        "owner": "DeterminateSystems",
+        "repo": "flake-schemas",
+        "rev": "6cc9bd98891b1fc6bb2b8cb3277df8bc72799ca6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "DeterminateSystems",
+        "repo": "flake-schemas",
         "type": "github"
       }
     },
     "nixos-infra": {
       "flake": false,
       "locked": {
-        "lastModified": 1778186763,
+        "lastModified": 1785876137,
-        "narHash": "sha256-WYpwAXUSbAvyygzaPJ5A0MpBgCRDfOn/JlA6bhAExOM=",
+        "narHash": "sha256-maIa1tcvLYFyedzvWApdpaMLzDyTWktCXeugLOEZzDs=",
         "owner": "NixOS",
         "repo": "infra",
-        "rev": "f7fcb33b303e1026a99206c8a9a4f4d93907d5d1",
+        "rev": "952d0cfaf5d2ae350f9a2746c61e03d53a15b8db",
         "type": "github"
       },
       "original": {
@@ -36,19 +54,19 @@
     },
     "nixos-search": {
       "inputs": {
-        "flake-utils": "flake-utils",
+        "flake-parts": "flake-parts",
+        "flake-schemas": "flake-schemas",
         "nixos-infra": "nixos-infra",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-npmlock2nix": "nixpkgs-npmlock2nix",
+        "systems": "systems",
-        "npmlock2nix": "npmlock2nix",
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1778708793,
+        "lastModified": 1786265380,
-        "narHash": "sha256-LXzXKjaxm23vLEOVefy9HNfedZvdI/FvoJlFd/jjNc0=",
+        "narHash": "sha256-JX5Q9o03xYMUpAoHB4nz/0Pf3SeL7GrXoKKJhkUMNps=",
         "owner": "nixos",
         "repo": "nixos-search",
-        "rev": "4a3cb26d1ccaa9c62f29071c228dff07c3686e38",
+        "rev": "7507fd6accc65981f02f66f5c6c328e09efc1221",
         "type": "github"
       },
       "original": {
@@ -59,50 +77,15 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1777954456,
+        "lastModified": 1785967620,
-        "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
+        "narHash": "sha256-929m7iW8q2uv3mZHNwY8Um6XKj99rbIcZsWS9cT1vaI=",
-        "owner": "NixOS",
+        "rev": "b7c2ada94fe99c15b0dbcf4d11fd7850b957a436",
-        "repo": "nixpkgs",
+        "type": "tarball",
-        "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1048607.b7c2ada94fe9/nixexprs.tar.xz"
-        "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "type": "tarball",
-        "ref": "nixos-unstable",
+        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-npmlock2nix": {
-      "locked": {
-        "lastModified": 1636623366,
-        "narHash": "sha256-jOQMlv9qFSj0U66HB+ujZoapty0UbewmSNbX8+3ujUQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c5ed8beb478a8ca035f033f659b60c89500a3034",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "c5ed8beb478a8ca035f033f659b60c89500a3034",
-        "type": "github"
-      }
-    },
-    "npmlock2nix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1758100811,
-        "narHash": "sha256-qJc3ffjHVXUdZqytKcDK9XZ2b3BQ1RdYfZFuYgxbrn4=",
-        "owner": "nix-community",
-        "repo": "npmlock2nix",
-        "rev": "4d9060afbaa5f57ee0b8ef11c7044ed287a7d302",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "npmlock2nix",
-        "type": "github"
       }
     },
     "root": {
@@ -111,6 +94,7 @@
       }
     },
     "systems": {
+      "flake": false,
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -133,11 +117,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775636079,
+        "lastModified": 1785945821,
-        "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
+        "narHash": "sha256-NLSyTCW4K4ofhNBllt3omPasm6QpralXH1DBZOc91Dw=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
+        "rev": "ae7910970dddc408fe6ab1c8e4b277bb21d72dc0",
         "type": "github"
       },
       "original": {