diff options
| author | maralorn <mail@maralorn.de> | 2023-04-22 22:25:44 +0200 |
|---|---|---|
| committer | maralorn <mail@maralorn.de> | 2023-04-22 22:27:21 +0200 |
| commit | 22c5bd85d8478e24874ff2b80875506f5c3711a6 (patch) | |
| tree | 88275bee1a5915de39c24c1606f4ee9b5a9a256b /pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | |
| parent | 89454d5d0248ce47e543abcdb5812637c2009c31 (diff) | |
| download | nixlib-22c5bd85d8478e24874ff2b80875506f5c3711a6.tar nixlib-22c5bd85d8478e24874ff2b80875506f5c3711a6.tar.gz nixlib-22c5bd85d8478e24874ff2b80875506f5c3711a6.tar.bz2 nixlib-22c5bd85d8478e24874ff2b80875506f5c3711a6.tar.lz nixlib-22c5bd85d8478e24874ff2b80875506f5c3711a6.tar.xz nixlib-22c5bd85d8478e24874ff2b80875506f5c3711a6.tar.zst nixlib-22c5bd85d8478e24874ff2b80875506f5c3711a6.zip | |
Partially revert "haskell.packages.ghc96: uses jailbreakForCurrentVersion"
This partially reverts commit 4925760232120dc8bc26f733a692f685b86ee108.
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 | 4 |
1 files changed, 2 insertions, 2 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 fe20cdf7a283..0cfbc158a370 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -118,8 +118,8 @@ self: super: { # # base >= 4.18 is allowed in those newer versions - boring = jailbreakForCurrentVersion super.boring "0.2.1"; - these = jailbreakForCurrentVersion super.these "1.2"; + boring = assert !(self ? boring_0_2_1); doJailbreak super.boring; + these = assert !(self ? assoc_1_2); doJailbreak super.these; # XXX: We probably should be using semigroupoids 6.0.1 which is intended for 9.6 semigroupoids = doJailbreak super.semigroupoids; |