about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2018-07-10 17:05:03 +0200
committerPeter Simons <simons@cryp.to>2018-07-10 20:10:27 +0200
commitb039854de1ddcf42cb1e4a3ab7ccb24ab1ed51b4 (patch)
treed470bd609a0615a6abfb8c8378942c2d4f7bc4f7
parentb49693a0faf5bdebe094d1b6e63a0d3db553a8c9 (diff)
downloadnixlib-b039854de1ddcf42cb1e4a3ab7ccb24ab1ed51b4.tar
nixlib-b039854de1ddcf42cb1e4a3ab7ccb24ab1ed51b4.tar.gz
nixlib-b039854de1ddcf42cb1e4a3ab7ccb24ab1ed51b4.tar.bz2
nixlib-b039854de1ddcf42cb1e4a3ab7ccb24ab1ed51b4.tar.lz
nixlib-b039854de1ddcf42cb1e4a3ab7ccb24ab1ed51b4.tar.xz
nixlib-b039854de1ddcf42cb1e4a3ab7ccb24ab1ed51b4.tar.zst
nixlib-b039854de1ddcf42cb1e4a3ab7ccb24ab1ed51b4.zip
haskell-lzma: dontCheck
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix4
-rw-r--r--pkgs/development/haskell-modules/patches/lzma-tests.patch11
2 files changed, 2 insertions, 13 deletions
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
-