diff options
| author | Rob Vermaas <rob.vermaas@gmail.com> | 2015-01-13 13:53:11 +0100 |
|---|---|---|
| committer | Rob Vermaas <rob.vermaas@gmail.com> | 2015-01-13 13:53:11 +0100 |
| commit | 07e726c85c8f36d3a27fb7254f09ac69c7b94c65 (patch) | |
| tree | b6887ce8d62cf46a53839145a5534eeffd85ce14 | |
| parent | e4a68f0b98c28319913a4f2104ddb0524262f390 (diff) | |
Revert "mkOverridable: Use functors to allow overridable functions"
This reverts commit 4ee556cfe9528a321f4a3746ca83f97feacf500e.
Diffstat (limited to '')
| -rw-r--r-- | default.nix | 4 | ||||
| -rw-r--r-- | lib/customisation.nix | 7 |
2 files changed, 2 insertions, 9 deletions
diff --git a/default.nix b/default.nix index 84bb1af84e9..e0df520721c 100644 --- a/default.nix +++ b/default.nix @@ -1,6 +1,6 @@ -if ! builtins ? nixVersion || builtins.compareVersions "1.8" builtins.nixVersion == 1 then +if ! builtins ? nixVersion || builtins.compareVersions "1.7" builtins.nixVersion == 1 then - abort "This version of Nixpkgs requires Nix >= 1.8, please upgrade!" + abort "This version of Nixpkgs requires Nix >= 1.7, please upgrade!" else diff --git a/lib/customisation.nix b/lib/customisation.nix index f16043cf9a3..04a5cb42033 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -65,13 +65,6 @@ 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 ( |