colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskellPackages: fix eval

This commit is contained in:
Naïm Favier 2024-04-01 11:20:16 +02:00
parent 6aca5e1feb
commit 829ed35978
No known key found for this signature in database
GPG Key ID: 95AFCE8211908325
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -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

2
pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
View File

@ -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)) {

2
pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix
View File

@ -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;

4
pkgs/top-level/release-haskell.nix
View File

@ -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;