diff options
author | Janus Troelsen <ysangkok@gmail.com> | 2023-04-23 19:33:14 +0000 |
---|---|---|
committer | Janus Troelsen <ysangkok@gmail.com> | 2023-04-23 19:40:51 +0000 |
commit | 3aa6004a884b6308f204728fa157e9d2081cd153 (patch) | |
tree | cc1c5207e346faedec4ec274955e5b0577a523df /pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | |
parent | 4f3418e4d0e8374423a4ef93fd3b7625b207ba3e (diff) | |
download | nixlib-3aa6004a884b6308f204728fa157e9d2081cd153.tar nixlib-3aa6004a884b6308f204728fa157e9d2081cd153.tar.gz nixlib-3aa6004a884b6308f204728fa157e9d2081cd153.tar.bz2 nixlib-3aa6004a884b6308f204728fa157e9d2081cd153.tar.lz nixlib-3aa6004a884b6308f204728fa157e9d2081cd153.tar.xz nixlib-3aa6004a884b6308f204728fa157e9d2081cd153.tar.zst nixlib-3aa6004a884b6308f204728fa157e9d2081cd153.zip |
haskell.packages.ghc961.{aeson,singleton-bool,unliftio-core,lukko,lucid}:
Remove unnecessary jailbreaks
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 14 |
1 files changed, 4 insertions, 10 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 0cfbc158a370..426a545fab91 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -74,9 +74,7 @@ self: super: { th-abstraction = doDistribute self.th-abstraction_0_5_0_0; th-desugar = doDistribute self.th-desugar_1_15; turtle = doDistribute self.turtle_1_6_1; - # Too strict bounds on ghc-prim and template-haskell - aeson = doDistribute (doJailbreak self.aeson_2_1_2_1); - # Too strict bounds on ghc-prim + aeson = doDistribute self.aeson_2_1_2_1; memory = doDistribute self.memory_0_18_0; ghc-lib = doDistribute self.ghc-lib_9_6_1_20230312; @@ -88,23 +86,20 @@ self: super: { # allows base >= 4.18 tasty-hedgehog = doDistribute self.tasty-hedgehog_1_4_0_1; + # v0.1.6 forbids base >= 4.18 + singleton-bool = assert !(self ? singleton-bool_0_1_7) doDistribute super.singleton-bool_0_1_7; + # # Too strict bounds without upstream fix # # Forbids transformers >= 0.6 quickcheck-classes-base = doJailbreak super.quickcheck-classes-base; - # Forbids base >= 4.18 - singleton-bool = doJailbreak super.singleton-bool; - # Forbids base >= 4.18 - unliftio-core = doJailbreak super.unliftio-core; # Forbids mtl >= 2.3 ChasingBottoms = doJailbreak super.ChasingBottoms; # Forbids base >= 4.18 cabal-install-solver = doJailbreak super.cabal-install-solver; cabal-install = doJailbreak super.cabal-install; - # Forbids base >= 4.18 - lukko = doJailbreak super.lukko; # Forbids base >= 4.18, fix proposed: https://github.com/sjakobi/newtype-generics/pull/25 newtype-generics = jailbreakForCurrentVersion super.newtype-generics "0.6.2"; @@ -178,7 +173,6 @@ self: super: { rebase = doJailbreak super.rebase_1_20; rerebase = doJailbreak super.rerebase_1_20; hiedb = dontCheck super.hiedb; - lucid = doJailbreak (dontCheck super.lucid); retrie = dontCheck (super.retrie); ghc-exactprint = unmarkBroken (addBuildDepends (with self.ghc-exactprint.scope; [ |