diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-02-20 20:33:17 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-02-20 20:33:40 +0100 |
| commit | 1d15dadbec4f3d0a1f98e877e77518afe9245148 (patch) | |
| tree | 76b034c0dbd376b7e588802a9946154499631258 /pkgs/stdenv/generic | |
| parent | 43a88e3d8a68a008abea0bca0b17805aa4910764 (diff) | |
| parent | b60ef32617383e78c32ca3d69754df5a5f550183 (diff) | |
| download | nixlib-1d15dadbec4f3d0a1f98e877e77518afe9245148.tar nixlib-1d15dadbec4f3d0a1f98e877e77518afe9245148.tar.gz nixlib-1d15dadbec4f3d0a1f98e877e77518afe9245148.tar.bz2 nixlib-1d15dadbec4f3d0a1f98e877e77518afe9245148.tar.lz nixlib-1d15dadbec4f3d0a1f98e877e77518afe9245148.tar.xz nixlib-1d15dadbec4f3d0a1f98e877e77518afe9245148.tar.zst nixlib-1d15dadbec4f3d0a1f98e877e77518afe9245148.zip | |
Merge branch 'master' into staging
Larger rebuilds from master.
Diffstat (limited to 'pkgs/stdenv/generic')
| -rw-r--r-- | pkgs/stdenv/generic/check-meta.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index dc5e79fcd4f2..93d0f4cc9805 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -159,7 +159,7 @@ let executables = listOf str; outputsToInstall = listOf str; position = str; - evaluates = bool; + available = bool; repositories = attrsOf str; isBuildPythonPackage = platforms; schedulingPriority = int; diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index e021b284a122..e8f78d7401f1 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -238,9 +238,9 @@ rec { position = pos.file + ":" + toString pos.line; # Expose the result of the checks for everyone to see. } // { - evaluates = validity.valid + available = validity.valid && (if config.checkMetaRecursively or false - then lib.all (d: d.meta.evaluates or true) references + then lib.all (d: d.meta.available or true) references else true); }; |