MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-18 15:56:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #55445 from Izorkin/insert-ordered-containers-fix-test

Browse source 
haskellPackages.insert-ordered-containers: fix test phase
This commit is contained in:
Peter Simons 2019-02-09 10:16:28 +01:00 committed by GitHub
commit 20dc7bfc5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -1186,6 +1186,7 @@ self: super: {
# Jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30 # Jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30
tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1 tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1
these = doJailbreak super.these; # until these >= 0.7.6 these = doJailbreak super.these; # until these >= 0.7.6
insert-ordered-containers = appendPatch super.insert-ordered-containers ./patches/insert-ordered-containers-fix-test.patch;
# These patches contain fixes for 8.6 that should be safe for # These patches contain fixes for 8.6 that should be safe for
# earlier versions, but we need the relaxed version bounds in GHC # earlier versions, but we need the relaxed version bounds in GHC

25
pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch Normal file
View file

@ -0,0 +1,25 @@
diff --git a/insert-ordered-containers.cabal b/insert-ordered-containers.cabal
index 0e8923a..bfbbec4 100644
--- a/insert-ordered-containers.cabal
+++ b/insert-ordered-containers.cabal
@@ -21,8 +21,8 @@ tested-with:
GHC==7.10.3,
GHC==8.0.1,
GHC==8.2.2,
- GHC==8.4.3,
- GHC==8.6.1
+ GHC==8.4.4,
+ GHC==8.6.3
extra-source-files:
CHANGELOG.md
@@ -70,7 +70,7 @@ test-suite ins-ord-containers-tests
, unordered-containers
, base
, insert-ordered-containers
- , tasty >= 0.10.1.2 && <1.2
+ , tasty >= 0.10.1.2 && <1.3
, tasty-quickcheck >= 0.8.3.2 && <0.11
, QuickCheck >=2.7.6 && <2.13
default-language: Haskell2010