diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2018-02-19 14:15:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-19 14:15:06 +0000 |
| commit | 7d2642724feba6ceb51ffc9042d6504dca439f84 (patch) | |
| tree | f16654af1b691c26502b3e077b2063a5d00b5f87 | |
| parent | 10b3f7d3564d4ef1deeaed7ece130588d5ba1905 (diff) | |
| parent | 810c4702cfe4ca34259d52dd675029d43686e821 (diff) | |
| download | nixlib-7d2642724feba6ceb51ffc9042d6504dca439f84.tar nixlib-7d2642724feba6ceb51ffc9042d6504dca439f84.tar.gz nixlib-7d2642724feba6ceb51ffc9042d6504dca439f84.tar.bz2 nixlib-7d2642724feba6ceb51ffc9042d6504dca439f84.tar.lz nixlib-7d2642724feba6ceb51ffc9042d6504dca439f84.tar.xz nixlib-7d2642724feba6ceb51ffc9042d6504dca439f84.tar.zst nixlib-7d2642724feba6ceb51ffc9042d6504dca439f84.zip | |
Merge pull request #35111 from oxij/stdenv/available-evaluates
stdenv.mkDerivation: rename `meta.evaluates` -> `meta.available`
| -rw-r--r-- | nixos/doc/manual/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/check-meta.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index bbe82066aa0c..6098b057a370 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -36,7 +36,7 @@ let package = args.package or (lib.attrByPath path (throw "Invalid package attribute path `${toString path}'") pkgs); in "<listitem>" + "<para><literal>pkgs.${name} (${package.meta.name})</literal>" - + lib.optionalString (!package.meta.evaluates) " <emphasis>[UNAVAILABLE]</emphasis>" + + lib.optionalString (!package.meta.available) " <emphasis>[UNAVAILABLE]</emphasis>" + ": ${package.meta.description or "???"}.</para>" + lib.optionalString (args ? comment) "\n<para>${args.comment}</para>" # Lots of `longDescription's break DocBook, so we just wrap them into <programlisting> 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); }; |