diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2024-01-04 12:40:19 +0100 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2024-01-04 12:40:19 +0100 |
| commit | b05464512a8f67a6765fbdcc08f394b988457d5c (patch) | |
| tree | 71020be36304bac537e8d42e7d6ceb2b7ceaec5f /pkgs/development/haskell-modules | |
| parent | 8cdfe9c0ce16eba3b3f4513438f57f158096c67b (diff) | |
| download | nixlib-b05464512a8f67a6765fbdcc08f394b988457d5c.tar nixlib-b05464512a8f67a6765fbdcc08f394b988457d5c.tar.gz nixlib-b05464512a8f67a6765fbdcc08f394b988457d5c.tar.bz2 nixlib-b05464512a8f67a6765fbdcc08f394b988457d5c.tar.lz nixlib-b05464512a8f67a6765fbdcc08f394b988457d5c.tar.xz nixlib-b05464512a8f67a6765fbdcc08f394b988457d5c.tar.zst nixlib-b05464512a8f67a6765fbdcc08f394b988457d5c.zip | |
stack: slightly improve overrides
- Use hfinal where possible - Move overrides out of custom overlay where possible
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 16 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 1 |
2 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f5aba6a655b9..06bd323bc25f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1239,22 +1239,22 @@ self: super: { # stack-2.13.1 requires a bunch of the latest packages. (drv: drv.overrideScope (hfinal: hprev: { - ansi-terminal = hprev.ansi-terminal_1_0; # needs ansi-terminal >= 1.0 - crypton = hprev.crypton_0_34; # needs crypton >= 0.33 + ansi-terminal = hfinal.ansi-terminal_1_0; # needs ansi-terminal >= 1.0 + crypton = hfinal.crypton_0_34; # needs crypton >= 0.33 hedgehog = doJailbreak hprev.hedgehog; # has too strict version bound for ansi-terminal - hpack = hprev.hpack_0_36_0; # needs hpack == 0.36.0 - http-client-tls = hprev.http-client-tls_0_3_6_3; # needs http-client-tls >= 0.3.6.2 - http-download = dontCheck hprev.http-download_0_2_1_0; # needs http-download >= 0.2.1.0, tests access network - optparse-applicative = hprev.optparse-applicative_0_18_1_0; # needs optparse-applicative >= 0.18.1.0 + hpack = hfinal.hpack_0_36_0; # needs hpack == 0.36.0 + http-client-tls = hfinal.http-client-tls_0_3_6_3; # needs http-client-tls >= 0.3.6.2 + http-download = hfinal.http-download_0_2_1_0; # needs http-download >= 0.2.1.0 + optparse-applicative = hfinal.optparse-applicative_0_18_1_0; # needs optparse-applicative >= 0.18.1.0 pantry = hfinal.pantry_0_9_3_1; # needs pantry >= 0.9.2 syb = dontCheck hprev.syb; # cyclic dependencies - tar-conduit = hprev.tar-conduit_0_4_0; # pantry needs tar-conduit >= 0.4.0 + tar-conduit = hfinal.tar-conduit_0_4_0; # pantry needs tar-conduit >= 0.4.0 temporary = dontCheck hprev.temporary; # cyclic dependencies })) ]; hopenpgp-tools = super.hopenpgp-tools.override { - optparse-applicative = self.optparse-applicative_0_18_1_0; + optparse-applicative = self.optparse-applicative_0_18_1_0; }; # musl fixes diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 56ed29db6794..43c51cb44101 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -824,6 +824,7 @@ self: super: builtins.intersectAttrs super { # Tests require internet http-download = dontCheck super.http-download; + http-download_0_2_1_0 = doDistribute (dontCheck super.http-download_0_2_1_0); pantry = dontCheck super.pantry; pantry_0_9_3_1 = doDistribute (dontCheck super.pantry_0_9_3_1); |