JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #35111 from oxij/stdenv/available-evaluates

Browse Source 
stdenv.mkDerivation: rename `meta.evaluates` -> `meta.available`
This commit is contained in:
Michael Raskin 2018-02-19 14:15:06 +00:00 committed by GitHub
commit 7d2642724f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/doc/manual/default.nix
View File

@ -36,7 +36,7 @@ let
package = args.package or (lib.attrByPath path (throw "Invalid package attribute path `${toString path}'") pkgs); package = args.package or (lib.attrByPath path (throw "Invalid package attribute path `${toString path}'") pkgs);
in "<listitem>" in "<listitem>"
+ "<para><literal>pkgs.${name} (${package.meta.name})</literal>" + "<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>" + ": ${package.meta.description or "???"}.</para>"
+ lib.optionalString (args ? comment) "\n<para>${args.comment}</para>" + lib.optionalString (args ? comment) "\n<para>${args.comment}</para>"
# Lots of `longDescription's break DocBook, so we just wrap them into <programlisting> # Lots of `longDescription's break DocBook, so we just wrap them into <programlisting>

2
pkgs/stdenv/generic/check-meta.nix
View File

@ -159,7 +159,7 @@ let
executables = listOf str; executables = listOf str;
outputsToInstall = listOf str; outputsToInstall = listOf str;
position = str; position = str;
evaluates = bool; available = bool;
repositories = attrsOf str; repositories = attrsOf str;
isBuildPythonPackage = platforms; isBuildPythonPackage = platforms;
schedulingPriority = int; schedulingPriority = int;

4
pkgs/stdenv/generic/make-derivation.nix
View File

@ -238,9 +238,9 @@ rec {
position = pos.file + ":" + toString pos.line; position = pos.file + ":" + toString pos.line;
# Expose the result of the checks for everyone to see. # Expose the result of the checks for everyone to see.
} // { } // {
evaluates = validity.valid available = validity.valid
&& (if config.checkMetaRecursively or false && (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); else true);
}; };