summary refs log tree commit diff
path: root/nixos/modules/misc/nixpkgs.nix
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2018-01-31 14:02:19 -0500
committerShea Levy <shea@shealevy.com>2018-01-31 14:02:19 -0500
commit943592f69850fd07dd2422da062b1c1ebc45974d (patch)
tree3376a06cd3ab25a1622c8f320573ab09b55a9470 /nixos/modules/misc/nixpkgs.nix
parent0d7a0d7572d35526ddf34b6d011b7b88a8904b36 (diff)
downloadnixpkgs-943592f69850fd07dd2422da062b1c1ebc45974d.tar
nixpkgs-943592f69850fd07dd2422da062b1c1ebc45974d.tar.gz
nixpkgs-943592f69850fd07dd2422da062b1c1ebc45974d.tar.bz2
nixpkgs-943592f69850fd07dd2422da062b1c1ebc45974d.tar.lz
nixpkgs-943592f69850fd07dd2422da062b1c1ebc45974d.tar.xz
nixpkgs-943592f69850fd07dd2422da062b1c1ebc45974d.tar.zst
nixpkgs-943592f69850fd07dd2422da062b1c1ebc45974d.zip
Add setFunctionArgs lib function.
Among other things, this will allow *2nix tools to output plain data
while still being composable with the traditional
callPackage/.override interfaces.
Diffstat (limited to 'nixos/modules/misc/nixpkgs.nix')
-rw-r--r--nixos/modules/misc/nixpkgs.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 1793c1447d6..b01f5431909 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -4,10 +4,10 @@ with lib;
 
 let
   isConfig = x:
-    builtins.isAttrs x || builtins.isFunction x;
+    builtins.isAttrs x || lib.isFunction x;
 
   optCall = f: x:
-    if builtins.isFunction f
+    if lib.isFunction f
     then f x
     else f;
 
@@ -38,7 +38,7 @@ let
   overlayType = mkOptionType {
     name = "nixpkgs-overlay";
     description = "nixpkgs overlay";
-    check = builtins.isFunction;
+    check = lib.isFunction;
     merge = lib.mergeOneOption;
   };