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

stdenv.mkDerivation: rename `meta.evaluates` -> `meta.available`
wip/yesman
Michael Raskin 6 years ago committed by GitHub
commit 7d2642724f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      nixos/doc/manual/default.nix
  2. 2
      pkgs/stdenv/generic/check-meta.nix
  3. 4
      pkgs/stdenv/generic/make-derivation.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>

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

@ -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);
};

Loading…
Cancel
Save