From 810c4702cfe4ca34259d52dd675029d43686e821 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 17 Feb 2018 18:44:23 +0000 Subject: [PATCH] stdenv.mkDerivation: rename `meta.evaluates` -> `meta.available` A much better name. --- nixos/doc/manual/default.nix | 2 +- pkgs/stdenv/generic/check-meta.nix | 2 +- 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 bbe82066aa0..6098b057a37 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 "" + "pkgs.${name} (${package.meta.name})" - + lib.optionalString (!package.meta.evaluates) " [UNAVAILABLE]" + + lib.optionalString (!package.meta.available) " [UNAVAILABLE]" + ": ${package.meta.description or "???"}." + lib.optionalString (args ? comment) "\n${args.comment}" # Lots of `longDescription's break DocBook, so we just wrap them into diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index dc5e79fcd4f..93d0f4cc980 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 e021b284a12..e8f78d7401f 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); };