haskellPackages.hnix: make GHC 9.4 patch unconditional
This commit is contained in:
parent
6eb0db2b60
commit
9461adddf1
|
@ -471,7 +471,11 @@ self: super: {
|
|||
|
||||
# 2020-06-05: HACK: does not pass own build suite - `dontCheck`
|
||||
# 2022-11-24: jailbreak as it has too strict bounds on a bunch of things
|
||||
hnix = self.generateOptparseApplicativeCompletions [ "hnix" ] (dontCheck (doJailbreak super.hnix));
|
||||
# 2023-07-26: Cherry-pick GHC 9.4 changes from hnix master branch
|
||||
hnix = appendPatches [
|
||||
./patches/hnix-compat-for-ghc-9.4.patch
|
||||
] (dontCheck (doJailbreak super.hnix));
|
||||
|
||||
# Too strict bounds on algebraic-graphs and bytestring
|
||||
# https://github.com/haskell-nix/hnix-store/issues/180
|
||||
hnix-store-core = doJailbreak super.hnix-store-core;
|
||||
|
|
|
@ -68,11 +68,6 @@ in {
|
|||
# https://gitlab.haskell.org/ghc/ghc/-/issues/21619
|
||||
hedgehog = dontHaddock super.hedgehog;
|
||||
|
||||
# Cherry-pick GHC 9.4 changes from hnix master branch
|
||||
hnix = appendPatches [
|
||||
./patches/hnix-compat-for-ghc-9.4.patch
|
||||
] (doJailbreak super.hnix);
|
||||
|
||||
hpack = overrideCabal (drv: {
|
||||
# Cabal 3.6 seems to preserve comments when reading, which makes this test fail
|
||||
# 2021-10-10: 9.2.1 is not yet supported (also no issue)
|
||||
|
|
|
@ -294,6 +294,7 @@ self: super: builtins.intersectAttrs super {
|
|||
niv = enableSeparateBinOutput (self.generateOptparseApplicativeCompletions [ "niv" ] super.niv);
|
||||
ghcid = enableSeparateBinOutput super.ghcid;
|
||||
ormolu = self.generateOptparseApplicativeCompletions [ "ormolu" ] (enableSeparateBinOutput super.ormolu);
|
||||
hnix = self.generateOptparseApplicativeCompletions [ "hnix" ] super.hnix;
|
||||
|
||||
# Generate shell completion.
|
||||
cabal2nix = self.generateOptparseApplicativeCompletions [ "cabal2nix" ] super.cabal2nix;
|
||||
|
|
Loading…
Reference in a new issue