Merge pull request #33360 from adnelson/unpin_lzma_versions

haskellPackages.lzma: loosen version bounds for test dependencies
2018-01-12 16:09:13 +01:00 · 2018-01-12 16:09:13 +01:00 · e277be1943
commit e277be1943
parent 96e777adfd a4c8f60e86
2 changed files with 16 additions and 0 deletions
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -481,6 +481,9 @@ self: super: {
  # https://github.com/alphaHeavy/lzma-enumerator/issues/3
  lzma-enumerator = dontCheck super.lzma-enumerator;

+  # https://github.com/haskell-hvr/lzma/issues/8
+  lzma = appendPatch super.lzma ./patches/lzma-tests.patch;
+
  # https://github.com/BNFC/bnfc/issues/140
  BNFC = dontCheck super.BNFC;

--- a/pkgs/development/haskell-modules/patches/lzma-tests.patch
+++ b/pkgs/development/haskell-modules/patches/lzma-tests.patch
@ -0,0 +1,13 @@
+--- a/lzma.cabal
+++ b/lzma.cabal
+@@ -70,8 +70,8 @@ test-suite lzma-tests
+                      , base
+                      , bytestring
+   -- additional dependencies that require version bounds
+-  build-depends:       HUnit                      >= 1.2      && <1.4
+-                     , QuickCheck                 >= 2.8      && <2.9
+  build-depends:       HUnit                      >= 1.2      && <2
+                     , QuickCheck                 >= 2.8      && <3
+                      , tasty                      >= 0.10     && <0.12
+                      , tasty-hunit                == 0.9.*
+                      , tasty-quickcheck           >= 0.8.3.2  && < 0.9