summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2022-01-16 08:56:55 +0100
committerGitHub <noreply@github.com>2022-01-16 08:56:55 +0100
commit6555c3622559f93751fcd4e97bd42993745a9577 (patch)
tree5688457a73b6ab2b0dc3520bdb106c864ab5633d /modules
parent15635ae63878b83598a18ae421e8c819b691dc55 (diff)
parente5ba780a764b209b3a1546d273e2162594668f48 (diff)
Merge pull request #394 from jsoo1/allow-functors
nixpkgs: Allow functors.
Diffstat (limited to 'modules')
-rw-r--r--modules/nix/nixpkgs.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/nix/nixpkgs.nix b/modules/nix/nixpkgs.nix
index 7746819..b00a182 100644
--- a/modules/nix/nixpkgs.nix
+++ b/modules/nix/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;
@@ -41,7 +41,7 @@ let
overlayType = mkOptionType {
name = "nixpkgs-overlay";
description = "nixpkgs overlay";
- check = builtins.isFunction;
+ check = lib.isFunction;
merge = lib.mergeOneOption;
};
in