commit 7e5d1ccf67064302d33da17e376b130bd744e4e2
parent 93125bb09ba3726deacdf504293e50d4e2e0bce9
Author: Daniel Barlow <dan@telent.net>
Date: Tue, 5 May 2026 20:51:40 +0100
fix tests thst need overlay.nix
Diffstat:
9 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/tests/ext4/test.nix b/tests/ext4/test.nix
@@ -4,7 +4,9 @@ let
device = import <liminix/devices/qemu>;
liminix-config = ./configuration.nix;
}).outputs.vmroot;
- pkgs = import <nixpkgs> { overlays = [ (import ../../overlay.nix) ]; };
+ pkgs = import <nixpkgs> {
+ overlays = [ ((import ../../overlay.nix) <nixpkgs>) ];
+ };
in
pkgs.runCommand "check"
{
diff --git a/tests/fennel/test.nix b/tests/fennel/test.nix
@@ -1,5 +1,5 @@
let
- overlay = import <liminix/overlay.nix>;
+ overlay = import <liminix/overlay.nix> <nixpkgs>;
pkgs = import <nixpkgs> { overlays = [ overlay ]; };
script = pkgs.writeFennel "foo" { } ./hello.fnl;
inherit (pkgs.lua.pkgs) fifo;
diff --git a/tests/inout/test.nix b/tests/inout/test.nix
@@ -4,7 +4,7 @@ let
device = import <liminix/devices/qemu>;
liminix-config = ./configuration.nix;
}).outputs.vmroot;
- pkgs = import <nixpkgs> { overlays = [ (import ../../overlay.nix) ]; };
+ pkgs = import <nixpkgs> { overlays = [ (import ../../overlay.nix <nixpkgs>) ]; };
in
pkgs.runCommand "check"
{
diff --git a/tests/jffs2/test.nix b/tests/jffs2/test.nix
@@ -4,7 +4,7 @@ let
device = import <liminix/devices/qemu>;
liminix-config = ./configuration.nix;
}).outputs.vmroot;
- pkgs = import <nixpkgs> { overlays = [ (import ../../overlay.nix) ]; };
+ pkgs = import <nixpkgs> { overlays = [ (import ../../overlay.nix <nixpkgs>) ]; };
in
pkgs.runCommand "check"
{
diff --git a/tests/min-copy-closure/test.nix b/tests/min-copy-closure/test.nix
@@ -7,7 +7,7 @@ let
);
myPkg = lmx.pkgs.rsyncSmall;
img = lmx.outputs.vmroot;
- pkgs = import <nixpkgs> { overlays = [ (import ../../overlay.nix) ]; };
+ pkgs = import <nixpkgs> { overlays = [ (import ../../overlay.nix <nixpkgs>) ]; };
in
pkgs.runCommand "check"
{
diff --git a/tests/pppoe/test.nix b/tests/pppoe/test.nix
@@ -4,7 +4,7 @@ let
device = import <liminix/devices/qemu>;
liminix-config = ./configuration.nix;
}).outputs.default;
- pkgs = import <nixpkgs> { overlays = [ (import ../../overlay.nix) ]; };
+ pkgs = import <nixpkgs> { overlays = [ (import ../../overlay.nix <nixpkgs>) ]; };
inherit (pkgs.pkgsBuildBuild) routeros;
in
pkgs.runCommand "check"
diff --git a/tests/pseudofiles/test.nix b/tests/pseudofiles/test.nix
@@ -1,5 +1,5 @@
let
- overlay = import <liminix/overlay.nix>;
+ overlay = import <liminix/overlay.nix> <nixpkgs>;
pkgs = import <nixpkgs> { overlays = [ overlay ]; };
fixture = pkgs.callPackage ./fixture.nix { };
in
diff --git a/tests/updown/test.nix b/tests/updown/test.nix
@@ -4,7 +4,7 @@ let
device = import <liminix/devices/qemu>;
liminix-config = ./configuration.nix;
}).outputs.vmroot;
- pkgs = import <nixpkgs> { overlays = [ (import ../../overlay.nix) ]; };
+ pkgs = import <nixpkgs> { overlays = [ (import ../../overlay.nix <nixpkgs>) ]; };
in
pkgs.runCommand "check"
{
diff --git a/tests/wlan/test.nix b/tests/wlan/test.nix
@@ -4,7 +4,7 @@ let
device = import <liminix/devices/qemu-armv7l>;
liminix-config = ./configuration.nix;
}).outputs.default;
- pkgs = import <nixpkgs> { overlays = [ (import ../../overlay.nix) ]; };
+ pkgs = import <nixpkgs> { overlays = [ (import ../../overlay.nix <nixpkgs>) ]; };
in
pkgs.runCommand "check"
{