diff options
| author | Domen Kožar <domen@dev.si> | 2018-07-25 15:17:39 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2018-07-25 15:17:56 +0100 |
| commit | 059c2312be70ce5734ffa7c4bf3f1973a8d25236 (patch) | |
| tree | 530a3caa3b9564a49454b8efd31d62546e1238e4 /pkgs/development/haskell-modules | |
| parent | 8fb92a733e447fdc785bb43061d6f3ef3110a32b (diff) | |
| download | nixpkgs-059c2312be70ce5734ffa7c4bf3f1973a8d25236.tar nixpkgs-059c2312be70ce5734ffa7c4bf3f1973a8d25236.tar.gz nixpkgs-059c2312be70ce5734ffa7c4bf3f1973a8d25236.tar.bz2 nixpkgs-059c2312be70ce5734ffa7c4bf3f1973a8d25236.tar.lz nixpkgs-059c2312be70ce5734ffa7c4bf3f1973a8d25236.tar.xz nixpkgs-059c2312be70ce5734ffa7c4bf3f1973a8d25236.tar.zst nixpkgs-059c2312be70ce5734ffa7c4bf3f1973a8d25236.zip | |
haskell: move yaml overrides to configuration-nix
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b1e2a3da3fd..1ec0adafef8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -829,9 +829,6 @@ self: super: { # https://github.com/fizruk/http-api-data/issues/49 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 diagrams-lib = overrideCabal super.diagrams-lib (drv: { doCheck = !pkgs.stdenv.isi686; }); diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 3e4b18d86b9..a6cfef6f45f 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -309,6 +309,9 @@ self: super: builtins.intersectAttrs super { # https://github.com/bos/pcap/issues/5 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. miniball = overrideCabal super.miniball (drv: { librarySystemDepends = [ pkgs.miniball ]; |