Merge fort-nix/nix-bitcoin#451: Update nixpkgs

282454f16e update nixpkgs{,-unstable} (Jonas Nick)
15b88cc1c5 update-flake: fix attribute path of pinned (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 282454f16e

Tree-SHA512: fcd29837685b351532715b376cb21f9dc72d14458ae035435473f34def74e17e690a794b0f72701d85af901852ed7a40e757ac89b3c182bf4cf91a23fd14d3f4

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "flake-utils": {
       "locked": {
-        "lastModified": 1642700792,
-        "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
+        "lastModified": 1644229661,
+        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
+        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
         "type": "github"
       },
       "original": {
@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1643247693,
-        "narHash": "sha256-rmShxIuNjYBz4l83J0J++sug+MURUY1koPCzX4F8hfo=",
+        "lastModified": 1644193793,
+        "narHash": "sha256-ggCI5LCXwkUJQwjpkr9qDFbQMiK3JvAfeNR4Uy0ny5Q=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6c4b9f1a2fd761e2d384ef86cff0d208ca27fdca",
+        "rev": "521e4d7d13b09bc0a21976b9d19abd197d4e3b1e",
         "type": "github"
       },
       "original": {
@@ -33,11 +33,11 @@
     },
     "nixpkgsUnstable": {
       "locked": {
-        "lastModified": 1643119265,
-        "narHash": "sha256-mmDEctIkHSWcC/HRpeaw6QOe+DbNOSzc0wsXAHOZWwo=",
+        "lastModified": 1644330694,
+        "narHash": "sha256-bxfJfDL8nKWR+LOwUf9xoZol8WKcahPS4EbD1U4kLT0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b05d2077ebe219f6a47825767f8bab5c6211d200",
+        "rev": "18a062b02d6eb382714187b06e3bfc3ba25ace78",
         "type": "github"
       },
       "original": {

helper/update-flake.nix

@@ -11,7 +11,7 @@ in rec {
   # A pinned pkg is added to `stable` if the stable and unstable pkg versions
   # are identical.
   versions = let
-    pinned = flake.legacyPackages.x86_64-linux.nbPkgs.pinned;
+    pinned = flake.legacyPackages.x86_64-linux.pinned;
     pinnedPkgs = lib.filterAttrs (n: v: lib.isDerivation v) pinned;
     stable = pinned.pkgs;
     unstable = pinned.pkgsUnstable;

test/nixos-search/flake.lock

@@ -5,11 +5,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1643128221,
-        "narHash": "sha256-qTRsU3LUPJk8QDRrc4WXkgarpFFCh0n/vsuRE71cwMw=",
+        "lastModified": 1644071056,
+        "narHash": "sha256-vClz4PD7cwckP8SEnaIIfLqfgT2v6MwB3aJcqemmDp8=",
         "owner": "nixos",
         "repo": "nixos-search",
-        "rev": "bb82e171f821aaa31cf2450b05820f346a0712e8",
+        "rev": "b4163eb8b20a9956c4b63eb88ca06da3e1dd7f86",
         "type": "github"
       },
       "original": {

test/tests.py

@@ -193,7 +193,7 @@ def _():
     wait_for_open_port(ip("nbxplorer"), 24444)
 
     assert_running("btcpayserver")
-    machine.wait_until_succeeds(log_has_string("btcpayserver", "Listening on"))
+    machine.wait_until_succeeds(log_has_string("btcpayserver", "Now listening on"))
     wait_for_open_port(ip("btcpayserver"), 23000)
     # test lnd custom macaroon
     assert_matches(