From 9461adddf13e48fd1fe6f60e3feabe693f0611ef Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 26 Jul 2023 13:32:49 +0200 Subject: [PATCH] haskellPackages.hnix: make GHC 9.4 patch unconditional --- pkgs/development/haskell-modules/configuration-common.nix | 6 +++++- .../development/haskell-modules/configuration-ghc-9.4.x.nix | 5 ----- pkgs/development/haskell-modules/configuration-nix.nix | 1 + 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 50f6c0d55426..4a8bfe73abe3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -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; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 7873c682f52e..76af2124a155 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -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) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index bed442a25aff..db35bc84c9cb 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -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;