From 519c696bcf51a4ed3163b214d6bc54d128e342c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 17 Feb 2015 14:35:25 +0100 Subject: [PATCH] haskell-configuration-common.nix: fix evaluation --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fadb1c24c53..eeee4998c31 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -475,7 +475,6 @@ self: super: { doHaddock = false; }); -<<<<<<< HEAD # This packages compiles 4+ hours on a fast machine. That's just unreasonable. CHXHtml = dontDistribute super.CHXHtml; @@ -522,8 +521,6 @@ self: super: { # https://github.com/osa1/language-lua/issues/14 language-lua = dontCheck super.language-lua; -======= ->>>>>>> c723352d7741f5b348be652b35e8c2f1a1908c22 # https://github.com/afcowie/http-streams/issues/80 http-streams = dontCheck super.http-streams;