From dc532b18f2d7ffd8e4aad708c60a3e1b996f818e Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Thu, 30 Mar 2023 13:31:07 +0900 Subject: [PATCH] haskell.packages.ghc96: fix some overrides for ghc96 --- .../configuration-ghc-9.6.x.nix | 45 +++---------------- 1 file changed, 7 insertions(+), 38 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index a7f19e119d4b..9263a38c55a6 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -57,14 +57,15 @@ self: super: { # Version deviations from Stackage LTS # - th-desugar = doDistribute self.th-desugar_1_15; - th-abstraction = doDistribute self.th-abstraction_0_5_0_0; - tagged = doDistribute self.tagged_0_8_7; # allows template-haskell-2.20 - primitive = doDistribute (dontCheck self.primitive_0_7_4_0); # allows base >= 4.18 - indexed-traversable = doDistribute super.indexed-traversable_0_1_2_1; # allows base >= 4.18 - OneTuple = doDistribute (dontCheck super.OneTuple_0_4_1_1); # allows base >= 4.18 + doctest = doDistribute super.doctest_0_21_1; inspection-testing = doDistribute self.inspection-testing_0_5_0_1; # allows base >= 4.18 + OneTuple = doDistribute (dontCheck super.OneTuple_0_4_1_1); # allows base >= 4.18 + primitive = doDistribute (dontCheck self.primitive_0_7_4_0); # allows base >= 4.18 + tagged = doDistribute self.tagged_0_8_7; # allows template-haskell-2.20 + some = doDistribute self.some_1_0_5; tasty-inspection-testing = doDistribute self.tasty-inspection-testing_0_2; + th-abstraction = doDistribute self.th-abstraction_0_5_0_0; + th-desugar = doDistribute self.th-desugar_1_15; # Too strict bounds on ghc-prim and template-haskell aeson = doDistribute (doJailbreak self.aeson_2_1_2_1); # Too strict bounds on ghc-prim @@ -98,45 +99,13 @@ self: super: { # base >= 4.18 is allowed in those newer versions boring = assert !(self ? boring_0_2_1); doJailbreak super.boring; - some = assert !(self ? some_1_0_5); doJailbreak super.some; - assoc = assert !(self ? assoc_1_1); doJailbreak super.assoc; these = assert !(self ? assoc_1_2); doJailbreak super.these; - # Temporarily upgrade manually until the attribute is available - doctest = doDistribute (overrideCabal { - version = "0.21.1"; - sha256 = "0vgl89p6iaj2mwnd1gkpq86q1g18shdcws0p3can25algi2sldk3"; - } super.doctest_0_21_0); # XXX: We probably should be using semigroupoids 6.0.1 which is intended for 9.6 semigroupoids = doJailbreak super.semigroupoids; # XXX: 1.3 supports 9.6 properly, but is intended for bifunctors >= 5.6 semialign = doJailbreak super.semialign; - # - # Too strict bounds, waiting on Revision in nixpkgs - # - - # Revision 7 lifts the offending bound on ghc-prim - ed25519 = jailbreakWhileRevision 6 super.ed25519; - # Revision 6 lifts the offending bound on base - tar = jailbreakWhileRevision 5 super.tar; - # Revision 2 lifts the offending bound on base - HTTP = jailbreakWhileRevision 1 super.HTTP; - # Revision 1 lifts the offending bound on base - dec = jailbreakWhileRevision 0 super.dec; - # Revision 2 lifts the offending bound on base - cryptohash-sha256 = jailbreakWhileRevision 1 super.cryptohash-sha256; - # Revision 4 lifts offending template-haskell bound - uuid-types = jailbreakWhileRevision 3 super.uuid-types; - # Revision 1 lifts offending base bound - quickcheck-instances = jailbreakWhileRevision 0 super.quickcheck-instances; - # Revision 1 lifts offending base bound - generically = jailbreakWhileRevision 0 super.generically; - # Revision 3 lifts offending template-haskell bound - hackage-security = jailbreakWhileRevision 2 super.hackage-security; - # Revision 6 lifts offending base bound - parallel = jailbreakWhileRevision 5 super.parallel; - # # Compilation failure workarounds #