diff options
| author | Shea Levy <shea@shealevy.com> | 2015-01-09 13:24:58 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2015-01-09 13:26:34 -0500 |
| commit | 4ee556cfe9528a321f4a3746ca83f97feacf500e (patch) | |
| tree | 637aab719d0146ab53b674586a2e9e1f7692a1e4 | |
| parent | 96ae5d58bfa3bb64449bef3703238a1cdc76eff0 (diff) | |
mkOverridable: Use functors to allow overridable functions
| -rw-r--r-- | default.nix | 4 | ||||
| -rw-r--r-- | lib/customisation.nix | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/default.nix b/default.nix index e0df520721cf..84bb1af84e97 100644 --- a/default.nix +++ b/default.nix @@ -1,6 +1,6 @@ -if ! builtins ? nixVersion || builtins.compareVersions "1.7" builtins.nixVersion == 1 then +if ! builtins ? nixVersion || builtins.compareVersions "1.8" builtins.nixVersion == 1 then - abort "This version of Nixpkgs requires Nix >= 1.7, please upgrade!" + abort "This version of Nixpkgs requires Nix >= 1.8, please upgrade!" else diff --git a/lib/customisation.nix b/lib/customisation.nix index 04a5cb420335..f16043cf9a3e 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -65,6 +65,13 @@ rec { overrideDerivation = fdrv: makeOverridable (args: overrideDerivation (f args) fdrv) origArgs; }) + else if builtins.isFunction ff then + { override = newArgs: + makeOverridable f (origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs)); + __functor = self: ff; + deepOverride = throw "deepOverride not yet supported for functors"; + overrideDerivation = throw "overrideDerivation not yet supported for functors"; + } else ff; deepOverrider = newArgs: name: x: if builtins.isAttrs x then ( |