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

haskell.packages.ghc96.monad-par: patch for mtl >= 2.3

Browse source 
This allows us building cabal2nix with GHC 9.6 which we can now test on
Hydra.
This commit is contained in:
sternenseemann 2023-07-03 12:31:30 +02:00
parent eda8d29381
commit cc025c684d
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
View file

@ -69,7 +69,6 @@ self: super: {
unicode-transforms = dontCheck super.unicode-transforms;
wl-pprint-extras = doJailbreak super.wl-pprint-extras; # containers >=0.4 && <0.6 is too tight; https://github.com/ekmett/wl-pprint-extras/issues/17
RSA = dontCheck super.RSA; # https://github.com/GaloisInc/RSA/issues/14
monad-par = dontCheck super.monad-par; # https://github.com/simonmar/monad-par/issues/66
github = dontCheck super.github; # hspec upper bound exceeded; https://github.com/phadej/github/pull/341
binary-orphans = dontCheck super.binary-orphans; # tasty upper bound exceeded; https://github.com/phadej/binary-orphans/commit/8ce857226595dd520236ff4c51fa1a45d8387b33
rebase = doJailbreak super.rebase; # time ==1.9.* is too low

10
pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
View file

@ -127,6 +127,16 @@ self: super: {
sha256 = "0w4y3v69nd3yafpml4gr23l94bdhbmx8xky48a59lckmz5x9fgxv";
}) (doJailbreak super.language-haskell-extract);
# Patch for support of mtl-2.3
monad-par = appendPatches [
(pkgs.fetchpatch {
name = "monad-par-mtl-2.3.patch";
url = "https://github.com/simonmar/monad-par/pull/75/commits/ce53f6c1f8246224bfe0223f4aa3d077b7b6cc6c.patch";
sha256 = "1jxkl3b3lkjhk83f5q220nmjxbkmni0jswivdw4wfbzp571djrlx";
stripLen = 1;
})
] (doJailbreak super.monad-par);
# 2023-04-03: plugins disabled for hls 1.10.0.0 based on
#
haskell-language-server =

1
pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix
View file

@ -70,7 +70,6 @@ self: super: {
unicode-transforms = dontCheck super.unicode-transforms;
wl-pprint-extras = doJailbreak super.wl-pprint-extras; # containers >=0.4 && <0.6 is too tight; https://github.com/ekmett/wl-pprint-extras/issues/17
RSA = dontCheck super.RSA; # https://github.com/GaloisInc/RSA/issues/14
monad-par = dontCheck super.monad-par; # https://github.com/simonmar/monad-par/issues/66
github = dontCheck super.github; # hspec upper bound exceeded; https://github.com/phadej/github/pull/341
binary-orphans = dontCheck super.binary-orphans; # tasty upper bound exceeded; https://github.com/phadej/binary-orphans/commit/8ce857226595dd520236ff4c51fa1a45d8387b33

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

@ -482,15 +482,9 @@ let
cabal-install = released;
Cabal_3_10_1_0 = released;
Cabal-syntax_3_10_1_0 = released;
cabal2nix = lib.subtractLists [
compilerNames.ghc962
] released;
cabal2nix-unstable = lib.subtractLists [
compilerNames.ghc962
] released;
funcmp = lib.subtractLists [
compilerNames.ghc962
] released;
cabal2nix = released;
cabal2nix-unstable = released;
funcmp = released;
haskell-language-server = lib.subtractLists [
# Support ceased as of 1.9.0.0
compilerNames.ghc884
@ -504,9 +498,7 @@ let
hpack = released;
hsdns = released;
jailbreak-cabal = released;
language-nix = lib.subtractLists [
compilerNames.ghc962
] released;
language-nix = released;
large-hashable = [
compilerNames.ghc928
];