diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-03 02:50:21 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-03 02:50:21 +0200 |
commit | 10c8e6d0c590d6c83aa2efee7f701983440cca78 (patch) | |
tree | b79325512b90438381604e1487ce0c1b63771f2f /nixos/modules/misc/nixpkgs.nix | |
parent | 2fb4606f38deefa76da5d853645739f2faa315de (diff) | |
parent | c70c9649eaca0409b7104a02193cd81ee8e5103a (diff) | |
download | nixpkgs-10c8e6d0c590d6c83aa2efee7f701983440cca78.tar nixpkgs-10c8e6d0c590d6c83aa2efee7f701983440cca78.tar.gz nixpkgs-10c8e6d0c590d6c83aa2efee7f701983440cca78.tar.bz2 nixpkgs-10c8e6d0c590d6c83aa2efee7f701983440cca78.tar.lz nixpkgs-10c8e6d0c590d6c83aa2efee7f701983440cca78.tar.xz nixpkgs-10c8e6d0c590d6c83aa2efee7f701983440cca78.tar.zst nixpkgs-10c8e6d0c590d6c83aa2efee7f701983440cca78.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'nixos/modules/misc/nixpkgs.nix')
-rw-r--r-- | nixos/modules/misc/nixpkgs.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 6eb42494124..c3e7ab9a666 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; }; |