diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-12-22T10·33+0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-12-22T10·35+0100 |
| commit | 6d8087083278b078d0db6238fb16929163388acd (patch) | |
| tree | bdb23ca2895364029d0af21e746e7a0c16eb7472 /tests | |
| parent | 62e214fa6f34a287f04348b633ba5ef88e06df66 (diff) | |
release.nix: Use fetchTarball and fetchGit
In particular, using fetchGit means we don't need hackery to clean the source tree when building from an unclean tree.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/nix-copy-closure.nix | 4 | ||||
| -rw-r--r-- | tests/remote-builds.nix | 4 | ||||
| -rw-r--r-- | tests/setuid.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/nix-copy-closure.nix b/tests/nix-copy-closure.nix index 44126dd64e47..0bf5b42d84a8 100644 --- a/tests/nix-copy-closure.nix +++ b/tests/nix-copy-closure.nix @@ -1,8 +1,8 @@ # Test ‘nix-copy-closure’. -{ system, nix }: +{ nixpkgs, system, nix }: -with import <nixpkgs/nixos/lib/testing.nix> { inherit system; }; +with import (nixpkgs + /nixos/lib/testing.nix) { inherit system; }; makeTest (let pkgA = pkgs.cowsay; pkgB = pkgs.wget; pkgC = pkgs.hello; in { diff --git a/tests/remote-builds.nix b/tests/remote-builds.nix index 58a26d8b6182..75704ace2dba 100644 --- a/tests/remote-builds.nix +++ b/tests/remote-builds.nix @@ -1,8 +1,8 @@ # Test Nix's remote build feature. -{ system, nix }: +{ nixpkgs, system, nix }: -with import <nixpkgs/nixos/lib/testing.nix> { inherit system; }; +with import (nixpkgs + "/nixos/lib/testing.nix") { inherit system; }; makeTest ( diff --git a/tests/setuid.nix b/tests/setuid.nix index c982d9cf0366..77e83c8d6c2c 100644 --- a/tests/setuid.nix +++ b/tests/setuid.nix @@ -1,8 +1,8 @@ # Verify that Linux builds cannot create setuid or setgid binaries. -{ system, nix }: +{ nixpkgs, system, nix }: -with import <nixpkgs/nixos/lib/testing.nix> { inherit system; }; +with import (nixpkgs + "/nixos/lib/testing.nix") { inherit system; }; makeTest { |