summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorRob Vermaas <rob.vermaas@gmail.com>2015-01-13 13:53:11 +0100
committerRob Vermaas <rob.vermaas@gmail.com>2015-01-13 13:53:11 +0100
commit07e726c85c8f36d3a27fb7254f09ac69c7b94c65 (patch)
treeb6887ce8d62cf46a53839145a5534eeffd85ce14 /lib
parente4a68f0b98c28319913a4f2104ddb0524262f390 (diff)
downloadnixpkgs-07e726c85c8f36d3a27fb7254f09ac69c7b94c65.tar
nixpkgs-07e726c85c8f36d3a27fb7254f09ac69c7b94c65.tar.gz
nixpkgs-07e726c85c8f36d3a27fb7254f09ac69c7b94c65.tar.bz2
nixpkgs-07e726c85c8f36d3a27fb7254f09ac69c7b94c65.tar.lz
nixpkgs-07e726c85c8f36d3a27fb7254f09ac69c7b94c65.tar.xz
nixpkgs-07e726c85c8f36d3a27fb7254f09ac69c7b94c65.tar.zst
nixpkgs-07e726c85c8f36d3a27fb7254f09ac69c7b94c65.zip
Revert "mkOverridable: Use functors to allow overridable functions"
This reverts commit 4ee556cfe9528a321f4a3746ca83f97feacf500e.
Diffstat (limited to 'lib')
-rw-r--r--lib/customisation.nix7
1 files changed, 0 insertions, 7 deletions
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 (