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

haskell-configuration-common.nix: fix evaluation

Browse Source
This commit is contained in:
Peter Simons 2015-02-17 14:35:25 +01:00
parent ae5e377eb3
commit 519c696bcf
1 changed files with 0 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

@ -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;