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:
Eric Seidel
2015-04-06 18:58:08 -07:00
parent 04e39bdb5c 812d8f9fa6
commit 6ec373d776
430 changed files with 8926 additions and 4887 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/haskell-modules/configuration-common.nix
+85 -23
View File
@@ -26,16 +26,13 @@ self: super: {
hslua = super.hslua.override { lua = pkgs.lua5_1; };
# Use the default version of mysql to build this package (which is actually mariadb).
mysql = super.mysql.override { inherit (pkgs) mysql; };
mysql = super.mysql.override { mysql = pkgs.mysql.lib; };
# Please also remove optparse-applicative special case from
# cabal2nix/hackage2nix.hs when removing the following.
elm-make = super.elm-make.override { optparse-applicative = self.optparse-applicative_0_10_0; };
elm-package = super.elm-package.override { optparse-applicative = self.optparse-applicative_0_10_0; };
# https://github.com/acid-state/safecopy/issues/17
safecopy = dontCheck super.safecopy;
# Link the proper version.
zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; };
@@ -65,7 +62,25 @@ self: super: {
al = appendConfigureFlag super.al "--extra-include-dirs=${pkgs.openal}/include/AL";
# Depends on code distributed under a non-free license.
accelerate-cublas = dontDistribute super.accelerate-cublas;
accelerate-cuda = dontDistribute super.accelerate-cuda;
accelerate-cufft = dontDistribute super.accelerate-cufft;
accelerate-examples = dontDistribute super.accelerate-examples;
accelerate-fft = dontDistribute super.accelerate-fft;
accelerate-fourier-benchmark = dontDistribute super.accelerate-fourier-benchmark;
AttoJson = markBroken super.AttoJson;
bindings-yices = dontDistribute super.bindings-yices;
cublas = dontDistribute super.cublas;
cufft = dontDistribute super.cufft;
gloss-accelerate = dontDistribute super.gloss-accelerate;
gloss-raster-accelerate = dontDistribute super.gloss-raster-accelerate;
GoogleTranslate = dontDistribute super.GoogleTranslate;
GoogleDirections = dontDistribute super.GoogleDirections;
libnvvm = dontDistribute super.libnvvm;
manatee-all = dontDistribute super.manatee-all;
manatee-ircclient = dontDistribute super.manatee-ircclient;
Obsidian = dontDistribute super.Obsidian;
patch-image = dontDistribute super.patch-image;
yices = dontDistribute super.yices;
yices-easy = dontDistribute super.yices-easy;
yices-painless = dontDistribute super.yices-painless;
@@ -97,8 +112,10 @@ self: super: {
# Cannot compile its own test suite: https://github.com/haskell/network-uri/issues/10.
network-uri = dontCheck super.network-uri;
# Agda-2.4.2.2 needs these overrides to compile.
Agda = super.Agda.override { equivalence = self.equivalence_0_2_5; cpphs = self.cpphs_1_18_9; };
# The Haddock phase fails for one reason or another.
Agda = dontHaddock super.Agda;
attoparsec-conduit = dontHaddock super.attoparsec-conduit;
blaze-builder-conduit = dontHaddock super.blaze-builder-conduit;
bytestring-progress = dontHaddock super.bytestring-progress;
@@ -170,15 +187,16 @@ self: super: {
'';
});
# Does not compile: <http://hydra.cryp.to/build/469842/nixlog/1/raw>.
base_4_7_0_2 = markBroken super.base_4_7_0_2;
# Does not compile: "fatal error: ieee-flpt.h: No such file or directory"
base_4_8_0_0 = markBroken super.base_4_8_0_0;
# Obsolete: https://github.com/massysett/prednote/issues/1.
prednote-test = markBrokenVersion "0.26.0.4" super.prednote-test;
# Doesn't compile: <http://hydra.cryp.to/build/465891/nixlog/1/raw>.
integer-gmp_0_5_1_0 = markBroken super.integer-gmp_0_5_1_0;
# Doesn't compile: "Setup: can't find include file ghc-gmp.h"
integer-gmp_1_0_0_0 = markBroken super.integer-gmp_1_0_0_0;
# Obsolete.
lushtags = markBrokenVersion "0.0.1" super.lushtags;
# https://github.com/haskell/bytestring/issues/41
@@ -197,6 +215,13 @@ self: super: {
glib = addBuildDepends super.glib [pkgs.pkgconfig pkgs.glib];
gtk3 = super.gtk3.override { inherit (pkgs) gtk3; };
gtk = addBuildDepends super.gtk [pkgs.pkgconfig pkgs.gtk];
gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; };
# Need WebkitGTK, not just webkit.
webkit = super.webkit.override { webkit = pkgs.webkitgtk24x; };
webkitgtk3 = super.webkitgtk3.override { webkit = pkgs.webkitgtk24x; };
webkitgtk3-javascriptcore = super.webkitgtk3-javascriptcore.override { webkit = pkgs.webkitgtk24x; };
websnap = super.websnap.override { webkit = pkgs.webkitgtk24x; };
# https://github.com/jgm/zip-archive/issues/21
zip-archive = addBuildTool super.zip-archive pkgs.zip;
@@ -237,6 +262,7 @@ self: super: {
hakyll = dontCheck super.hakyll;
Hclip = dontCheck super.Hclip;
HList = dontCheck super.HList;
marquise = dontCheck super.marquise; # https://github.com/anchor/marquise/issues/69
memcached-binary = dontCheck super.memcached-binary;
persistent-zookeeper = dontCheck super.persistent-zookeeper;
pocket-dns = dontCheck super.pocket-dns;
@@ -430,15 +456,26 @@ self: super: {
# https://github.com/bos/snappy/issues/1
snappy = dontCheck super.snappy;
# Needs llvm to compile.
bytestring-arbitrary = addBuildTool super.bytestring-arbitrary self.llvm;
# Expect to find sendmail(1) in $PATH.
mime-mail = appendConfigureFlag super.mime-mail "--ghc-option=-DMIME_MAIL_SENDMAIL_PATH=\"sendmail\"";
# Help the test suite find system timezone data.
tz = overrideCabal super.tz (drv: { preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; });
# Deprecated upstream and doesn't compile.
BASIC = dontDistribute super.BASIC;
bytestring-arbitrary = dontDistribute (addBuildTool super.bytestring-arbitrary self.llvm);
llvm = dontDistribute super.llvm;
llvm-base = markBroken super.llvm-base;
llvm-base-util = dontDistribute super.llvm-base-util;
llvm-extra = dontDistribute super.llvm-extra;
llvm-tf = dontDistribute super.llvm-tf;
objectid = dontDistribute super.objectid;
saltine-quickcheck = dontDistribute super.saltine-quickcheck;
stable-tree = dontDistribute super.stable-tree;
synthesizer-llvm = dontDistribute super.synthesizer-llvm;
optimal-blocks = dontDistribute super.optimal-blocks;
# https://ghc.haskell.org/trac/ghc/ticket/9625
vty = dontCheck super.vty;
@@ -577,6 +614,8 @@ self: super: {
# Build fails, but there seems to be no issue tracker available. :-(
hmidi = markBrokenVersion "0.2.1.0" super.hmidi;
padKONTROL = markBroken super.padKONTROL;
Bang = dontDistribute super.Bang;
launchpad-control = dontDistribute super.launchpad-control;
# Upstream provides no issue tracker and no contact details.
vivid = markBroken super.vivid;
@@ -584,6 +623,12 @@ self: super: {
# Test suite wants to connect to $DISPLAY.
hsqml = dontCheck (super.hsqml.override { qt5 = pkgs.qt53; });
# https://github.com/lookunder/RedmineHs/issues/4
Redmine = markBroken super.Redmine;
# HsColour: Language/Unlambda.hs: hGetContents: invalid argument (invalid byte sequence)
unlambda = dontHyperlinkSource super.unlambda;
# https://github.com/megantti/rtorrent-rpc/issues/1
rtorrent-rpc = markBroken super.rtorrent-rpc;
@@ -596,6 +641,9 @@ self: super: {
# https://github.com/junjihashimoto/test-sandbox-compose/issues/2
test-sandbox-compose = dontCheck super.test-sandbox-compose;
# https://github.com/jgm/pandoc/issues/2045
pandoc = dontCheck super.pandoc;
# Broken by GLUT update.
Monadius = markBroken super.Monadius;
@@ -603,10 +651,6 @@ self: super: {
haroonga = markBroken super.haroonga;
haroonga-httpd = markBroken super.haroonga-httpd;
# Cannot find pkg-config data for "webkit-1.0".
webkit = markBroken super.webkit;
websnap = markBroken super.websnap;
# Build is broken and no contact info available.
hopenpgp-tools = markBroken super.hopenpgp-tools;
@@ -629,6 +673,7 @@ self: super: {
# https://github.com/meteficha/Hipmunk/issues/8
Hipmunk = markBroken super.Hipmunk;
HipmunkPlayground = dontDistribute super.HipmunkPlayground;
click-clack = dontDistribute super.click-clack;
# https://github.com/prowdsponsor/esqueleto/issues/93
esqueleto = dontCheck super.esqueleto;
@@ -639,11 +684,6 @@ self: super: {
# https://github.com/fumieval/audiovisual/issues/1
audiovisual = markBroken super.audiovisual;
# https://github.com/cdupont/Nomyx/issues/85
Nomyx-Core = markBroken super.Nomyx-Core;
Nomyx-Web = dontDistribute super.Nomyx-Web;
Nomyx = dontDistribute super.Nomyx;
# https://github.com/alephcloud/hs-stm-queue-extras/issues/2
stm-queue-extras = overrideCabal super.stm-queue-extras (drv: { editedCabalFile = null; });
@@ -652,6 +692,28 @@ self: super: {
postUnpack = "rm -v ${drv.pname}-${drv.version}/Setup.hs";
});
# https://github.com/haskell/haddock/issues/378
haddock-library = dontCheck super.haddock-library;
# Already fixed in upstream darcs repo.
xmonad-contrib = overrideCabal super.xmonad-contrib (drv: {
patchPhase = ''
sed -i -e '24iimport Control.Applicative' XMonad/Util/Invisible.hs
sed -i -e '22iimport Control.Applicative' XMonad/Hooks/DebugEvents.hs
'';
});
# https://github.com/anton-k/csound-expression-dynamic/issues/1
csound-expression-dynamic = dontHaddock super.csound-expression-dynamic;
# Hardcoded include path
poppler = overrideCabal super.poppler (drv: {
patchPhase = ''
sed -i -e 's,glib/poppler.h,poppler.h,' poppler.cabal
sed -i -e 's,glib/poppler.h,poppler.h,' Graphics/UI/Gtk/Poppler/Structs.hsc
'';
});
} // {
# Not on Hackage.
@@ -660,8 +722,8 @@ self: super: {
version = "20150318";
src = pkgs.fetchgit {
url = "http://github.com/NixOS/cabal2nix.git";
rev = "d131b2b2db1bc37a10bbc40c3adea3f006633a5e";
sha256 = "0s92mdkgjqkqby6b1lrxs5dh9ja49sj5jpdc56g5v8g03h3g9m0a";
rev = "b56cc6de2c4900fb0d1dc3617591a2f536aca60d";
sha256 = "0pza9j3x1mfjqrzcqq6ndg0jiqx85mg0sw8n9fmq18fk5g4hzhis";
deepClone = true;
};
isLibrary = false;