diff options
| author | Shea Levy <shea@shealevy.com> | 2018-02-02 09:41:16 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-02-02 09:41:16 -0500 |
| commit | 43f647e5b44a875a7928790a6a5628af1f9350c5 (patch) | |
| tree | 0638443f20cf52c58afc4c264c356fd54a9c326c /nixos/modules/misc | |
| parent | f8c59e083ab2f70457c0b4f2086100d916a60c77 (diff) | |
| parent | 943592f69850fd07dd2422da062b1c1ebc45974d (diff) | |
| download | nixlib-43f647e5b44a875a7928790a6a5628af1f9350c5.tar nixlib-43f647e5b44a875a7928790a6a5628af1f9350c5.tar.gz nixlib-43f647e5b44a875a7928790a6a5628af1f9350c5.tar.bz2 nixlib-43f647e5b44a875a7928790a6a5628af1f9350c5.tar.lz nixlib-43f647e5b44a875a7928790a6a5628af1f9350c5.tar.xz nixlib-43f647e5b44a875a7928790a6a5628af1f9350c5.tar.zst nixlib-43f647e5b44a875a7928790a6a5628af1f9350c5.zip | |
Merge branch 'dynamic-function-args'
Diffstat (limited to 'nixos/modules/misc')
| -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 1793c1447d60..b01f54319098 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; }; |