summary refs log tree commit diff
path: root/lib/default.nix
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2018-01-14 21:35:50 +0100
committerVladimír Čunát <vcunat@gmail.com>2018-01-14 21:41:31 +0100
commit67e8392383d29c8dd4a7392bef33e0c16ac2297f (patch)
treef039586d277183e3aeb3784efb24549056c43ee8 /lib/default.nix
parent1a054480d312a40feba4f579eec3cd2d0db21280 (diff)
parent799b941a2bb61970d6b99366bcf2062f1ce14328 (diff)
downloadnixlib-67e8392383d29c8dd4a7392bef33e0c16ac2297f.tar
nixlib-67e8392383d29c8dd4a7392bef33e0c16ac2297f.tar.gz
nixlib-67e8392383d29c8dd4a7392bef33e0c16ac2297f.tar.bz2
nixlib-67e8392383d29c8dd4a7392bef33e0c16ac2297f.tar.lz
nixlib-67e8392383d29c8dd4a7392bef33e0c16ac2297f.tar.xz
nixlib-67e8392383d29c8dd4a7392bef33e0c16ac2297f.tar.zst
nixlib-67e8392383d29c8dd4a7392bef33e0c16ac2297f.zip
Merge #33057: stdenv meta checks: make them lazy
Closes #22277 - it's superseded;  I have some WIP on evaluation
performance, but best do that in a separate PR/thread.
Diffstat (limited to 'lib/default.nix')
-rw-r--r--lib/default.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/default.nix b/lib/default.nix
index 03a902945a3b..6d2a95e559c8 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -87,7 +87,8 @@ let
     inherit (stringsWithDeps) textClosureList textClosureMap
       noDepEntry fullDepEntry packEntry stringAfter;
     inherit (customisation) overrideDerivation makeOverridable
-      callPackageWith callPackagesWith addPassthru hydraJob makeScope;
+      callPackageWith callPackagesWith extendDerivation addPassthru
+      hydraJob makeScope;
     inherit (meta) addMetaAttrs dontDistribute setName updateName
       appendToName mapDerivationAttrset lowPrio lowPrioSet hiPrio
       hiPrioSet;