public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskellPackages.insert-ordered-containers: fix build

Browse Source
This commit is contained in:
Izorkin 2019-06-09 20:21:22 +03:00 committed by Matthieu Coudron
parent a3e2cb2a90
commit cf9acd3e6d
2 changed files with 0 additions and 26 deletions

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

@ -1181,7 +1181,6 @@ self: super: {
# Jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30
tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1
these = doJailbreak super.these; # until these >= 0.7.6
insert-ordered-containers = appendPatch super.insert-ordered-containers ./patches/insert-ordered-containers-fix-test.patch;
uri-bytestring = appendPatch super.uri-bytestring (pkgs.fetchpatch {
url = "https://github.com/Soostone/uri-bytestring/commit/e5c5602a97160a6a6304a24947e33e47c9155460.patch";

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

@ -1,25 +0,0 @@
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