summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-common.nix
diff options
context:
space:
mode:
authorNaïm Favier <n@monade.li>2023-10-23 12:02:30 +0200
committerNaïm Favier <n@monade.li>2023-10-23 12:02:30 +0200
commitcaf1c4efda9aac9b6b8437d4c8c89c927dcaebee (patch)
treef36e43f6af6c26d1f8b04cd3e8d627ff16c3e841 /pkgs/development/haskell-modules/configuration-common.nix
parentcb8c0b6ac06c43f9e2745ffe8050cd5b86663a25 (diff)
downloadnixpkgs-caf1c4efda9aac9b6b8437d4c8c89c927dcaebee.tar
nixpkgs-caf1c4efda9aac9b6b8437d4c8c89c927dcaebee.tar.gz
nixpkgs-caf1c4efda9aac9b6b8437d4c8c89c927dcaebee.tar.bz2
nixpkgs-caf1c4efda9aac9b6b8437d4c8c89c927dcaebee.tar.lz
nixpkgs-caf1c4efda9aac9b6b8437d4c8c89c927dcaebee.tar.xz
nixpkgs-caf1c4efda9aac9b6b8437d4c8c89c927dcaebee.tar.zst
nixpkgs-caf1c4efda9aac9b6b8437d4c8c89c927dcaebee.zip
haskellPackages: more eval fixes
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index b8daf5dcc79..27e5991f052 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -20,7 +20,7 @@ with haskellLib;
 
 self: super: {
   # Make sure that Cabal 3.10.* can be built as-is
-  Cabal_3_10_1_0 = doDistribute (super.Cabal_3_10_1_0.override ({
+  Cabal_3_10_2_0 = doDistribute (super.Cabal_3_10_2_0.override ({
     Cabal-syntax = self.Cabal-syntax_3_10_2_0;
   } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") {
     # Use process core package when possible
@@ -39,7 +39,7 @@ self: super: {
           # Needs to be downgraded compared to Stackage LTS 21
           resolv = cself.resolv_0_1_2_0;
         } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.6") {
-          Cabal = cself.Cabal_3_10_1_0;
+          Cabal = cself.Cabal_3_10_2_0;
           Cabal-syntax = cself.Cabal-syntax_3_10_2_0;
         } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.4") {
           # We need at least directory >= 1.3.7.0. Using the latest version
@@ -1597,7 +1597,7 @@ self: super: {
   hspec-contrib = dontCheck super.hspec-contrib;
 
   # github.com/ucsd-progsys/liquidhaskell/issues/1729
-  liquidhaskell = super.liquidhaskell.override { Diff = self.Diff_0_3_4; };
+  liquidhaskell-boot = super.liquidhaskell-boot.override { Diff = self.Diff_0_3_4; };
   Diff_0_3_4 = dontCheck super.Diff_0_3_4;
 
   # The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox.