summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorMichael Alan Dorman <mdorman@ironicdesign.com>2017-12-19 08:36:59 -0500
committerPeter Simons <simons@cryp.to>2017-12-20 09:17:45 +0100
commit4fa4348dea836eac648483e3ecf5c7f9c4e92dc4 (patch)
tree4cbb88206fa260a8a576ff46b87a3114227eb4b6 /pkgs
parent461f311e355640561d8398e436f4a0a10558b677 (diff)
downloadnixpkgs-4fa4348dea836eac648483e3ecf5c7f9c4e92dc4.tar
nixpkgs-4fa4348dea836eac648483e3ecf5c7f9c4e92dc4.tar.gz
nixpkgs-4fa4348dea836eac648483e3ecf5c7f9c4e92dc4.tar.bz2
nixpkgs-4fa4348dea836eac648483e3ecf5c7f9c4e92dc4.tar.lz
nixpkgs-4fa4348dea836eac648483e3ecf5c7f9c4e92dc4.tar.xz
nixpkgs-4fa4348dea836eac648483e3ecf5c7f9c4e92dc4.tar.zst
nixpkgs-4fa4348dea836eac648483e3ecf5c7f9c4e92dc4.zip
Remove various package overrides
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix11
1 files changed, 0 insertions, 11 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 767c581d7da..47c7af7a56d 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -965,11 +965,6 @@ self: super: {
   # test suite requires git and does a bunch of git operations
   restless-git = dontCheck super.restless-git;
 
-  # This tool needs the latest hackage-db version.
-  cabal2nix = super.cabal2nix.overrideScope (self: super: {
-    hackage-db = self.hackage-db_2_0;
-  });
-
   # Depends on broken fluid.
   fluid-idl-http-client = markBroken super.fluid-idl-http-client;
   fluid-idl-scotty = markBroken super.fluid-idl-scotty;
@@ -1008,13 +1003,7 @@ self: super: {
 
   # Stack 1.6.1 needs newer versions than LTS-9 provides.
   stack = super.stack.overrideScope (self: super: {
-    ansi-terminal = self.ansi-terminal_0_7_1_1;
-    ansi-wl-pprint = self.ansi-wl-pprint_0_6_8_1;
-    extra = dontCheck super.extra_1_6_2;
     hpack = super.hpack_0_20_0;
-    path = dontCheck super.path_0_6_1;
-    path-io = self.path-io_1_3_3;
-    unliftio = self.unliftio_0_2_0_0;
   });
 
   # Hoogle needs a newer version than lts-9 provides.