diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-09-06 14:28:44 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-11-01 15:35:08 -0400 |
commit | 79c713bc1498ccceed9f8d2fc0b8d29b1b45a209 (patch) | |
tree | 0795b18aaf1eeed5070a8f32ca1dfdc915292a00 /pkgs/top-level/release-cross.nix | |
parent | aa964c82d330abd8dd19804307793eee2e91eb47 (diff) | |
download | nixlib-79c713bc1498ccceed9f8d2fc0b8d29b1b45a209.tar nixlib-79c713bc1498ccceed9f8d2fc0b8d29b1b45a209.tar.gz nixlib-79c713bc1498ccceed9f8d2fc0b8d29b1b45a209.tar.bz2 nixlib-79c713bc1498ccceed9f8d2fc0b8d29b1b45a209.tar.lz nixlib-79c713bc1498ccceed9f8d2fc0b8d29b1b45a209.tar.xz nixlib-79c713bc1498ccceed9f8d2fc0b8d29b1b45a209.tar.zst nixlib-79c713bc1498ccceed9f8d2fc0b8d29b1b45a209.zip |
release-lib: Cache cross nixpkgs evals too
This will help with release-cross.nix eval time. It also allowed me to share code between the cross and native helpers.
Diffstat (limited to 'pkgs/top-level/release-cross.nix')
-rw-r--r-- | pkgs/top-level/release-cross.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index 0d15d817a66c..ee69dd5a43c5 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -81,11 +81,11 @@ in # good idea lest there be some irrelevant pass-through debug attrs that # cause false negatives. testEqualOne = path: system: let - f = path: attrs: builtins.toString (lib.getAttrFromPath path (allPackages attrs)); + f = path: crossSystem: system: builtins.toString (lib.getAttrFromPath path (pkgsForCross crossSystem system)); in assertTrue ( - f path { inherit system; } + f path null system == - f (["buildPackages"] ++ path) { inherit system crossSystem; } + f (["buildPackages"] ++ path) crossSystem system ); testEqual = path: systems: forMatchingSystems systems (testEqualOne path); |