summary refs log tree commit diff
path: root/pkgs/top-level/haskell-packages.nix
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
-rw-r--r--pkgs/top-level/haskell-packages.nix10
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index b2cebf63fff..512d4b74dfb 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -3139,14 +3139,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   wordTrie = callPackage ../development/libraries/haskell/word-trie {};
 
-  # This is an unwrapped version of Yi, it will not behave well (no
-  # M-x or reload). Use ‘yiCustom’ instead.
+  # This is an unwrapped version of Yi, it will not behave well. Use
+  # ‘yi’ from all-packages.nix instead.
   yi = callPackage ../applications/editors/yi/yi.nix { };
 
-  yiCustom = callPackage ../applications/editors/yi/yi-custom.nix {
-    extraPackages = pkgs: [];
-  };
-
   yiFuzzyOpen = callPackage ../development/libraries/haskell/yi-fuzzy-open {};
 
   yiMonokai = callPackage ../development/libraries/haskell/yi-monokai {};
@@ -3161,7 +3157,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   cabalDb = callPackage ../development/tools/haskell/cabal-db {};
 
-  cabal2nix = callPackage ../development/tools/haskell/cabal2nix {};
+  cabal2nix = pkgs.cabal2nix;
 
   # Build a cabal package given a local .cabal file
   buildLocalCabalWithArgs = { src