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

haskellPackages.diagrams-lib: unbreak

Browse Source 
Getting compatibility with optparse-applicative >= 0.16 only required
pulling in a patch from master which is unreleased unfortunately.

The old overrides were obsolete except for the jailbreak as the test
fixes made their way into the latest release.
This commit is contained in:
sternenseemann 2021-03-24 00:30:19 +01:00
parent bbf13dd111
commit fe0bdf4d01
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -708,8 +708,13 @@ self: super: {
diagrams-postscript = doJailbreak super.diagrams-postscript; diagrams-postscript = doJailbreak super.diagrams-postscript;
diagrams-svg = doJailbreak super.diagrams-svg; diagrams-svg = doJailbreak super.diagrams-svg;
diagrams-contrib = doJailbreak super.diagrams-contrib; diagrams-contrib = doJailbreak super.diagrams-contrib;
# https://github.com/diagrams/diagrams-lib/issues/288 # apply patch from master to add compat with optparse-applicative >= 0.16
diagrams-lib = doJailbreak (overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; })); diagrams-lib = doJailbreak (appendPatch super.diagrams-lib
(pkgs.fetchpatch {
url = "https://github.com/diagrams/diagrams-lib/commit/4b9842c3e3d653be69af19778970337775e2404d.patch";
sha256 = "0xqvzh3ip9i0nv8xnh41afxki64r259pxq8ir1a4v99ggnldpjaa";
includes = [ "*/CmdLine.hs" ];
}));
# https://github.com/danidiaz/streaming-eversion/issues/1 # https://github.com/danidiaz/streaming-eversion/issues/1
streaming-eversion = dontCheck super.streaming-eversion; streaming-eversion = dontCheck super.streaming-eversion;