From 829ed35978fe3b594c71eaba15c192602a6ae52e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Mon, 1 Apr 2024 11:20:16 +0200 Subject: [PATCH] haskellPackages: fix eval --- .../haskell-modules/configuration-common.nix | 16 ++++++++-------- .../haskell-modules/configuration-ghc-9.4.x.nix | 2 +- .../haskell-modules/configuration-ghc-9.8.x.nix | 2 +- pkgs/top-level/release-haskell.nix | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e9c0303afb55..64e6ed853897 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -20,8 +20,8 @@ with haskellLib; self: super: { # Make sure that Cabal 3.10.* can be built as-is - Cabal_3_10_2_1 = doDistribute (super.Cabal_3_10_2_1.override ({ - Cabal-syntax = self.Cabal-syntax_3_10_2_0; + Cabal_3_10_3_0 = doDistribute (super.Cabal_3_10_3_0.override ({ + Cabal-syntax = self.Cabal-syntax_3_10_3_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") { # Use process core package when possible process = self.process_1_6_18_0; @@ -37,8 +37,8 @@ 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_2_1; - Cabal-syntax = cself.Cabal-syntax_3_10_2_0; + Cabal = cself.Cabal_3_10_3_0; + Cabal-syntax = cself.Cabal-syntax_3_10_3_0; } // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.4") { # We need at least directory >= 1.3.7.0. Using the latest version # 1.3.8.* is not an option since it causes very annoying dependencies @@ -81,7 +81,7 @@ self: super: { extensions = doJailbreak (super.extensions.override { Cabal = if versionOlder self.ghc.version "9.6" - then self.Cabal_3_10_2_1 + then self.Cabal_3_10_3_0 else null; # use GHC bundled version }); @@ -1512,7 +1512,7 @@ self: super: { # 2022-08-31: Jailbreak is done to allow aeson 2.0.*: # https://github.com/haskell-CI/haskell-ci/commit/6ad0d5d701cbe101013335d597acaf5feadd3ab9#r82681900 cabal-install-parsers = doJailbreak (dontCheck (super.cabal-install-parsers.override { - Cabal-syntax = self.Cabal-syntax_3_10_2_0; + Cabal-syntax = self.Cabal-syntax_3_10_3_0; })); # Test suite requires database @@ -2297,7 +2297,7 @@ self: super: { # 2023-07-03: allow lattices-2.2, waiting on https://github.com/haskell-CI/haskell-ci/pull/664 # 2024-03-21: pins specific version of ShellCheck haskell-ci = doJailbreak (super.haskell-ci.overrideScope (self: super: { - Cabal-syntax = self.Cabal-syntax_3_10_2_0; + Cabal-syntax = self.Cabal-syntax_3_10_3_0; ShellCheck = self.ShellCheck_0_9_0; })); @@ -2564,7 +2564,7 @@ self: super: { cabal-fmt = doJailbreak (super.cabal-fmt.override { # Needs newer Cabal-syntax version. - Cabal-syntax = self.Cabal-syntax_3_10_2_0; + Cabal-syntax = self.Cabal-syntax_3_10_3_0; }); # 2023-07-18: https://github.com/srid/ema/issues/156 diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index de5f883e5f4b..94cf15df5dff 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -106,7 +106,7 @@ in { ( let hls_overlay = lself: lsuper: { - Cabal-syntax = lself.Cabal-syntax_3_10_2_0; + Cabal-syntax = lself.Cabal-syntax_3_10_3_0; }; in lib.mapAttrs (_: pkg: doDistribute (pkg.overrideScope hls_overlay)) { diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index 71835751d24e..25dce2b91d69 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -52,7 +52,7 @@ self: super: { # # Version upgrades # - th-abstraction = doDistribute self.th-abstraction_0_6_0_0; + th-abstraction = doDistribute self.th-abstraction_0_7_0_0; ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_2_20240223; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2; ghc-lib = doDistribute self.ghc-lib_9_8_1_20231121; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 67e56fbbc7d7..9d6add877542 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -491,11 +491,11 @@ let compilerNames.ghc981 compilerNames.ghc982 ] released; - Cabal_3_10_2_1 = lib.subtractLists [ + Cabal_3_10_3_0 = lib.subtractLists [ compilerNames.ghc981 compilerNames.ghc982 ] released; - Cabal-syntax_3_10_1_0 = lib.subtractLists [ + Cabal-syntax_3_10_3_0 = lib.subtractLists [ compilerNames.ghc981 compilerNames.ghc982 ] released;