Merge #138: Update nixpkgs (lnd 0.8.1 -> lnd 0.9.0, clightning 0.8.0 -> 0.8.1)
b6d7e81c31Update nixpkgs (lnd 0.8.1 -> lnd 0.9.0, clightning 0.8.0 -> 0.8.1) (Jonas Nick) Pull request description: ACKs for top commit: erikarvstedt: ACKb6d7e81c31Tree-SHA512: 82e672a22543770fb08f9199f7c626451a8f112b6b981db39a21643133c85c46dff8ad23b07166633cd5efbf8f5063fe65e41cd0847f9c0f2dc4ec5a4c083750
This commit is contained in:
commit
a26a82ab90
2 changed files with 4 additions and 17 deletions
|
|
@ -26,16 +26,3 @@ services.connman doesn't exist in stable nixpkgs
|
|||
|
||||
# Speed up booting by not waiting for ARP.
|
||||
networking.dhcpcd.extraConfig = "noarp";
|
||||
|
||||
The test driver assumed coreutils to be in PATH. This fix will be ported to upstream.
|
||||
--- a/nixos/lib/testing-python.nix
|
||||
+++ b/nixos/lib/testing-python.nix
|
||||
@@ -155,7 +155,7 @@ in rec {
|
||||
--add-flags "''${vms[*]}" \
|
||||
${lib.optionalString enableOCR
|
||||
"--prefix PATH : '${ocrProg}/bin:${imagemagick_tiff}/bin'"} \
|
||||
- --run "export testScript=\"\$(cat $out/test-script)\"" \
|
||||
+ --run "export testScript=\"\$(${coreutils}/bin/cat $out/test-script)\"" \
|
||||
--set VLANS '${toString vlans}'
|
||||
ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms
|
||||
wrapProgram $out/bin/nixos-run-vms \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue