nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 21:40:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

haskellPackages.hnix: make GHC 9.4 patch unconditional

Browse Source
This commit is contained in:
sternenseemann
2023-07-26 13:32:49 +02:00
parent 6eb0db2b60
commit 9461adddf1
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

1
pkgs/development/haskell-modules/configuration-nix.nix
View File

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