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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Thomas Tuegel
2015-06-25 09:15:05 -05:00
parent 3dd96b1a2c 99d20189b8
commit a8c52d0958
117 changed files with 13095 additions and 14673 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/haskell-modules/configuration-common.nix
+7 -5
View File
@@ -27,7 +27,6 @@ self: super: {
# Doesn't compile with lua 5.2.
hslua = super.hslua.override { lua = pkgs.lua5_1; };
hslua_0_4_0 = super.hslua_0_4_0.override { lua = pkgs.lua5_1; };
# Use the default version of mysql to build this package (which is actually mariadb).
mysql = super.mysql.override { mysql = pkgs.mysql.lib; };
@@ -810,7 +809,8 @@ self: super: {
HGamer3D-Data = markBroken super.HGamer3D-Data;
# https://github.com/ndmitchell/shake/issues/206
shake = overrideCabal super.shake (drv: { doCheck = !pkgs.stdenv.isDarwin; });
# https://github.com/ndmitchell/shake/issues/267
shake = overrideCabal super.shake (drv: { doCheck = !pkgs.stdenv.isDarwin && false; });
# https://github.com/nushio3/doctest-prop/issues/1
doctest-prop = dontCheck super.doctest-prop;
@@ -824,6 +824,7 @@ self: super: {
hipe = dontDistribute super.hipe;
singleton-nats = dontDistribute super.singleton-nats;
singletons = markBroken super.singletons;
units-attoparsec = dontDistribute super.units-attoparsec;
# https://github.com/anton-k/temporal-music-notation/issues/1
temporal-music-notation = markBroken super.temporal-music-notation;
@@ -836,9 +837,6 @@ self: super: {
# https://github.com/bos/aeson/issues/253
aeson = dontCheck super.aeson;
# GNUTLS 3.4 causes linker errors: http://hydra.cryp.to/build/839563/nixlog/2/raw
gnutls = super.gnutls.override { gnutls = pkgs.gnutls33; };
# Won't compile with recent versions of QuickCheck.
testpack = markBroken super.testpack;
MissingH = dontCheck super.MissingH;
@@ -899,4 +897,8 @@ self: super: {
wai-session = markBroken super.wai-session;
serversession-frontend-wai = dontDistribute super.serversession-frontend-wai;
# https://github.com/commercialhaskell/stack/issues/408
# https://github.com/commercialhaskell/stack/issues/409
stack = overrideCabal super.stack (drv: { preCheck = "export HOME=$TMPDIR"; doCheck = false; });
}