From b039854de1ddcf42cb1e4a3ab7ccb24ab1ed51b4 Mon Sep 17 00:00:00 2001 From: Domen Kožar Date: Tue, 10 Jul 2018 17:05:03 +0200 Subject: haskell-lzma: dontCheck --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- pkgs/development/haskell-modules/patches/lzma-tests.patch | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 pkgs/development/haskell-modules/patches/lzma-tests.patch (limited to 'pkgs/development/haskell-modules') diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e4c3dc943227..e495a7b0232f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -530,8 +530,8 @@ self: super: { # https://github.com/alphaHeavy/lzma-enumerator/issues/3 lzma-enumerator = dontCheck super.lzma-enumerator; - # https://github.com/haskell-hvr/lzma/pull/11 - lzma = appendPatch super.lzma ./patches/lzma-tests.patch; + # https://github.com/haskell-hvr/lzma/issues/14 + lzma = dontCheck super.lzma; # 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 deleted file mode 100644 index db9e62ee3c5f..000000000000 --- a/pkgs/development/haskell-modules/patches/lzma-tests.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/lzma.cabal -+++ b/lzma.cabal -@@ -76,7 +76,7 @@ - -- additional dependencies that require version bounds - build-depends: HUnit >= 1.2 && <1.7 - , QuickCheck >= 2.8 && <2.11 -- , tasty >= 0.10 && <0.13 -+ , tasty >= 0.10 && <1.1 - , tasty-hunit >= 0.9 && <0.11 - , tasty-quickcheck >= 0.8.3.2 && <0.10 - -- cgit 1.4.1