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

Merge branch 'httpStreamsFix' of github.com:aycanirican/nixpkgs into httpStreamsFix 

Conflicts:
	pkgs/development/haskell-modules/configuration-common.nix
This commit is contained in:
Aycan iRiCAN 2015-02-17 15:28:33 +02:00
parent 2d54eb7693 c723352d77
commit 60cbac103e
1 changed files with 3 additions and 0 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,6 +475,7 @@ self: super: {
doHaddock = false; doHaddock = false;
}); });
<<<<<<< HEAD
# This packages compiles 4+ hours on a fast machine. That's just unreasonable. # This packages compiles 4+ hours on a fast machine. That's just unreasonable.
CHXHtml = dontDistribute super.CHXHtml; CHXHtml = dontDistribute super.CHXHtml;
@ -521,6 +522,8 @@ self: super: {
# https://github.com/osa1/language-lua/issues/14 # https://github.com/osa1/language-lua/issues/14
language-lua = dontCheck super.language-lua; language-lua = dontCheck super.language-lua;
=======
>>>>>>> c723352d7741f5b348be652b35e8c2f1a1908c22
# https://github.com/afcowie/http-streams/issues/80 # https://github.com/afcowie/http-streams/issues/80
http-streams = dontCheck super.http-streams; http-streams = dontCheck super.http-streams;