nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 23:22:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

haskellPackages.lzma: fix outdated patch

Browse Source
This commit is contained in:
Jan Tojnar 2018-04-11 22:12:14 +02:00
parent b1fa009aa2
commit 9ae378cc42
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -508,7 +508,7 @@ self: super: {
# https://github.com/alphaHeavy/lzma-enumerator/issues/3
lzma-enumerator = dontCheck super.lzma-enumerator;
# https://github.com/haskell-hvr/lzma/issues/8
# https://github.com/haskell-hvr/lzma/pull/11
lzma = appendPatch super.lzma ./patches/lzma-tests.patch;
# https://github.com/BNFC/bnfc/issues/140
@ -1040,4 +1040,4 @@ self: super: {
amazonka-test = super.amazonka-test.overrideScope amazonkaOverrides;
in {
inherit amazonka amazonka-core amazonka-test;
})
})

18
pkgs/development/haskell-modules/patches/lzma-tests.patch
View File

@ -1,13 +1,11 @@
--- a/lzma.cabal
+++ b/lzma.cabal
@@ -70,8 +70,8 @@ test-suite lzma-tests
, base
, bytestring
@@ -76,7 +76,7 @@
-- 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
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