Skip to content

Commit 2e22bbd

Browse files
committed
Merge #451: Update nixpkgs
282454f update nixpkgs{,-unstable} (Jonas Nick) 15b88cc update-flake: fix attribute path of pinned (Jonas Nick) Pull request description: ACKs for top commit: erikarvstedt: ACK 282454f Tree-SHA512: fcd29837685b351532715b376cb21f9dc72d14458ae035435473f34def74e17e690a794b0f72701d85af901852ed7a40e757ac89b3c182bf4cf91a23fd14d3f4
2 parents 0ac9d6f + 282454f commit 2e22bbd

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

flake.lock

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

helper/update-flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ in rec {
1111
# A pinned pkg is added to `stable` if the stable and unstable pkg versions
1212
# are identical.
1313
versions = let
14-
pinned = flake.legacyPackages.x86_64-linux.nbPkgs.pinned;
14+
pinned = flake.legacyPackages.x86_64-linux.pinned;
1515
pinnedPkgs = lib.filterAttrs (n: v: lib.isDerivation v) pinned;
1616
stable = pinned.pkgs;
1717
unstable = pinned.pkgsUnstable;

test/nixos-search/flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ def _():
193193
wait_for_open_port(ip("nbxplorer"), 24444)
194194

195195
assert_running("btcpayserver")
196-
machine.wait_until_succeeds(log_has_string("btcpayserver", "Listening on"))
196+
machine.wait_until_succeeds(log_has_string("btcpayserver", "Now listening on"))
197197
wait_for_open_port(ip("btcpayserver"), 23000)
198198
# test lnd custom macaroon
199199
assert_matches(

0 commit comments

Comments
 (0)