From 6ea37497cd2f95c774579122cf8f97621b9cf691 Mon Sep 17 00:00:00 2001 From: Test Date: Tue, 2 Jan 2018 17:42:21 -0600 Subject: loosen version bounds for lzma test dependencies --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ pkgs/development/haskell-modules/patches/lzma-tests.patch | 13 +++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/haskell-modules/patches/lzma-tests.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0ff5d4f8e03a..28043a1372ae 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -566,6 +566,9 @@ self: super: { # https://github.com/alphaHeavy/lzma-enumerator/issues/3 lzma-enumerator = dontCheck super.lzma-enumerator; + # Unpin some versions + lzma = appendPatch super.lzma ./patches/lzma-tests.patch; + # https://github.com/BNFC/bnfc/issues/140 BNFC = dontCheck super.BNFC; diff --git a/pkgs/development/haskell-modules/patches/lzma-tests.patch b/pkgs/development/haskell-modules/patches/lzma-tests.patch new file mode 100644 index 000000000000..e4e327ab6bbc --- /dev/null +++ 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 -- cgit 1.4.1 From a4c8f60e86252b4136ab9a8e28ca166fc9be15c8 Mon Sep 17 00:00:00 2001 From: Allen Nelson Date: Sat, 6 Jan 2018 23:08:24 -0600 Subject: reference issue in comment --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 28043a1372ae..56ac278c165f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -566,7 +566,7 @@ self: super: { # https://github.com/alphaHeavy/lzma-enumerator/issues/3 lzma-enumerator = dontCheck super.lzma-enumerator; - # Unpin some versions + # https://github.com/haskell-hvr/lzma/issues/8 lzma = appendPatch super.lzma ./patches/lzma-tests.patch; # https://github.com/BNFC/bnfc/issues/140 -- cgit 1.4.1