b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

haskellPackages: cleanup Cabal versions

Browse source 
Not regenerating hackage-packages.nix in this commit because cabal2nix is currently not cached by hydra
This commit is contained in:
maralorn 2023-06-30 01:18:03 +02:00
parent 34478fa7f5
commit 79245124c7
No known key found for this signature in database
3 changed files with 4 additions and 25 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

@ -19,15 +19,6 @@ in
with haskellLib;
self: super: {
# Make sure that Cabal 3.8.* can be built as-is
Cabal_3_8_1_0 = doDistribute (super.Cabal_3_8_1_0.override ({
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
} // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") {
# Use process core package when possible
process = self.process_1_6_17_0;
}));
# 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-syntax = self.Cabal-syntax_3_10_1_0;
@ -2143,11 +2134,6 @@ self: super: {
sha256 = "0l15ccfdys100jf50s9rr4p0d0ikn53bkh7a9qlk9i0y0z5jc6x1";
}) super.basic-cpuid;
# Needs Cabal >= 3.4
chs-cabal = super.chs-cabal.override {
Cabal = self.Cabal_3_6_3_0;
};
# 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too.
streamly-posix = doJailbreak super.streamly-posix;
@ -2311,7 +2297,7 @@ self: super: {
cabal-fmt = doJailbreak (super.cabal-fmt.override {
# Needs newer Cabal-syntax version.
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
Cabal-syntax = self.Cabal-syntax_3_10_1_0;
});
# Tests require ghc-9.2.

10
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View file

@ -59,13 +59,9 @@ default-package-overrides:
- lsp-test == 0.14.*
extra-packages:
- Cabal == 2.2.* # required for jailbreak-cabal etc.
- Cabal == 2.4.* # required for cabal-install etc.
- Cabal == 3.2.* # required for cabal2spec
- Cabal == 3.4.* # required for cabal-install etc.
- Cabal == 3.6.*
- Cabal-syntax == 3.8.* # required for cabal-install{,-parsers}
- Cabal == 3.8.* # required for cabal-install{,-parsers}
- Cabal == 3.2.* # required as newer version on ghc 8.6 and 8.8
- Cabal == 3.6.* # required as newer version on ghc 8.10 and 9.0
- Cabal-syntax == 3.10.* # newest version required for cabal-install and other packages
- cachix < 1.4 # 2023-04-02: cachix 1.4{,.1} have known on multi-user Nix systems
- directory == 1.3.7.* # required to build cabal-install 3.10.* with GHC 9.2
- Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729

3
pkgs/top-level/release-haskell.nix
View file

@ -480,9 +480,6 @@ let
# package sets (like Cabal, jailbreak-cabal) are
# working as expected.
cabal-install = released;
Cabal_3_6_3_0 = released;
Cabal_3_8_1_0 = released;
Cabal-syntax_3_8_1_0 = released;
Cabal_3_10_1_0 = released;
Cabal-syntax_3_10_1_0 = released;
cabal2nix = lib.subtractLists [