diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2015-04-29 06:24:40 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2015-04-29 06:24:40 +0200 |
| commit | 23a7bc6a7590ebced5828e09c09d6e7a39188d74 (patch) | |
| tree | 5e14ae67b83b02df5ef6243e9e99830c24c756d5 /tests | |
| parent | 4d1787da3fa6bacc8a187fad8a01414011ea1f34 (diff) | |
Handle all <nixpkgs> paths with nixpkgs-path.nix.
This file is just defaulting to <nixpkgs>, but we're going to substitue it by the channel generator. We also need to make sure that we don't have any other references to <nixpkgs>, but the latter can best be done on Hydra's side if we don't make <nixpkgs> available to vuizvui builds. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/aszlig/i3.nix | 4 | ||||
| -rw-r--r-- | tests/make-test.nix | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/tests/aszlig/i3.nix b/tests/aszlig/i3.nix index 408a476d..3c5a5c0c 100644 --- a/tests/aszlig/i3.nix +++ b/tests/aszlig/i3.nix @@ -4,7 +4,9 @@ name = "i3"; machine = { lib, ... }: { - imports = [ <nixpkgs/nixos/tests/common/x11.nix> ]; + imports = [ + "${import ../../nixpkgs-path.nix}/nixos/tests/common/x11.nix" + ]; vuizvui.user.aszlig.profiles.base.enable = true; diff --git a/tests/make-test.nix b/tests/make-test.nix index 9276dae3..d98ff87f 100644 --- a/tests/make-test.nix +++ b/tests/make-test.nix @@ -1,11 +1,13 @@ f: { system ? builtins.currentSystem, ... } @ args: let - lib = import <nixpkgs/lib>; + nixpkgsPath = import ../nixpkgs-path.nix; - testLib = import <nixpkgs/nixos/lib/testing.nix> { + lib = import "${nixpkgsPath}/lib"; + + testLib = import "${nixpkgsPath}/nixos/lib/testing.nix" { inherit system; }; - pkgs = import <nixpkgs> { inherit system; }; + pkgs = import nixpkgsPath { inherit system; }; testArgs = if builtins.isFunction f then f (args // { pkgs = pkgs // { |