From 059c2312be70ce5734ffa7c4bf3f1973a8d25236 Mon Sep 17 00:00:00 2001 From: Domen Kožar Date: Wed, 25 Jul 2018 15:17:39 +0100 Subject: haskell: move yaml overrides to configuration-nix --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- pkgs/development/haskell-modules/configuration-nix.nix | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/development/haskell-modules') diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b1e2a3da3fd5..1ec0adafef8f 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 3e4b18d86b92..a6cfef6f45f6 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 ]; -- cgit 1.4.1