diff options
| author | Izorkin <izorkin@elven.pw> | 2019-02-08 15:22:46 +0300 |
|---|---|---|
| committer | Izorkin <izorkin@elven.pw> | 2019-02-08 15:22:46 +0300 |
| commit | 535644a9dac27eeb0a38ac47395e5932d41664a1 (patch) | |
| tree | b3da555efe3de55f1a6a56f7d682074f3d430a50 /pkgs | |
| parent | ce8c243699808355e0a550c7bdebf4ca94f0480d (diff) | |
| download | nixpkgs-535644a9dac27eeb0a38ac47395e5932d41664a1.tar nixpkgs-535644a9dac27eeb0a38ac47395e5932d41664a1.tar.gz nixpkgs-535644a9dac27eeb0a38ac47395e5932d41664a1.tar.bz2 nixpkgs-535644a9dac27eeb0a38ac47395e5932d41664a1.tar.lz nixpkgs-535644a9dac27eeb0a38ac47395e5932d41664a1.tar.xz nixpkgs-535644a9dac27eeb0a38ac47395e5932d41664a1.tar.zst nixpkgs-535644a9dac27eeb0a38ac47395e5932d41664a1.zip | |
haskellPackages.insert-ordered-containers: fix test phase
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch | 25 |
2 files changed, 26 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c5ddd18ff49..423abfc2f7c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1186,6 +1186,7 @@ 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; # These patches contain fixes for 8.6 that should be safe for # earlier versions, but we need the relaxed version bounds in GHC diff --git a/pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch b/pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch new file mode 100644 index 00000000000..1e9ac5aa66a --- /dev/null +++ b/pkgs/development/haskell-modules/patches/insert-ordered-containers-fix-test.patch @@ -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 + |