about summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2018-11-26 11:19:28 +0100
committerPeter Simons <simons@cryp.to>2018-11-27 16:39:30 +0100
commitb13d8eadaaa42195688366a1a12d1c39465d927c (patch)
tree3b9fcadca018f2b748a1e071da38973fb9aefa9c /pkgs/development
parent9ad99b7099ff4d5853df22bd7be186ad4d5f8bf0 (diff)
downloadnixlib-b13d8eadaaa42195688366a1a12d1c39465d927c.tar
nixlib-b13d8eadaaa42195688366a1a12d1c39465d927c.tar.gz
nixlib-b13d8eadaaa42195688366a1a12d1c39465d927c.tar.bz2
nixlib-b13d8eadaaa42195688366a1a12d1c39465d927c.tar.lz
nixlib-b13d8eadaaa42195688366a1a12d1c39465d927c.tar.xz
nixlib-b13d8eadaaa42195688366a1a12d1c39465d927c.tar.zst
nixlib-b13d8eadaaa42195688366a1a12d1c39465d927c.zip
haskell-Cabal: update overrides for the new 2.4.1.x version
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix2
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix6
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 5f56dc3a9b69..e1c58dd49c4e 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -33,7 +33,7 @@ self: super: {
   unbuildable = throw "package depends on meta package 'unbuildable'";
 
   # Use the latest version of the Cabal library.
-  cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_4_0_1; });
+  cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_2_4_1_0; });
 
   # The test suite depends on old versions of tasty and QuickCheck.
   hackage-security = dontCheck super.hackage-security;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 226b437d58b1..83cb831345c1 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -62,10 +62,10 @@ self: super: {
   # that have it as an actual library dependency. The explicit overrides are
   # more verbose but friendlier for Hydra.
   stack = (doJailbreak super.stack).override {
-    Cabal = self.Cabal_2_4_0_1;
-    hpack = self.hpack_0_31_1.override { Cabal = self.Cabal_2_4_0_1; };
+    Cabal = self.Cabal_2_4_1_0;
+    hpack = self.hpack_0_31_1.override { Cabal = self.Cabal_2_4_1_0; };
     yaml = self.yaml_0_11_0_0;
-    hackage-security = self.hackage-security.override { Cabal = self.Cabal_2_4_0_1; };
+    hackage-security = self.hackage-security.override { Cabal = self.Cabal_2_4_1_0; };
   };
   hpack_0_31_1 = super.hpack_0_31_1.override {
     yaml = self.yaml_0_11_0_0;