diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2018-02-17 18:44:23 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-02-18 13:33:25 +0000 |
| commit | 810c4702cfe4ca34259d52dd675029d43686e821 (patch) | |
| tree | 96190cdd834aa4238d7ad3515a41b4b6372f3d05 /pkgs/stdenv/generic | |
| parent | ecf4825f325298e3b78665e7e6295c039dfe969f (diff) | |
| download | nixlib-810c4702cfe4ca34259d52dd675029d43686e821.tar nixlib-810c4702cfe4ca34259d52dd675029d43686e821.tar.gz nixlib-810c4702cfe4ca34259d52dd675029d43686e821.tar.bz2 nixlib-810c4702cfe4ca34259d52dd675029d43686e821.tar.lz nixlib-810c4702cfe4ca34259d52dd675029d43686e821.tar.xz nixlib-810c4702cfe4ca34259d52dd675029d43686e821.tar.zst nixlib-810c4702cfe4ca34259d52dd675029d43686e821.zip | |
stdenv.mkDerivation: rename `meta.evaluates` -> `meta.available`
A much better name.
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); }; |