diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-05-05 11:49:03 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-05-05 11:49:03 +0200 |
| commit | 375bc8def7c17506bc10f3b6193635f05d5ccc40 (patch) | |
| tree | 6af7662b245e7998bd18ae20d9e74922c489fb6d /pkgs/top-level/haskell-packages.nix | |
| parent | 2f75c6845981b38a698cf1a9f620145877c80956 (diff) | |
| parent | 7f9ccc628403ed88844a4436da3b2944be5560a4 (diff) | |
| download | nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.gz nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.bz2 nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.lz nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.xz nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.tar.zst nixpkgs-375bc8def7c17506bc10f3b6193635f05d5ccc40.zip | |
Merge staging into closure-size
Diffstat (limited to 'pkgs/top-level/haskell-packages.nix')
| -rw-r--r-- | pkgs/top-level/haskell-packages.nix | 10 |
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 |