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

Merge remote-tracking branch 'origin/master' into stdenv-updates

Browse Source
This commit is contained in:
Eelco Dolstra
2013-02-15 13:36:34 +01:00
parent f9e75352cf 1a52c7659d
commit 2aa6f262cb
302 changed files with 14276 additions and 4226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/gcc/4.6/default.nix
View File

@@ -278,7 +278,7 @@ stdenv.mkDerivation ({
[ "--with-host-libstdcxx=-lstdc++ -lgcc_s" ];
configureFlags = "
${if enableMultilib then "" else "--disable-multilib"}
${if enableMultilib then "--disable-libquadmath" else "--disable-multilib"}
${if enableShared then "" else "--disable-shared"}
${if enablePlugin then "--enable-plugin" else ""}
${if ppl != null then "--with-ppl=${ppl}" else ""}

46
pkgs/development/compilers/ghc/7.6.2.nix Normal file
View File

@@ -0,0 +1,46 @@
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
stdenv.mkDerivation rec {
version = "7.6.2";
name = "ghc-${version}";
src = fetchurl {
url = "http://haskell.org/ghc/dist/${version}/${name}-src.tar.bz2";
sha256 = "d5f45184abeacf7e9c6b4f63c7101a5c1d7b4fe9007901159e2287ecf38de533";
};
buildInputs = [ ghc perl gmp ncurses ];
enableParallelBuilding = true;
buildMK = ''
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
'';
preConfigure = ''
echo "${buildMK}" > mk/build.mk
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'';
configureFlags = [
"--with-gcc=${stdenv.gcc}/bin/gcc"
];
# required, because otherwise all symbols from HSffi.o are stripped, and
# that in turn causes GHCi to abort
stripDebugFlags=["-S" "--keep-file-symbols"];
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = [
stdenv.lib.maintainers.marcweber
stdenv.lib.maintainers.andres
stdenv.lib.maintainers.simons
];
platforms = ghc.meta.platforms;
};
}

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

@@ -1,12 +1,12 @@
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }:
stdenv.mkDerivation rec {
version = "7.7.20121106";
version = "7.7.20121213";
name = "ghc-${version}";
src = fetchurl {
url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";
sha256 = "1n3xj8arkzfvs3q1ymxsnbzs23ndsp8pl67sqirl837pkgcmq263";
sha256 = "0z9ld6271jzv3mx02vqaakirj79pm2vzxnv5a178r6v874qbzx3p";
};
buildInputs = [ ghc perl gmp ncurses ];

7
pkgs/development/compilers/ghc/with-packages.nix
View File

@@ -64,6 +64,13 @@ stdenv.mkDerivation rec {
ln -s $f $out/etc/bash_completion.d/
echo -n .
done
for s in 1 2 3 4 5 6 7 8 9; do
for f in "$currentPath/share/man/man$s/"*; do
mkdir -p $out/share/man/man$s
ln -sv $f $out/share/man/man$s/
echo -n .
done
done
for f in "$currentPkgDir/"*.conf; do
ln -s $f $linkedPkgDir
echo -n .

14
pkgs/development/compilers/gwt/2.4.0.nix
View File

@@ -1,12 +1,14 @@
{stdenv, fetchurl, unzip}:
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation {
name = "gwt-java-2.4.0";
src = fetchurl {
url=http://google-web-toolkit.googlecode.com/files/gwt-2.4.0.zip;
sha1 = "a91ac20db0ddd5994ac3cbfb0e8061d5bbf66f88";
src = fetchurl {
url=http://google-web-toolkit.googlecode.com/files/gwt-2.4.0.zip;
sha1 = "a91ac20db0ddd5994ac3cbfb0e8061d5bbf66f88";
};
buildInputs = [unzip];
buildInputs = [ unzip ];
installPhase = ''
ensureDir $out
@@ -18,4 +20,4 @@ stdenv.mkDerivation {
homepage = http://code.google.com/webtoolkit/;
description = "Google Web Toolkit (GWT) is a development toolkit for building and optimizing complex browser-based applications.";
};
}
}

31
pkgs/development/compilers/gwt/builder.sh
View File

@@ -1,31 +0,0 @@
source $stdenv/setup
tar xfvj $src
mkdir -p $out
cp -av $name $out
# Create wrapper scripts so that the GWT compiler/host work
libPath="$libstdcpp5/lib:$glib/lib:$gtk/lib:$atk/lib:$pango/lib:$libX11/lib:$libXt/lib:$out/$name/mozilla-1.7.12"
mkdir -p $out/bin
cat > $out/bin/gwt-compile <<EOF
#!/bin/sh
export LD_LIBRARY_PATH=$libPath
export LIBXCB_ALLOW_SLOPPY_LOCK=1 # Workaround for bug in Java AWT implementation
$jdk/bin/java -Xmx256m -cp "\$CLASSPATH:$out/$name/gwt-user.jar:$out/$name/gwt-dev-linux.jar" com.google.gwt.dev.Compiler \$@
EOF
chmod 755 $out/bin/gwt-compile
cat > $out/bin/gwt-shell <<EOF
#!/bin/sh
export LD_LIBRARY_PATH=$libPath
export LIBXCB_ALLOW_SLOPPY_LOCK=1 # Workaround for bug in Java AWT implementation
$jdk/bin/java -Xmx256m -cp "\$CLASSPATH:$out/$name/gwt-user.jar:$out/$name/gwt-dev-linux.jar" com.google.gwt.dev.GWTShell \$@
EOF
chmod 755 $out/bin/gwt-shell

14
pkgs/development/compilers/gwt/default.nix
View File

@@ -1,14 +0,0 @@
{stdenv, fetchurl, glib, gtk, pango, atk, libX11, libXt, libstdcpp5, jdk}:
stdenv.mkDerivation {
name = "gwt-linux-1.7.1";
builder = ./builder.sh;
src = fetchurl {
url = http://google-web-toolkit.googlecode.com/files/gwt-linux-1.7.1.tar.bz2;
sha256 = "0lgirr9lr0qsfvw61hqzracdllqklb4qkzbk5x3lc4r64mms5b3g";
};
inherit glib gtk pango atk libX11 libXt libstdcpp5 jdk;
buildInputs = [glib gtk pango atk libX11 libXt libstdcpp5];
}

26
pkgs/development/compilers/julia/default.nix
View File

@@ -1,14 +1,14 @@
{ stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib
, readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl
, ncurses, libunistring, lighttpd, patchelf, openblas, liblapack
, tcl, tk, xproto, libX11
, tcl, tk, xproto, libX11, git
} :
let
realGcc = stdenv.gcc.gcc;
in
stdenv.mkDerivation rec {
pname = "julia";
date = "20121209";
date = "20130205";
name = "${pname}-git-${date}";
grisu_ver = "1.1.1";
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
clp_ver = "1.14.5";
lighttpd_ver = "1.4.29";
patchelf_ver = "0.6";
pcre_ver = "8.31";
grisu_src = fetchurl {
url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz";
@@ -57,16 +58,20 @@ stdenv.mkDerivation rec {
url = "http://hydra.nixos.org/build/1524660/download/2/patchelf-${patchelf_ver}.tar.bz2";
sha256 = "00bw29vdsscsili65wcb5ay0gvg1w0ljd00sb5xc6br8bylpyzpw";
};
pcre_src = fetchurl {
url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${pcre_ver}.tar.bz2";
sha256 = "0g4c0z4h30v8g8qg02zcbv7n67j5kz0ri9cfhgkpwg276ljs0y2p";
};
src = fetchgit {
url = "git://github.com/JuliaLang/julia.git";
rev = "27b950f62aeb3664ab76e5d827b30b4885a9efb9";
sha256 = "0khx8ln2zq3vpj0g66hnsdhw04hxl79fq43rc06ggsmc1j4xrifb";
rev = "efc696bf74eec7605b4da19f6f1605ba99959ed3";
sha256 = "19if7aj3mrp84dg9g2d3zbhasrq0nz28djl9a01m0y4y9bfymp7s";
};
buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib
fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf
openblas liblapack tcl tk xproto libX11
openblas liblapack tcl tk xproto libX11 git
];
configurePhase = ''
@@ -79,7 +84,7 @@ stdenv.mkDerivation rec {
cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')"
}
for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${clp_src}" "${patchelf_src}" ; do
for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${clp_src}" "${patchelf_src}" "${pcre_src}" ; do
copy_kill_hash "$i" deps
done
copy_kill_hash "${dsfmt_src}" deps/random
@@ -105,18 +110,9 @@ stdenv.mkDerivation rec {
preBuild = ''
mkdir -p usr/lib
ln -s libuv.a usr/lib/uv.a
'';
preInstall = ''
make -C deps install-tk-wrapper
'';
postInstall = ''
(
cd $out/share/julia/test/
$out/bin/julia runtests.jl all
) || true
'';
meta = {

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

@@ -1,4 +1,4 @@
{stdenv, fetchurl, libtool, gcc, patches ? []}:
{ stdenv, fetchurl, libtool, gcc, patches ? []}:
stdenv.mkDerivation {
name = "opencxx-2.8";

14
pkgs/development/compilers/strategoxt/0.18.nix
View File

@@ -4,20 +4,6 @@ rec {
inherit aterm;
atermStatic = stdenv.mkDerivation ( rec {
name = "${aterm.name}-static";
configureFlags = "--enable-shared=no --enable-static=yes";
inherit (aterm) src meta patches;
} // ( if stdenv.system == "i686-cygwin" then { inherit (sdf) CFLAGS; } else {} ) ) ;
sdfStatic = stdenv.mkDerivation ( rec {
name = "${sdf.name}-static";
configureFlags = "--enable-shared=no --enable-static=yes";
inherit (sdf) src buildInputs preConfigure meta;
} // ( if stdenv.system == "i686-cygwin" then { inherit (sdf) CFLAGS; } else {} ) ) ;
sdf = stdenv.mkDerivation ( rec {
name = "sdf2-bundle-2.4";