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

Merge recent master into staging

Browse Source 
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
This commit is contained in:
Vladimír Čunát
2014-08-30 10:04:02 +02:00
parent a283bec71c 4e0d2706f1
commit e51f73652d
756 changed files with 18877 additions and 13683 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "ats2-${version}";
version = "0.1.0";
version = "0.1.1";
src = fetchurl {
url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz";
sha256 = "0i7b9v7xki9j2jjjpydz0gl33af94b4jjmk75b9w20bs003v8vd4";
sha256 = "17yr5zc4cr4zlizhzy43ihfcidl63wjxcc002amzahskib4fsbmb";
};
buildInputs = [ gmp ];

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

@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
checkTarget = "test";
meta = {
description = "Bigloo, an efficient Scheme compiler";
description = "Efficient Scheme compiler";
longDescription = ''
Bigloo is a Scheme implementation devoted to one goal: enabling

2
pkgs/development/compilers/cryptol/1.8.x.nix
View File

@@ -1,5 +1,7 @@
{ stdenv, requireFile, gmp4, ncurses, zlib, clang_33, makeWrapper }:
assert stdenv.isLinux;
let
name = "cryptol-${version}-${rev}";
version = "1.8.27";

3
pkgs/development/compilers/cudatoolkit/5.5.nix
View File

@@ -51,8 +51,11 @@ stdenv.mkDerivation rec {
perl ./install-linux.pl --prefix="$out"
rm $out/tools/CUDA_Occupancy_Calculator.xls
perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
mv $out/include $out/usr_include
'';
setupHook = ./setup-hook.sh;
meta = {
license = [ "nonfree" ];
};

3
pkgs/development/compilers/cudatoolkit/6.0.nix
View File

@@ -51,8 +51,11 @@ stdenv.mkDerivation rec {
perl ./install-linux.pl --prefix="$out"
rm $out/tools/CUDA_Occupancy_Calculator.xls
perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
mv $out/include $out/usr_include
'';
setupHook = ./setup-hook.sh;
meta = {
license = [ "nonfree" ];
};

8
pkgs/development/compilers/cudatoolkit/setup-hook.sh Normal file
View File

@@ -0,0 +1,8 @@
addIncludePath () {
if test -d "$1/usr_include"
then
export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE} -I$1/usr_include"
fi
}
envHooks=(${envHooks[@]} addIncludePath)

42
pkgs/development/compilers/emscripten-fastcomp/default.nix Normal file
View File

@@ -0,0 +1,42 @@
{ stdenv, fetchgit, python }:
let
tag = "1.21.0";
in
stdenv.mkDerivation rec {
name = "emscripten-fastcomp-${tag}";
srcFC = fetchgit {
url = git://github.com/kripken/emscripten-fastcomp;
rev = "refs/tags/${tag}";
sha256 = "0mcxzg2cfg0s1vfm3bh1ar4xsddb6xkv1dsdbgnpx38lbj1mvfs1";
};
srcFL = fetchgit {
url = git://github.com/kripken/emscripten-fastcomp-clang;
rev = "refs/tags/${tag}";
sha256 = "0s2jcn36d236cfpryjpgaazjp3cg83d0h78g6kk1j6vdppv3vgnp";
};
buildInputs = [ python ];
buildCommand = ''
cp -as ${srcFC} $TMPDIR/src
chmod +w $TMPDIR/src/tools
cp -as ${srcFL} $TMPDIR/src/tools/clang
chmod +w $TMPDIR/src
mkdir $TMPDIR/src/build
cd $TMPDIR/src/build
../configure --enable-optimized --disable-assertions --enable-targets=host,js
make
cp -a Release/bin $out
'';
meta = with stdenv.lib; {
homepage = https://github.com/kripken/emscripten-fastcomp;
description = "emscripten llvm";
maintainers = with maintainers; [ bosu ];
license = "University of Illinois/NCSA Open Source License";
};
}

40
pkgs/development/compilers/emscripten/default.nix Normal file
View File

@@ -0,0 +1,40 @@
{ stdenv, fetchgit, emscriptenfastcomp, python, nodejs, closurecompiler, jre }:
let
tag = "1.21.0";
in
stdenv.mkDerivation rec {
name = "emscripten-${tag}";
src = fetchgit {
url = git://github.com/kripken/emscripten;
rev = "refs/tags/${tag}";
sha256 = "0y17ab4nhd3521b50sv2i2667w0rlcnmlkpkgw5j3fsh8awxgf32";
};
buildCommand = ''
mkdir $out
cp -a $src $out/bin
chmod -R +w $out/bin
grep -rl '^#!/usr.*python' $out/bin | xargs sed -i -s 's@^#!/usr.*python.*@#!${python}/bin/python@'
sed -i -e "s,EM_CONFIG = '~/.emscripten',EM_CONFIG = '$out/config'," $out/bin/tools/shared.py
sed -i -e 's,^.*did not see a source tree above the LLVM.*$, return True,' $out/bin/tools/shared.py
sed -i -e 's,def check_sanity(force=False):,def check_sanity(force=False):\n return,' $out/bin/tools/shared.py
echo "EMSCRIPTEN_ROOT = '$out/bin'" > $out/config
echo "LLVM_ROOT = '${emscriptenfastcomp}'" >> $out/config
echo "PYTHON = '${python}/bin/python'" >> $out/config
echo "NODE_JS = '${nodejs}/bin/node'" >> $out/config
echo "JS_ENGINES = [NODE_JS]" >> $out/config
echo "COMPILER_ENGINE = NODE_JS" >> $out/config
echo "CLOSURE_COMPILER = '${closurecompiler}/bin/closure-compiler'" >> $out/config
echo "JAVA = '${jre}/bin/java'" >> $out/config
'';
meta = with stdenv.lib; {
homepage = https://github.com/kripken/emscripten;
description = "An LLVM-to-JavaScript Compiler";
maintainers = with maintainers; [ bosu ];
license = with licenses; ncsa;
};
}

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

@@ -18,7 +18,7 @@ rec {
phaseNames = ["doConfigure" "doMakeInstall"];
meta = {
description = "Gambit Scheme to C compiler";
description = "Scheme to C compiler";
maintainers = [
a.lib.maintainers.raskin
];

8
pkgs/development/compilers/go/1.3.nix
View File

@@ -1,5 +1,7 @@
{ stdenv, lib, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc }:
assert stdenv.gcc.gcc != null;
let
loader386 = "${glibc}/lib/ld-linux.so.2";
loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
@@ -7,11 +9,11 @@ let
in
stdenv.mkDerivation {
name = "go-1.3";
name = "go-1.3.1";
src = fetchurl {
url = https://storage.googleapis.com/golang/go1.3.src.tar.gz;
sha256 = "10jkqgzlinzynciw3wr15c7n2vw5q4d2ni65hbs3i61bbdn3x67b";
url = https://storage.googleapis.com/golang/go1.3.1.src.tar.gz;
sha256 = "fdfa148cc12f1e4ea45a5565261bf43d8a2e7d1fad4a16aed592d606223b93a8";
};
buildInputs = [ bison bash makeWrapper ] ++ lib.optionals stdenv.isLinux [ glibc ] ;

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

@@ -47,7 +47,7 @@ composableDerivation.composableDerivation {} {
meta = {
license = "as-is"; # gentoo is calling it this way..
description = "The HUGS 98 Haskell interpreter";
description = "Haskell interpreter";
homepage = http://www.haskell.org/hugs;
};
}

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

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gmp ];
meta = {
description = "Ikarus - a Scheme compiler, aiming at R6RS";
description = "Scheme compiler, aiming at R6RS";
homepage = http://ikarus-scheme.org/;
license = stdenv.lib.licenses.gpl3;
};

157
pkgs/development/compilers/julia/0.3.0.nix Normal file
View File

@@ -0,0 +1,157 @@
{ 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, git, mpfr, which
} :
assert stdenv.isLinux;
let
realGcc = stdenv.gcc.gcc;
in
stdenv.mkDerivation rec {
pname = "julia";
version = "0.3.0";
name = "${pname}-${version}";
dsfmt_ver = "2.2";
grisu_ver = "1.1.1";
openblas_ver = "v0.2.10";
lapack_ver = "3.5.0";
arpack_ver = "3.1.5";
lighttpd_ver = "1.4.29";
patchelf_ver = "0.6";
pcre_ver = "8.31";
utf8proc_ver = "1.1.6";
dsfmt_src = fetchurl {
url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz";
name = "dsfmt-${dsfmt_ver}.tar.gz";
sha256 = "bc3947a9b2253a869fcbab8ff395416cb12958be9dba10793db2cd7e37b26899";
};
grisu_src = fetchurl {
url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz";
sha256 = "e1cabb73fd69e74f145aea91100cde483aef8b79dc730fcda0a34466730d4d1d";
};
openblas_src = fetchurl {
url = "https://github.com/xianyi/OpenBLAS/tarball/${openblas_ver}";
name = "openblas-${openblas_ver}.tar.gz";
sha256 = "06i0q4qnd5q5xljzrgvda0gjsczc6l2pl9hw6dn2qjpw38al73za";
};
arpack_src = fetchurl rec {
url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/arpack-ng_${arpack_ver}.tar.gz";
sha256 = "05fmg4m0yri47rzgsl2mnr1qbzrs7qyd557p3v9wwxxw0rwcwsd2";
};
lapack_src = fetchurl {
url = "http://www.netlib.org/lapack/lapack-${lapack_ver}.tgz";
name = "lapack-${lapack_ver}.tgz";
sha256 = "0lk3f97i9imqascnlf6wr5mjpyxqcdj73pgj97dj2mgvyg9z1n4s";
};
lighttpd_src = fetchurl {
url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${lighttpd_ver}.tar.gz";
sha256 = "ff9f4de3901d03bb285634c5b149191223d17f1c269a16c863bac44238119c85";
};
patchelf_src = fetchurl {
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";
};
utf8proc_src = fetchurl {
url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz";
sha256 = "1rwr84pw92ajjlbcxq0da7yxgg3ijngmrj7vhh2qzsr2h2kqzp7y";
};
src = fetchgit {
url = "git://github.com/JuliaLang/julia.git";
rev = "refs/tags/v0.3.0";
sha256 = "1h7icqjiccw26f81r1zwsv31kk6yhavn038h7jp63iv5sdzh5r8i";
};
buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib
fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf
openblas liblapack tcl tk xproto libX11 git mpfr which
];
configurePhase = ''
for i in GMP LLVM PCRE READLINE FFTW LIBUNWIND SUITESPARSE GLPK LIGHTTPD ZLIB MPFR;
do
makeFlags="$makeFlags USE_SYSTEM_$i=1 "
done
copy_kill_hash(){
cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')"
}
for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${patchelf_src}" \
"${pcre_src}" "${utf8proc_src}" "${lapack_src}" "${openblas_src}"; do
copy_kill_hash "$i" deps
done
${if realGcc ==null then "" else
''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz -lgmp -lmpfr -lblas -lopenblas -L$out/lib"''}
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC "
export LDFLAGS="-L${suitesparse}/lib -L$out/lib/julia -Wl,-rpath,$out/lib/julia"
export GLPK_PREFIX="${glpk}/include"
mkdir -p "$out/lib"
sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile
sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile
export makeFlags="$makeFlags PREFIX=$out SHELL=${stdenv.shell} prefix=$out"
export dontPatchELF=1
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/usr/lib:$PWD/usr/lib/julia"
patchShebangs . contrib
export PATH="$PATH:${stdenv.gcc.libc}/sbin"
# ldconfig doesn't seem to ever work on NixOS; system-wide ldconfig cache
# is probably not what we want anyway on non-NixOS
sed -e "s@/sbin/ldconfig@true@" -i src/ccall.*
ln -s "${openblas}/lib/libopenblas.so" "$out/lib/libblas.so"
'';
preBuild = ''
mkdir -p usr/lib
echo "$out"
mkdir -p "$out/lib"
(
cd "$(mktemp -d)"
for i in "${suitesparse}"/lib/lib*.a; do
ar -x $i
done
gcc *.o --shared -o "$out/lib/libsuitesparse.so"
)
cp "$out/lib/libsuitesparse.so" usr/lib
for i in umfpack cholmod amd camd colamd spqr; do
ln -s libsuitesparse.so "$out"/lib/lib$i.so;
ln -s libsuitesparse.so "usr"/lib/lib$i.so;
done
'';
dontStrip = true;
enableParallelBuilding = true;
postInstall = ''
rm -f "$out"/lib/julia/sys.{so,dylib,dll}
'';
meta = {
description = "High-level performance-oriented dynamical language for technical computing";
homepage = "http://julialang.org/";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.raskin ];
platforms = with stdenv.lib.platforms; linux;
broken = false;
};
}

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

@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "Mercury is a pure logic programming language.";
description = "A pure logic programming language";
longDescription = ''
Mercury is a logic/functional programming language which combines the
clarity and expressiveness of declarative programming with advanced

18
pkgs/development/compilers/mit-scheme/default.nix
View File

@@ -1,7 +1,7 @@
{ fetchurl, stdenv, makeWrapper, gnum4, texinfo, texLive, automake }:
let
version = "9.1.1";
version = "9.2";
bootstrapFromC = ! (stdenv.isi686 || stdenv.isx86_64);
arch = if stdenv.isi686 then "-i386"
@@ -19,14 +19,14 @@ stdenv.mkDerivation {
if stdenv.isi686
then fetchurl {
url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-i386.tar.gz";
sha256 = "0vi760fy550d9db538m0vzbq1mpdncvw9g8bk4lswk0kcdira55z";
sha256 = "1fmlpnhf5a75db93phajh4ysbdgrgl72v45lk3kznriprl0a7jc6";
} else if stdenv.isx86_64
then fetchurl {
url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-x86-64.tar.gz";
sha256 = "1wcxm9hyfc53myvlcn93fyqrnnn4scwkknl9hkbp1cphc6mp291x";
sha256 = "1skzxxhr0iq96bf0j5m7mvf3i4sppfyfa6gpqn34mwgkw1fx8274";
} else fetchurl {
url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-c-${version}.tar.gz";
sha256 = "0pclakzwxbqgy6wqwvs6ml62wgby8ba8xzmwzdwhx1v8wv05yw1j";
sha256 = "0w5ib5vsidihb4hb6fma3sp596ykr8izagm57axvgd6lqzwicsjg";
};
configurePhase =
@@ -65,7 +65,7 @@ stdenv.mkDerivation {
# XXX: The `check' target doesn't exist.
doCheck = false;
meta = {
meta = with stdenv.lib; {
description = "MIT/GNU Scheme, a native code Scheme compiler";
longDescription =
@@ -78,14 +78,12 @@ stdenv.mkDerivation {
homepage = http://www.gnu.org/software/mit-scheme/;
license = stdenv.lib.licenses.gpl2Plus;
license = licenses.gpl2Plus;
maintainers = [ stdenv.lib.maintainers.ludo ];
maintainers = with maintainers; [ ludo ];
# Build fails on Cygwin and Darwin:
# <http://article.gmane.org/gmane.lisp.scheme.mit-scheme.devel/489>.
platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.freebsd;
broken = true;
platforms = platforms.gnu ++ platforms.freebsd;
};
}

2
pkgs/development/compilers/ocaml/3.10.0.nix
View File

@@ -26,7 +26,7 @@ stdenv.mkDerivation (rec {
meta = {
homepage = http://caml.inria.fr/ocaml;
license = "QPL, LGPL2 (library part)";
desctiption = "Most popular variant of the Caml language";
description = "Most popular variant of the Caml language";
};
})

2
pkgs/development/compilers/ocaml/3.11.2.nix
View File

@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://caml.inria.fr/ocaml;
license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
description = "Objective Caml, the most popular variant of the Caml language";
description = "Most popular variant of the Caml language";
longDescription =
'' Objective Caml is the most popular variant of the Caml language.

2
pkgs/development/compilers/ocaml/3.12.1.nix
View File

@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://caml.inria.fr/ocaml;
license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
description = "OCaml, the most popular variant of the Caml language";
description = "Most popular variant of the Caml language";
longDescription =
''

2
pkgs/development/compilers/ocaml/4.00.1.nix
View File

@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://caml.inria.fr/ocaml;
license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
description = "OCaml, the most popular variant of the Caml language";
description = "Most popular variant of the Caml language";
longDescription =
''

2
pkgs/development/compilers/ocaml/4.01.0.nix
View File

@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
meta = {
homepage = http://caml.inria.fr/ocaml;
license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
description = "OCaml, the most popular variant of the Caml language";
description = "Most popular variant of the Caml language";
longDescription =
''

2
pkgs/development/compilers/ocaml/ber-metaocaml-003.nix
View File

@@ -58,6 +58,6 @@ stdenv.mkDerivation rec {
meta = {
homepage = "http://okmij.org/ftp/ML/index.html#ber-metaocaml";
license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ];
description = "a conservative extension of OCaml with the primitive type of code values, and three basic multi-stage expression forms: Brackets, Escape, and Run";
description = "A conservative extension of OCaml with the primitive type of code values, and three basic multi-stage expression forms: Brackets, Escape, and Run";
};
}

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

@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
builder = writeScript (name + "-builder")
(textClosure localDefs [allBuild doForceShare doPropagate]);
meta = {
description = "Qi - next generation on top of Common Lisp";
description = "Functional programming language, built top of Common Lisp";
};
}

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

@@ -20,7 +20,7 @@ stdenv.mkDerivation {
'';
meta = {
description = "rdmd wrapper for D language compiler";
description = "Wrapper for D language compiler";
homepage = http://dlang.org/rdmd.html;
license = lib.licenses.boost;
maintainers = with stdenv.lib.maintainers; [ vlstill ];

2
pkgs/development/compilers/rustc/0.11.nix
View File

@@ -1,5 +1,7 @@
{stdenv, fetchurl, which, file, perl, curl, python27, makeWrapper}:
assert stdenv.gcc.gcc != null;
/* Rust's build process has a few quirks :
- It requires some patched in llvm that haven't landed upstream, so it

2
pkgs/development/compilers/rustc/head.nix
View File

@@ -1,5 +1,7 @@
{stdenv, fetchurl, fetchgit, which, file, perl, curl, python27, makeWrapper}:
assert stdenv.gcc.gcc != null;
/* Rust's build process has a few quirks :
- It requires some patched in llvm that haven't landed upstream, so it

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

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
'';
meta = {
description = "Scala is a general purpose programming language";
description = "General purpose programming language";
longDescription = ''
Scala is a general purpose programming language designed to express
common programming patterns in a concise, elegant, and type-safe way.

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

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
checkTarget = "test";
meta = {
description = "TinyCC, a small, fast, and embeddable C compiler and interpreter";
description = "Small, fast, and embeddable C compiler and interpreter";
longDescription =
'' TinyCC (aka TCC) is a small but hyper fast C compiler. Unlike