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

haskell: move yaml overrides to configuration-nix

Browse Source
This commit is contained in:
Domen Kožar 2018-07-25 15:17:39 +01:00
parent 8fb92a733e
commit 059c2312be
No known key found for this signature in database
GPG Key ID: C2FFBCAFD2C24246
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -829,9 +829,6 @@ self: super: {
# https://github.com/fizruk/http-api-data/issues/49 # https://github.com/fizruk/http-api-data/issues/49
http-api-data = dontCheck super.http-api-data; http-api-data = dontCheck super.http-api-data;
# https://github.com/snoyberg/yaml/issues/106
yaml = disableCabalFlag super.yaml "system-libyaml";
# https://github.com/diagrams/diagrams-lib/issues/288 # https://github.com/diagrams/diagrams-lib/issues/288
diagrams-lib = overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; }); diagrams-lib = overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; });

3
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -309,6 +309,9 @@ self: super: builtins.intersectAttrs super {
# https://github.com/bos/pcap/issues/5 # https://github.com/bos/pcap/issues/5
pcap = addExtraLibrary super.pcap pkgs.libpcap; pcap = addExtraLibrary super.pcap pkgs.libpcap;
# https://github.com/snoyberg/yaml/issues/106
yaml = disableCabalFlag super.yaml "system-libyaml";
# The cabal files for these libraries do not list the required system dependencies. # The cabal files for these libraries do not list the required system dependencies.
miniball = overrideCabal super.miniball (drv: { miniball = overrideCabal super.miniball (drv: {
librarySystemDepends = [ pkgs.miniball ]; librarySystemDepends = [ pkgs.miniball ];