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

haskell.packages.*.[cC]abal*: use core process where possible

Browse Source 
Annoyingly weird match since 9.2.4's process version is too old, but
that should go away soon-ish anyways. Prevents mismatches in overrides.
This commit is contained in:
sternenseemann
2023-02-18 21:55:25 +01:00
parent bdbfe10efb
commit da5233bbc0
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/haskell-modules/configuration-common.nix
+2
View File
@@ -29,6 +29,8 @@ self: super: {
lib.optionalAttrs (lib.versionOlder self.ghc.version "9.4") {
Cabal = cself.Cabal_3_8_1_0;
Cabal-syntax = cself.Cabal-syntax_3_8_1_0;
} // lib.optionalAttrs (lib.versionOlder self.ghc.version "9.2.5") {
# GHC 9.2.5 starts shipping 1.6.16.0
process = cself.process_1_6_16_0;
} // lib.optionalAttrs (lib.versions.majorMinor self.ghc.version == "8.10") {
# Prevent dependency on doctest which causes an inconsistent dependency
pkgs/development/haskell-modules/configuration-nix.nix
+4 -2
View File
@@ -1053,10 +1053,12 @@ self: super: builtins.intersectAttrs super {
hint = dontCheck super.hint;
# 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_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_16_0;
});
}));
# cabal-install switched to build type simple in 3.2.0.0
# as a result, the cabal(1) man page is no longer installed