diff options
author | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-03-24 00:30:19 +0100 |
---|---|---|
committer | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-03-24 00:31:17 +0100 |
commit | fe0bdf4d0178bf7420c417a3aae44b369feec6e5 (patch) | |
tree | 3fd48f3662c9de034ba30345bf93da588f5c3ee1 /pkgs/development/haskell-modules/configuration-common.nix | |
parent | bbf13dd11130901e81e0fff043243b938ee000eb (diff) | |
download | nixpkgs-fe0bdf4d0178bf7420c417a3aae44b369feec6e5.tar nixpkgs-fe0bdf4d0178bf7420c417a3aae44b369feec6e5.tar.gz nixpkgs-fe0bdf4d0178bf7420c417a3aae44b369feec6e5.tar.bz2 nixpkgs-fe0bdf4d0178bf7420c417a3aae44b369feec6e5.tar.lz nixpkgs-fe0bdf4d0178bf7420c417a3aae44b369feec6e5.tar.xz nixpkgs-fe0bdf4d0178bf7420c417a3aae44b369feec6e5.tar.zst nixpkgs-fe0bdf4d0178bf7420c417a3aae44b369feec6e5.zip |
haskellPackages.diagrams-lib: unbreak
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.
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index de9be860595..fc0c992b43b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -708,8 +708,13 @@ self: super: { diagrams-postscript = doJailbreak super.diagrams-postscript; diagrams-svg = doJailbreak super.diagrams-svg; diagrams-contrib = doJailbreak super.diagrams-contrib; - # https://github.com/diagrams/diagrams-lib/issues/288 - diagrams-lib = doJailbreak (overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; })); + # apply patch from master to add compat with optparse-applicative >= 0.16 + 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 streaming-eversion = dontCheck super.streaming-eversion; |