diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2012-03-12T20·41+0100 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2012-03-12T20·41+0100 |
| commit | b461721f17d7104c7ef08a0840d80685b9ae853e (patch) | |
| tree | 8d6f6450376d6aa3d0324f7675cf695912e470f2 | |
| parent | 005d1e4ccb7917d1438dd8f14ddaeeff8eab0b30 (diff) | |
Fix tests
| -rw-r--r-- | release.nix | 6 | ||||
| -rw-r--r-- | tests/nix-copy-closure.nix | 4 | ||||
| -rw-r--r-- | tests/remote-builds.nix | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/release.nix b/release.nix index 0d3cd8be9875..c1173c30f369 100644 --- a/release.nix +++ b/release.nix @@ -1,4 +1,4 @@ -{ nixpkgs ? <nixpkgs>, nixos ? <nixos> +{ nixpkgs ? <nixpkgs> , nix ? { outPath = ./.; revCount = 1234; shortRev = "abcdef"; } , officialRelease ? false }: @@ -145,11 +145,11 @@ let # System tests. 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; 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; }; diff --git a/tests/nix-copy-closure.nix b/tests/nix-copy-closure.nix index 7e2cf3a08870..db6103b9cbf7 100644 --- a/tests/nix-copy-closure.nix +++ b/tests/nix-copy-closure.nix @@ -1,8 +1,8 @@ # 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 { diff --git a/tests/remote-builds.nix b/tests/remote-builds.nix index de127b8aee16..b0d2547c66d6 100644 --- a/tests/remote-builds.nix +++ b/tests/remote-builds.nix @@ -1,8 +1,8 @@ # 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, ... }: |