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

26
pkgs/development/compilers/agda/stdlib.nix
View File

@@ -1,26 +0,0 @@
{ stdenv, agda, fetchurl, ghc, filemanip }:
agda.mkDerivation (self: rec {
version = "0.9";
name = "Agda-stdlib-${version}";
src = fetchurl {
url = "https://github.com/agda/agda-stdlib/archive/v${version}.tar.gz";
sha256 = "05rpmd2xra8wygq33mahdmijcjwq132l1akqyzj66n13frw4hfwj";
};
buildInputs = [ filemanip ghc ];
preConfigure = ''
runhaskell GenerateEverything.hs
'';
topSourceDirectories = [ "src" ];
meta = with stdenv.lib; {
homepage = "http://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary";
description = "A standard library for use with the Agda compiler";
license = stdenv.lib.licenses.mit;
platforms = stdenv.lib.platforms.unix;
maintainers = with maintainers; [ jwiegley fuuzetsu ];
};
})

8
pkgs/development/compilers/gcc/4.8/default.nix
View File

@@ -15,10 +15,12 @@
, libelf # optional, for link-time optimizations (LTO)
, cloog ? null, isl ? null # optional, for the Graphite optimization framework.
, zlib ? null, boehmgc ? null
, zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null
, zip ? null, unzip ? null, pkgconfig ? null
, gtk ? null, libart_lgpl ? null
, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null
, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null
, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null
, x11Support ? langJava
, gnatboot ? null
, enableMultilib ? false
, enablePlugin ? true # whether to support user-supplied plug-ins
@@ -91,7 +93,7 @@ let version = "4.8.4";
xproto renderproto xextproto inputproto randrproto
];
javaAwtGtk = langJava && gtk != null;
javaAwtGtk = langJava && x11Support;
/* Platform flags */
platformFlags = let
@@ -200,7 +202,7 @@ let version = "4.8.4";
in
# We need all these X libraries when building AWT with GTK+.
assert gtk != null -> (filter (x: x == null) xlibs) == [];
assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == [];
stdenv.mkDerivation ({
name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon;

17
pkgs/development/compilers/ghc/7.10.1.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, ghc, perl, gmp, ncurses, libiconv }:
{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv }:
let
@@ -13,6 +13,13 @@ let
''}
'';
# We patch Cabal for GHCJS. See: https://github.com/haskell/cabal/issues/2454
# This should be removed when GHC includes Cabal > 1.22.2.0
cabalPatch = fetchpatch {
url = https://github.com/haskell/cabal/commit/f11b7c858bb25be78b81413c69648c87c446859e.patch;
sha256 = "1z56yyc7lgc78g847qf19f5n1yk054pzlnc2i178dpsj0mgjppyb";
};
in
stdenv.mkDerivation rec {
@@ -28,9 +35,13 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
# We patch Cabal for GHCJS. See: https://github.com/haskell/cabal/issues/2454
postPatch = ''
pushd libraries/Cabal
patch -p1 < ${cabalPatch}
popd
'';
preConfigure = ''
sed -i 's/HcPkg.useSingleFileDb = .*/HcPkg.useSingleFileDb = False/' libraries/Cabal/Cabal/Distribution/Simple/GHCJS.hs
echo >mk/build.mk "${buildMK}"
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''

6
pkgs/development/compilers/ghc/head.nix
View File

@@ -17,14 +17,14 @@ let
in
stdenv.mkDerivation rec {
version = "7.11.20150118";
version = "7.11.20150402";
name = "ghc-${version}";
rev = "6ff3db92140e3ac8cbda50d1a4aab976350ac8c4";
rev = "47f821a1a24553dc29b9581b1a259a9b1394c955";
src = fetchgit {
url = "git://git.haskell.org/ghc.git";
inherit rev;
sha256 = "1a1r3nw7x5rd8563770zcg1phm55vi3sxs2zwr91ik026n8jjba6";
sha256 = "111a2z6bgn966g04a9n2ns9n2a401rd0zqgndznn2w4fv8a4qzgj";
};
postUnpack = ''

55
pkgs/development/compilers/gnu-smalltalk/default.nix Normal file
View File

@@ -0,0 +1,55 @@
{ stdenv, fetchurl, pkgconfig, libtool, zip, libffi, libsigsegv, readline, gmp,
gnutls, gnome, cairo, SDL, sqlite, emacsSupport ? false, emacs ? null }:
assert emacsSupport -> (emacs != null);
let # The gnu-smalltalk project has a dependency to the libsigsegv library.
# The project ships with sources for this library, but deprecated this option.
# Using the vanilla libsigsegv library results in error: "cannot relocate [...]"
# Adding --enable-static=libsigsegv to the gnu-smalltalk configuration flags
# does not help, the error still occurs. The only solution is to build a
# shared version of libsigsegv.
libsigsegv-shared = stdenv.lib.overrideDerivation libsigsegv (oldAttrs: {
configureFlags = [ "--enable-shared" ];
});
in stdenv.mkDerivation rec {
version = "3.2.5";
name = "gnu-smalltalk-${version}";
src = fetchurl {
url = "mirror://gnu/smalltalk/smalltalk-${version}.tar.xz";
sha256 = "1k2ssrapfzhngc7bg1zrnd9n2vyxp9c9m70byvsma6wapbvib6l1";
};
# The dependencies and their justification are explained at
# http://smalltalk.gnu.org/download
buildInputs = [
pkgconfig libtool zip libffi libsigsegv-shared readline gmp gnutls gnome.gtk
cairo SDL sqlite
]
++ stdenv.lib.optional emacsSupport emacs;
configureFlags = stdenv.lib.optional (!emacsSupport) "--without-emacs";
installFlags = stdenv.lib.optional emacsSupport "lispdir=$(out)/share/emacs/site-lisp";
# For some reason the tests fail if executated with nix-build, but pass if
# executed within nix-shell --pure.
doCheck = false;
meta = with stdenv.lib; {
description = "A free implementation of the Smalltalk-80 language";
longDescription = ''
GNU Smalltalk is a free implementation of the Smalltalk-80 language. It
runs on most POSIX compatible operating systems (including GNU/Linux, of
course), as well as under Windows. Smalltalk is a dynamic object-oriented
language, well-versed to scripting tasks.
'';
homepage = http://smalltalk.gnu.org/;
license = with licenses; [ gpl2 lgpl2 ];
platforms = platforms.linux;
maintainers = with maintainers; [ skeidel ];
};
}

2
pkgs/development/compilers/hhvm/default.nix
View File

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
gmp libyaml libedit libvpx imagemagick fribidi
];
enableParallelBuilding = true;
enableParallelBuilding = false;
dontUseCmakeBuildDir = true;
NIX_LDFLAGS = "-lpam -L${pam}/lib";
MYSQL_INCLUDE_DIR="${mariadb}/include/mysql";

1
pkgs/development/compilers/llvm/3.4/dragonegg.nix
View File

@@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
license = stdenv.lib.licenses.gpl2Plus;
maintainers = with stdenv.lib.maintainers; [viric shlevy];
platforms = with stdenv.lib.platforms; linux;
broken = true;
};
}

6
pkgs/development/compilers/mono/default.nix
View File

@@ -6,10 +6,10 @@ let
in
stdenv.mkDerivation rec {
name = "mono-${version}";
version = "3.8.0";
version = "3.12.1";
src = fetchurl {
url = "http://download.mono-project.com/sources/mono/${name}.tar.bz2";
sha256 = "0jraxsjn7ra6z02n4wjpbj21mxm2w50iqviqvfl0ajikbxahvf3i";
sha256 = "03dn68vignknzxy1rx75p16qx1ild27hixgvr5mw0j19mx9z332x";
};
buildInputs = [bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib];
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
homepage = http://mono-project.com/;
description = "Cross platform, open source .NET development framework";
platforms = with stdenv.lib.platforms; linux;
maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice ];
maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice obadz ];
license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ?
};
}

4
pkgs/development/compilers/sbcl/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "sbcl-${version}";
version = "1.2.9";
version = "1.2.10";
src = fetchurl {
url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
sha256 = "0pws10ylnsxj17dagqcdv0l36k3ax5k3hkc6c91n9yxh2nziagk0";
sha256 = "11gn25knjk0zdyi3s6w0blcnrxjgyj4iifg5h07pv2r7hm83s92m";
};
buildInputs = [ which ]

52
pkgs/development/compilers/smlnj/default.nix
View File

@@ -1,29 +1,30 @@
{ stdenv, fetchurl }:
let
version = "110.76";
version = "110.78";
baseurl = "http://smlnj.cs.uchicago.edu/dist/working/${version}";
sources = map fetchurl [
{ url = "${baseurl}/config.tgz"; sha256 = "0mx5gib1jq5hl3j6gvkkfh60x2hx146xiisclaz4jgy452ywikj1"; }
{ url = "${baseurl}/cm.tgz"; sha256 = "14y1pqqw5p5va3rvpk2jddx2gcm37z5hwp5zdm43z02afscq37jk"; }
{ url = "${baseurl}/compiler.tgz"; sha256 = "10gn7cwqzbnh4k3l6brb9hp59k9vz2m9fcaarv2fw1gilfw5a9rj"; }
{ url = "${baseurl}/runtime.tgz"; sha256 = "0zqajizayzrlrxm47q492mqgfxya7rwqrq4faafai8qfwga6q27n"; }
{ url = "${baseurl}/system.tgz"; sha256 = "0dys0f0cdgnivk1niam9g736c3mzrjf9r29051g0579an8yi8slg"; }
{ url = "${baseurl}/MLRISC.tgz"; sha256 = "00n1zk65cwf2kf669mn09lp0ya6bfap1czhyq0nfza409vm4v54x"; }
{ url = "${baseurl}/smlnj-lib.tgz"; sha256 = "1mx1vjxbpfgcq6fkmh2qirjfqzn3wcnjf4a9ijr7k2bwgnh99sc1"; }
{ url = "${baseurl}/ckit.tgz"; sha256 = "1fqdxs2cgzffj0i9rmzv1aljwnhx98hyvj3c2kivw3ligxp4wly4"; }
{ url = "${baseurl}/nlffi.tgz"; sha256 = "08dmvs95xmbas3hx7n0csxxl0d0bmhxg7gav1ay02gy9n8iw3g87"; }
{ url = "${baseurl}/cml.tgz"; sha256 = "1qc1hs2k2xmn03ldyz2zf0pzbryd1n4bwix226ch8z9pnfimglyb"; }
{ url = "${baseurl}/eXene.tgz"; sha256 = "01z69rgmshh694wkcwrzi72z5d5glpijj7mqxb17yz106xyzmgim"; }
{ url = "${baseurl}/ml-lpt.tgz"; sha256 = "13gw4197ivzvd6qcbg5pzclhv1f2jy2c433halh021d60qjv4w4r"; }
{ url = "${baseurl}/ml-lex.tgz"; sha256 = "0sqa533zca1l7p79qhkb7lspvhk4k2r3839745sci32fzwy1804x"; }
{ url = "${baseurl}/ml-yacc.tgz"; sha256 = "1kzi0dpybd9hkklk460mgbwfkixjhav225kkmwnk3jxby3zgflci"; }
{ url = "${baseurl}/ml-burg.tgz"; sha256 = "0kjrba8l0v6jn3g6gv9dvrklpvxx9x57b7czwnrrd33pi28sv7fm"; }
{ url = "${baseurl}/pgraph.tgz"; sha256 = "174n22m7zibgk68033qql86kyk6mxjni4j0kcadafs0g2xmh6i6z"; }
{ url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "1pq4wwx5ad7zx1306ka06lqwnjv446zz6ndpq6s9ak6ha79f2s9p"; }
{ url = "${baseurl}/heap2asm.tgz"; sha256 = "0p91fzwkfr7hng7c026gy5ggl5l9isxpm007iq6ivpjrfjy547wc"; }
{ url = "${baseurl}/smlnj-c.tgz"; sha256 = "0vra4gi91w0cjsw3rm162hgz5xsqbr7yds44q7zhs27kccsirpqc"; }
{ url = "${baseurl}/boot.x86-unix.tgz"; sha256 = "0qcvdhlvpr02c1ssk4jz6175lb9pkdg7zrfscqz6f7crnsgmc5nx"; }
{ url = "${baseurl}/config.tgz"; sha256 = "018c6iflpm3im6679via1wshw2sls4jgiqrc30pqkb80kfrh1pg2"; }
{ url = "${baseurl}/cm.tgz"; sha256 = "0id37j6lj4b3qczn4949gvc8hys9j3h7nk9kc9fxv4rv1g7i328x"; }
{ url = "${baseurl}/compiler.tgz"; sha256 = "1m299lzc8l9mixb2l9scvilz27v16db3igzwca19alsrvldnmpg2"; }
{ url = "${baseurl}/runtime.tgz"; sha256 = "1pwbv1bnh8dz4w62cx19c56z4y57krbpr1ziayyycg7lj44pb7sy"; }
{ url = "${baseurl}/system.tgz"; sha256 = "1jdilm3wcjxcnnbd3g8rcd1f5nsb5ffzfjqcsdcpqd9mnx81fca9"; }
{ url = "${baseurl}/MLRISC.tgz"; sha256 = "0ibqwkkqd4c62p3q1jbgqyh7k78sms01igl7ibk6jyrhy9n7vw0v"; }
{ url = "${baseurl}/smlnj-lib.tgz"; sha256 = "1lxnwp8q3xw0wqqrv3hlk3fjancrfz862fy9j504s38ljhdjc3jr"; }
{ url = "${baseurl}/ckit.tgz"; sha256 = "1nqw40vjxy40ckif5d480g5mf7b91lmwcs7m689gs9n2dj3gbwnp"; }
{ url = "${baseurl}/nlffi.tgz"; sha256 = "1cks1xifb32wya2flw7h7cvcdnkxv7ngk8y7xv29888r7xbdr3h0"; }
{ url = "${baseurl}/cml.tgz"; sha256 = "0qfaj6vsagsnh9di94cxvn77f91zfwsnn95rz8ig5dz5zmq77ghz"; }
{ url = "${baseurl}/eXene.tgz"; sha256 = "1nlkb2y48m702qplxkqphvb9nbj433300j7yrdbsj39j6vvp8pmw"; }
{ url = "${baseurl}/ml-lpt.tgz"; sha256 = "02b2gdl1qdwilhls3ssa04wcyg3aswndn1bh85008rqj85ppddiq"; }
{ url = "${baseurl}/ml-lex.tgz"; sha256 = "0l1sddd5wfpqgmyw1g3iwv2p27fbkpjkm10db2qd2pid9r95dxz5"; }
{ url = "${baseurl}/ml-yacc.tgz"; sha256 = "0ln790ydb43sxbjjymbd6jnnzfygrc0lr50k81p5cazzzy1yfim6"; }
{ url = "${baseurl}/ml-burg.tgz"; sha256 = "03anyy2gdkgfprmahx489hxg9zjh9lydq3gkzrlyw51yzvgp3f92"; }
{ url = "${baseurl}/pgraph.tgz"; sha256 = "19hbcav11a6fv0xmzgin0v5dl4m08msk1vsmw26kpqiqkvkh7j39"; }
{ url = "${baseurl}/trace-debug-profile.tgz"; sha256 = "0awssg3vgj3sp85kdfjcp28zaq815zr55k9z6v79zs9gll02ghlk"; }
{ url = "${baseurl}/heap2asm.tgz"; sha256 = "1vkmxbm6x37l1wqvilvvw662pdvg6mkbvcfvya8ggsihz4c1z0jg"; }
{ url = "${baseurl}/smlnj-c.tgz"; sha256 = "08b8acd5vwhz1gg7960rha00qhwk7l7p01vvgwzmdiqlcd3fcj1d"; }
{ url = "${baseurl}/doc.tgz"; sha256 = "1pbsvc8nmnjwq239wrylb209drr4xv9a66r0fjm126b6nw1slrbq"; }
{ url = "${baseurl}/boot.x86-unix.tgz"; sha256 = "19wd273k4ldnxndq6cqr7xv387ynbviz6jlgxmlld7nxf549kn5a"; }
];
in stdenv.mkDerivation {
name = "smlnj-${version}";
@@ -53,14 +54,17 @@ in stdenv.mkDerivation {
mkdir -pv $out
cp -rv bin lib $out
for i in $out/bin/*; do
cd $out/bin
for i in *; do
sed -i "2iSMLNJ_HOME=$out/" $i
done
'';
meta = {
description = "Standard ML of New Jersey, a compiler";
homepage = http://smlnj.org;
license = stdenv.lib.licenses.bsd3;
homepage = http://smlnj.org;
license = stdenv.lib.licenses.bsd3;
platforms = [ "i686-linux" ];
maintainers = stdenv.lib.maintainers.thoughtpolice;
};
}

15
pkgs/development/compilers/uhc/default.nix
View File

@@ -5,13 +5,13 @@
let wrappedGhc = ghcWithPackages ( self: [hashable mtl network uhc-util uulib] );
in stdenv.mkDerivation rec {
version = "1.1.8.7";
version = "1.1.8.10";
name = "uhc-${version}";
src = fetchgit {
url = "https://github.com/UU-ComputerScience/uhc.git";
rev = "0dec07e9cb60e78bbca63fc101f8fec6e249269f";
sha256 = "0isz3qz23ihbn0rg54x8ddzwpsqlmmpkvaa66b7srfly7nciv8gl";
rev = "449d9578e06af1362d7f746798f0aed57ab6ca88";
sha256 = "0f8abhl9idbc2qlnb7ynrb11yvm3y07vksyzs1yg6snjvlhfj5az";
};
postUnpack = "sourceRoot=\${sourceRoot}/EHC";
@@ -41,6 +41,13 @@ in stdenv.mkDerivation rec {
homepage = "http://www.cs.uu.nl/wiki/UHC";
description = "Utrecht Haskell Compiler";
maintainers = [ maintainers.phausmann ];
platforms = stdenv.lib.platforms.unix;
# UHC i686 support is broken, see
# https://github.com/UU-ComputerScience/uhc/issues/52
#
# Darwin build is broken as well at the moment.
# On Darwin, the GNU libtool is used, which does not
# support the -static flag and thus breaks the build.
platforms = ["x86_64-linux"];
};
}

4
pkgs/development/compilers/urweb/default.nix
View File

@@ -20,10 +20,10 @@ stdenv.mkDerivation rec {
''
export CC="${stdenv.cc}/bin/gcc";
export CCARGS="-I$out/include \
-L${mysql}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib";
-L${mysql.lib}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib";
export PGHEADER="${postgresql}/include/libpq-fe.h";
export MSHEADER="${mysql}/include/mysql/mysql.h";
export MSHEADER="${mysql.lib}/include/mysql/mysql.h";
export SQHEADER="${sqlite}/include/sqlite3.h";
'';