forked from lix-project/lix
Fix tests
This commit is contained in:
parent
005d1e4ccb
commit
b461721f17
|
@ -1,4 +1,4 @@
|
||||||
{ nixpkgs ? <nixpkgs>, nixos ? <nixos>
|
{ nixpkgs ? <nixpkgs>
|
||||||
, nix ? { outPath = ./.; revCount = 1234; shortRev = "abcdef"; }
|
, nix ? { outPath = ./.; revCount = 1234; shortRev = "abcdef"; }
|
||||||
, officialRelease ? false
|
, officialRelease ? false
|
||||||
}:
|
}:
|
||||||
|
@ -145,11 +145,11 @@ let
|
||||||
|
|
||||||
# System tests.
|
# System tests.
|
||||||
tests.remote_builds = (import ./tests/remote-builds.nix rec {
|
tests.remote_builds = (import ./tests/remote-builds.nix rec {
|
||||||
inherit nixpkgs nixos; nix = build { inherit system; }; system = "x86_64-linux";
|
nix = build { inherit system; }; system = "x86_64-linux";
|
||||||
}).test;
|
}).test;
|
||||||
|
|
||||||
tests.nix_copy_closure = (import ./tests/nix-copy-closure.nix rec {
|
tests.nix_copy_closure = (import ./tests/nix-copy-closure.nix rec {
|
||||||
inherit nixpkgs nixos; nix = build { inherit system; }; system = "x86_64-linux";
|
nix = build { inherit system; }; system = "x86_64-linux";
|
||||||
}).test;
|
}).test;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# Test ‘nix-copy-closure’.
|
# Test ‘nix-copy-closure’.
|
||||||
|
|
||||||
{ nixpkgs, nixos, system, nix }:
|
{ system, nix }:
|
||||||
|
|
||||||
with import "${nixos}/lib/testing.nix" { inherit nixpkgs system; };
|
with import <nixos/lib/testing.nix> { inherit system; };
|
||||||
|
|
||||||
makeTest ({ pkgs, ... }: let pkgA = pkgs.aterm; pkgB = pkgs.wget; in {
|
makeTest ({ pkgs, ... }: let pkgA = pkgs.aterm; pkgB = pkgs.wget; in {
|
||||||
|
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# Test Nix's remote build feature.
|
# Test Nix's remote build feature.
|
||||||
|
|
||||||
{ nixpkgs, nixos, system, nix }:
|
{ system, nix }:
|
||||||
|
|
||||||
with import "${nixos}/lib/testing.nix" { inherit nixpkgs system; };
|
with import <nixos/lib/testing.nix> { inherit system; };
|
||||||
|
|
||||||
makeTest ({ pkgs, ... }:
|
makeTest ({ pkgs, ... }:
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue