From 3ad6e93971ffc1296777fb80551abad2e20f4c24 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 1 Jul 2023 11:54:09 +0200 Subject: [PATCH] haskell.packages.ghc94.shake-cabal: drop bound GHC 9.4 can build the latest version of shake-cabal, so let's do that! The older version is preserved for GHC 9.2 in case we have users that need to use GHC 9.2 for a transitional time. --- .../development/haskell-modules/configuration-ghc-9.2.x.nix | 3 +++ .../development/haskell-modules/configuration-ghc-9.4.x.nix | 1 - .../haskell-modules/configuration-hackage2nix/main.yaml | 3 +-- pkgs/development/haskell-modules/hackage-packages.nix | 6 +++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 206add606da7..6e0b214fa6c2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -75,6 +75,9 @@ self: super: { # For "ghc-lib" flag see https://github.com/haskell/haskell-language-server/issues/3185#issuecomment-1250264515 hlint = enableCabalFlag "ghc-lib" super.hlint; + # 0.2.2.3 requires Cabal >= 3.8 + shake-cabal = doDistribute self.shake-cabal_0_2_2_2; + # https://github.com/sjakobi/bsb-http-chunked/issues/38 bsb-http-chunked = dontCheck super.bsb-http-chunked; 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 2037045e401c..8e08c86eb45c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -93,7 +93,6 @@ in { regex-posix = doJailbreak super.regex-posix; resolv = doJailbreak super.resolv; singleton-bool = doJailbreak super.singleton-bool; - shake-cabal = doDistribute self.shake-cabal_0_2_2_3; libmpd = doJailbreak super.libmpd; generics-sop = doJailbreak super.generics-sop; microlens-th = doJailbreak super.microlens-th; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 93fd850481d8..e88b762ab1be 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -40,8 +40,6 @@ default-package-overrides: - reflex < 0.9.0.0 # required by haskell-language-server 1.9.0.0 - implicit-hie < 0.1.3 - # latest version requires Cabal >= 3.8 - - shake-cabal < 0.2.2.3 # needed as long as we have pandoc < 3.0, i.e. stackage lts 20 - pandoc-crossref < 0.3.15.0 # Needs to match hspec which is tracked in stackage @@ -139,6 +137,7 @@ extra-packages: - retrie < 1.2.0.0 # 2022-12-30: required for hls on ghc < 9.2 - ghc-tags == 1.5.* # 2023-02-18: preserve for ghc-lib == 9.2.* - fourmolu == 0.10.1.0 # 2023-04-18: for hls-fourmolu-plugin 1.1.1.0 + - shake-cabal < 0.2.2.3 # 2023-07-01: last version to support Cabal 3.6.* package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 362a7b9c0eef..d786392b98ff 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -262974,7 +262974,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "shake-cabal" = callPackage + "shake-cabal_0_2_2_2" = callPackage ({ mkDerivation, base, binary, Cabal, composition-prelude, deepseq , directory, filepath, hashable, shake }: @@ -262990,9 +262990,10 @@ self: { ]; description = "Shake library for use with cabal"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; - "shake-cabal_0_2_2_3" = callPackage + "shake-cabal" = callPackage ({ mkDerivation, base, binary, Cabal, composition-prelude, deepseq , directory, filepath, hashable, shake }: @@ -263006,7 +263007,6 @@ self: { ]; description = "Shake library for use with cabal"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "shake-cabal-build" = callPackage