From 8758481cc0dc2717045bb090acf151c6a33c094c Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 30 Aug 2022 14:21:06 +0200 Subject: [PATCH] haskell.packages.ghc884.{foundation,basement}: downgrade for GHC 8.8 The 0.0.29 and 0.0.15 releases respectively have dropped support for GHC < 8.10. --- .../configuration-ghc-8.8.x.nix | 3 +- .../configuration-hackage2nix/main.yaml | 2 ++ .../haskell-modules/hackage-packages.nix | 28 +++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 1f82ecebd647..3650766cfd48 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -93,7 +93,8 @@ self: super: { time-compat = doJailbreak super.time-compat; http-media = unmarkBroken (doJailbreak super.http-media); servant-server = unmarkBroken (doJailbreak super.servant-server); - foundation = dontCheck super.foundation; + basement = doDistribute self.basement_0_0_14; + foundation = doDistribute (dontCheck self.foundation_0_0_28); vault = dontHaddock super.vault; # https://github.com/snapframework/snap-core/issues/288 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 72fda2b3a145..21676e0d9f1c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -150,6 +150,8 @@ extra-packages: - weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7 - weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2 - brick == 0.70.* # 2022-08-13: needed by matterhorn-50200.17.0 + - basement < 0.0.15 # 2022-08-30: last version to support GHC < 8.10 + - foundation < 0.0.29 # 2022-08-30: last version to support GHC < 8.10 package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 06a74257aac5..f3ef572d4179 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -40649,6 +40649,20 @@ self: { license = lib.licenses.mit; }) {}; + "basement_0_0_14" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "basement"; + version = "0.0.14"; + sha256 = "01kk3z0c48c2jhni8ba165zxzm4sljy18r97cad1yd897qjsy2mv"; + revision = "2"; + editedCabalFile = "16q5ilgblwhdhwxq8p76dp3c3gm55b6scgswx863zpjyca5avaif"; + libraryHaskellDepends = [ base ghc-prim ]; + description = "Foundation scrap box of array & string"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "basement" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -102095,6 +102109,20 @@ self: { mainProgram = "foscam-sort"; }) {}; + "foundation_0_0_28" = callPackage + ({ mkDerivation, base, basement, gauge, ghc-prim }: + mkDerivation { + pname = "foundation"; + version = "0.0.28"; + sha256 = "06hsh40qwmy2nfkrd9m8lfhi6arziixdw9pn379m6a7cga2vjcnh"; + libraryHaskellDepends = [ base basement ghc-prim ]; + testHaskellDepends = [ base basement ]; + benchmarkHaskellDepends = [ base basement gauge ]; + description = "Alternative prelude with batteries and no dependencies"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "foundation" = callPackage ({ mkDerivation, base, basement, gauge, ghc-prim }: mkDerivation {