haskellPackages.{hackage-db,distribution-nixpkgs}: new rel. bounds

* no released version of hackage2nix does support distribution-nixpkgs yet.

* hackage-db 2.1.2 fixes an annoying bug introduced in 2.1.1 and also supports
  Cabal 3.4: https://github.com/NixOS/cabal2nix/issues/501
This commit is contained in:
sternenseemann 2021-07-26 18:59:58 +02:00
parent fafe21b678
commit d675e19abb
5 changed files with 1 additions and 14 deletions

View file

@ -1869,8 +1869,6 @@ EOT
# https://github.com/HeinrichApfelmus/reactive-banana/issues/215
reactive-banana = doJailbreak super.reactive-banana;
hackage-db_2_1_0 = doDistribute super.hackage-db_2_1_0;
# Too strict bounds on QuickCheck
# https://github.com/muesli4/table-layout/issues/16
table-layout = doJailbreak super.table-layout;

View file

@ -84,8 +84,4 @@ self: super: {
executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ];
}));
# hackage-db 2.1.1 is incompatible with Cabal < 3.4
# See https://github.com/NixOS/cabal2nix/issues/501
hackage-db = self.hackage-db_2_1_0;
}

View file

@ -106,8 +106,4 @@ self: super: {
# https://github.com/haskellari/time-compat/issues/23
time-compat = dontCheck super.time-compat;
# hackage-db 2.1.1 is incompatible with Cabal < 3.4
# See https://github.com/NixOS/cabal2nix/issues/501
hackage-db = super.hackage-db_2_1_0;
}

View file

@ -136,7 +136,4 @@ self: super: {
# vector 0.12.2 indroduced doctest checks that dont work on older compilers
vector = dontCheck super.vector;
# hackage-db 2.1.1 is incompatible with Cabal < 3.4
# See https://github.com/NixOS/cabal2nix/issues/501
hackage-db = super.hackage-db_2_1_0;
}

View file

@ -87,6 +87,7 @@ default-package-overrides:
- diagrams-lib < 1.4.4
# streamly-bytestring 0.1.3 needs streamly 0.8.0 which is not included in our stackage snapshot
- streamly-bytestring == 0.1.2
- distribution-nixpkgs < 1.6.0 # 2021-07-26: required until cabal2nix 2.17.1 is released
extra-packages:
- base16-bytestring < 1 # required for cabal-install etc.
@ -113,7 +114,6 @@ extra-packages:
- sbv == 7.13 # required for pkgs.petrinizer
- crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses
- ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version
- hackage-db < 2.1.1 # 2021-06-10: Need older hackage-db as long as Cabal < 3.4, see https://github.com/NixOS/cabal2nix/issues/501
package-maintainers:
abbradar: