From 33fb613422811f5b8a71e5b0dc5174924cc90102 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 16 Mar 2024 22:18:32 +0100 Subject: [PATCH] haskell.packages.ghc92.primitive-unlifted: Pin to fix build --- .../haskell-modules/configuration-ghc-9.2.x.nix | 1 + .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 15 +++++++++++++++ 3 files changed, 17 insertions(+) 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 24ccbf70face..bfe39e0a7597 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -83,6 +83,7 @@ self: super: { # For GHC < 9.4, some packages need data-array-byte as an extra dependency hashable = addBuildDepends [ self.data-array-byte ] super.hashable; primitive = addBuildDepends [ self.data-array-byte ] super.primitive; + primitive-unlifted = super.primitive-unlifted_0_1_3_1; # Jailbreaks & Version Updates hashable-time = doJailbreak super.hashable-time; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index e82686f224a7..f3e1aba526dd 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -93,6 +93,7 @@ extra-packages: - fourmolu == 0.14.0.0 # 2023-11-13: for ghc-lib-parser 9.6 compat - ormolu == 0.5.2.0 # 2023-08-08: for hls on ghc 9.0 and 9.2 - ormolu == 0.7.2.0 # 2023-11-13: for ghc-lib-parser 9.6 compat + - primitive-unlifted == 0.1.3.1 # 2024-03-16: Needed for hls on ghc 9.2 - path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2 - resolv < 0.2 # required to build cabal-install-3.10.1.0 with Stackage LTS 21 - sbv == 7.13 # required for pkgs.petrinizer diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b85f6850a4ab..aaab1d13b2df 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -240597,6 +240597,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "primitive-unlifted_0_1_3_1" = callPackage + ({ mkDerivation, base, bytestring, primitive, stm, text-short }: + mkDerivation { + pname = "primitive-unlifted"; + version = "0.1.3.1"; + sha256 = "1gilzgclpvz200sybw86nmdm7084nrklscq48cs36qqlgcd0wcwb"; + revision = "1"; + editedCabalFile = "0y3zdwbs1fdzspj1k95jyjrhm7za38gb6ada031bp02ifxbvsvsf"; + libraryHaskellDepends = [ base bytestring primitive text-short ]; + testHaskellDepends = [ base primitive stm ]; + description = "Primitive GHC types with unlifted types inside"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "primitive-unlifted" = callPackage ({ mkDerivation, array, base, bytestring, primitive, QuickCheck , quickcheck-classes-base, stm, tasty, tasty-quickcheck, text-short