From 0295dd76598ede3107076512e98b092cfc6b5813 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Sun, 10 Nov 2024 21:33:26 +0000 Subject: [PATCH 1/2] haskellPackages.dependent-sum-template: build with ghc 9.10 --- pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix index 13059681197d..848d753b73b5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix @@ -63,6 +63,7 @@ self: super: { aeson = doDistribute self.aeson_2_2_3_0; attoparsec-aeson = doDistribute self.attoparsec-aeson_2_2_2_0; auto-update = super.auto-update_0_2_2; + dependent-sum-template = doJailbreak self.dependent-sum-template_0_2_0_1; # template-haskell < 2.22 extensions = doDistribute self.extensions_0_1_0_2; fourmolu = doDistribute self.fourmolu_0_16_2_0; hashable = doDistribute self.hashable_1_4_7_0; From 5ab3591ad01f034048f5a43f8d611f7a0876bddf Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Sun, 10 Nov 2024 21:34:48 +0000 Subject: [PATCH 2/2] haskellPackages.dependent-sum-template: remove jailbreak on 9.8 --- pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index be4107c2cbdd..4f989f761859 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -62,6 +62,7 @@ self: super: { # https://github.com/haskell/aeson/commit/1a666febd0775d8e88d315ece1b97cd20602fb5f aeson = doJailbreak (doDistribute self.aeson_2_2_3_0); attoparsec-aeson = doDistribute self.attoparsec-aeson_2_2_2_0; + dependent-sum-template = self.dependent-sum-template_0_2_0_1; # template-haskell < 2.22 xmonad = doDistribute self.xmonad_0_18_0; apply-refact = self.apply-refact_0_14_0_0; ormolu = self.ormolu_0_7_4_0; @@ -94,7 +95,6 @@ self: super: { # blaze-svg = doJailbreak super.blaze-svg; # base <4.19 commutative-semigroups = doJailbreak super.commutative-semigroups; # base < 4.19 - dependent-sum-template = doJailbreak super.dependent-sum-template_0_2_0_1; # template-haskell < 2.21 diagrams-lib = doJailbreak super.diagrams-lib; # base <4.19, text <2.1 diagrams-postscript = doJailbreak super.diagrams-postscript; # base <4.19, bytestring <0.12 diagrams-svg = doJailbreak super.diagrams-svg; # base <4.19, text <2.1