diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-01 10:06:01 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-01 10:06:01 +0200 |
| commit | ab15a62c68bf7bf3b02e3bab00d121cc1426733c (patch) | |
| tree | 398a82403b04bfa0bae8cadf1c5a64cf83145965 /pkgs/test | |
| parent | c643ccaa8c91f78b8c89eb87589886b8906d5b38 (diff) | |
| parent | a26357eefe017964448b5bb464163646b927a267 (diff) | |
| download | nixpkgs-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar nixpkgs-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.gz nixpkgs-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.bz2 nixpkgs-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.lz nixpkgs-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.xz nixpkgs-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.tar.zst nixpkgs-ab15a62c68bf7bf3b02e3bab00d121cc1426733c.zip | |
Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.
Diffstat (limited to 'pkgs/test')
| -rw-r--r-- | pkgs/test/mkOption/keep.nix | 2 | ||||
| -rw-r--r-- | pkgs/test/mkOption/merge.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/test/mkOption/keep.nix b/pkgs/test/mkOption/keep.nix index c26064d89f7..26fb8c28dd5 100644 --- a/pkgs/test/mkOption/keep.nix +++ b/pkgs/test/mkOption/keep.nix @@ -1,5 +1,5 @@ let - pkgs = import ../../top-level/all-packages.nix {}; + pkgs = import ../../.. {}; config = import ./declare.nix; in with (pkgs.lib); diff --git a/pkgs/test/mkOption/merge.nix b/pkgs/test/mkOption/merge.nix index 0d4b3c1acd1..bbf68218aa0 100644 --- a/pkgs/test/mkOption/merge.nix +++ b/pkgs/test/mkOption/merge.nix @@ -1,5 +1,5 @@ let - pkgs = import ../../top-level/all-packages.nix {}; + pkgs = import ../../.. {}; config = import ./declare.nix; # Define the handler of unbound options. |