From 4c10f6fe2d6438b4d292a9e8735a957a0b7b871e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 25 Jul 2018 15:17:39 +0100 Subject: [PATCH] haskell: move yaml overrides to configuration-nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 059c2312be70ce5734ffa7c4bf3f1973a8d25236) Signed-off-by: Domen Kožar --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 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 ff177c8901f82f..253e16dd7c8532 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -767,9 +767,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 199b9c1765425a..fab79fac5f9d8d 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -298,6 +298,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 ];