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

Merge branch 'stdenv-updates' into pi-stdenv-updates

Browse Source 
Conflicts:
	pkgs/development/compilers/gcc/4.6/default.nix
	pkgs/development/compilers/gcc/4.7/default.nix

The 4.7 had some weird parameters added in crossAttrs; I've removed
them, but I don't understand where they come from.
This commit is contained in:
Lluís Batlle i Rossell
2012-12-28 20:14:01 +00:00
parent f2f50c42d2 88b11196c1
commit 719ba63004
417 changed files with 838 additions and 853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,9 +47,9 @@ let
" --enable-threads=posix" +
" --enable-nls"
);
stageNameAddon = if (crossStageStatic) then "-stage-static" else
stageNameAddon = if crossStageStatic then "-stage-static" else
"-stage-final";
crossNameAddon = if (cross != null) then "-${cross.config}" + stageNameAddon else "";
crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else "";
in
stdenv.mkDerivation ({
@@ -85,7 +85,7 @@ stdenv.mkDerivation ({
inherit noSysDirs profiledCompiler staticCompiler crossStageStatic
binutilsCross libcCross;
targetConfig = if (cross != null) then cross.config else null;
targetConfig = if cross != null then cross.config else null;
buildInputs = [texinfo gmp mpfr]
++ (optionals langTreelang [bison flex])
@@ -129,7 +129,7 @@ stdenv.mkDerivation ({
enableMultilib; };
# ghdl does not build fine with parallel building
enableParallelBuilding = if langVhdl then false else true;
enableParallelBuilding = !langVhdl;
meta = {
homepage = "http://gcc.gnu.org/";

26
pkgs/development/compilers/gcc/4.4/default.nix
View File

@@ -84,9 +84,9 @@ let version = "4.4.6";
" --enable-nls" +
" --disable-decimal-float" # No final libdecnumber (it may work only in 386)
);
stageNameAddon = if (crossStageStatic) then "-stage-static" else
stageNameAddon = if crossStageStatic then "-stage-static" else
"-stage-final";
crossNameAddon = if (cross != null) then "-${cross.config}" + stageNameAddon else "";
crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else "";
in
@@ -124,7 +124,7 @@ stdenv.mkDerivation ({
inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic
libcCross;
buildNativeInputs = [ texinfo which ];
nativeBuildInputs = [ texinfo which ];
buildInputs = [ gmp mpfr gettext ]
++ (optional (ppl != null) ppl)
@@ -163,11 +163,11 @@ stdenv.mkDerivation ({
)
}
${if langAda then " --enable-libada" else ""}
${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""}
${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
${if cross != null then crossConfigureFlags else ""}
";
targetConfig = if (cross != null) then cross.config else null;
targetConfig = if cross != null then cross.config else null;
# Needed for the cross compilation to work
AR = "ar";
@@ -189,13 +189,13 @@ stdenv.mkDerivation ({
configureFlags = "
${if enableMultilib then "" else "--disable-multilib"}
${if enableShared then "" else "--disable-shared"}
${if ppl != null then "--with-ppl=${ppl.hostDrv}" else ""}
${if cloogppl != null then "--with-cloog=${cloogppl.hostDrv}" else ""}
${if langJava then "--with-ecj-jar=${javaEcj.hostDrv}" else ""}
${if ppl != null then "--with-ppl=${ppl.crossDrv}" else ""}
${if cloogppl != null then "--with-cloog=${cloogppl.crossDrv}" else ""}
${if langJava then "--with-ecj-jar=${javaEcj.crossDrv}" else ""}
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.hostDrv}" else ""}
--with-gmp=${gmp.hostDrv}
--with-mpfr=${mpfr.hostDrv}
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""}
--with-gmp=${gmp.crossDrv}
--with-mpfr=${mpfr.crossDrv}
--disable-libstdcxx-pch
--without-included-gettext
--with-system-zlib
@@ -211,7 +211,7 @@ stdenv.mkDerivation ({
)
}
${if langAda then " --enable-libada" else ""}
${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""}
${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
${if cross != null then crossConfigureFlags else ""}
--target=${stdenv.cross.config}
";
@@ -243,7 +243,7 @@ stdenv.mkDerivation ({
enableMultilib version; };
# ghdl does not build fine with parallel building
enableParallelBuilding = if langVhdl then false else true;
enableParallelBuilding = !langVhdl;
meta = {
homepage = http://gcc.gnu.org/;

34
pkgs/development/compilers/gcc/4.5/default.nix
View File

@@ -78,7 +78,7 @@ let version = "4.5.4";
withArch +
withCpu +
withAbi +
(if (crossMingw && crossStageStatic) then
(if crossMingw && crossStageStatic then
" --with-headers=${libcCross}/include" +
" --with-gcc" +
" --with-gnu-as" +
@@ -115,9 +115,9 @@ let version = "4.5.4";
" --enable-nls" +
" --disable-decimal-float") # No final libdecnumber (it may work only in 386)
);
stageNameAddon = if (crossStageStatic) then "-stage-static" else
stageNameAddon = if crossStageStatic then "-stage-static" else
"-stage-final";
crossNameAddon = if (cross != null) then "-${cross.config}" + stageNameAddon else "";
crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else "";
in
@@ -146,7 +146,7 @@ stdenv.mkDerivation ({
postPatch =
if (stdenv.system == "i586-pc-gnu"
|| (libcCross != null # e.g., building `gcc.hostDrv'
|| (libcCross != null # e.g., building `gcc.crossDrv'
&& libcCross ? crossConfig
&& libcCross.crossConfig == "i586-pc-gnu")
|| (cross != null && cross.config == "i586-pc-gnu"
@@ -189,7 +189,7 @@ stdenv.mkDerivation ({
# On NixOS, use the right path to the dynamic linker instead of
# `/lib/ld*.so'.
let
libc = if (libcCross != null) then libcCross else stdenv.gcc.libc;
libc = if libcCross != null then libcCross else stdenv.gcc.libc;
in
'' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..."
for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h
@@ -205,7 +205,7 @@ stdenv.mkDerivation ({
inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic
libcCross crossMingw;
buildNativeInputs = [ texinfo which ]
nativeBuildInputs = [ texinfo which ]
++ optional (perl != null) perl;
buildInputs = [ gmp mpfr mpc libelf gettext ]
@@ -237,7 +237,7 @@ stdenv.mkDerivation ({
--with-gmp=${gmp}
--with-mpfr=${mpfr}
--with-mpc=${mpc}
${if (libelf != null) then "--with-libelf=${libelf}" else ""}
${if libelf != null then "--with-libelf=${libelf}" else ""}
--disable-libstdcxx-pch
--without-included-gettext
--with-system-zlib
@@ -255,11 +255,11 @@ stdenv.mkDerivation ({
${ # Trick that should be taken out once we have a mips64el-linux not loongson2f
if cross == null && stdenv.system == "mips64el-linux" then "--with-arch=loongson2f" else ""}
${if langAda then " --enable-libada" else ""}
${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""}
${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
${if cross != null then crossConfigureFlags else ""}
";
targetConfig = if (cross != null) then cross.config else null;
targetConfig = if cross != null then cross.config else null;
crossAttrs = {
AR = "${stdenv.cross.config}-ar";
@@ -277,13 +277,13 @@ stdenv.mkDerivation ({
configureFlags = ''
${if enableMultilib then "" else "--disable-multilib"}
${if enableShared then "" else "--disable-shared"}
${if ppl != null then "--with-ppl=${ppl.hostDrv}" else ""}
${if cloogppl != null then "--with-cloog=${cloogppl.hostDrv}" else ""}
${if langJava then "--with-ecj-jar=${javaEcj.hostDrv}" else ""}
${if ppl != null then "--with-ppl=${ppl.crossDrv}" else ""}
${if cloogppl != null then "--with-cloog=${cloogppl.crossDrv}" else ""}
${if langJava then "--with-ecj-jar=${javaEcj.crossDrv}" else ""}
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.hostDrv}" else ""}
--with-gmp=${gmp.hostDrv}
--with-mpfr=${mpfr.hostDrv}
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""}
--with-gmp=${gmp.crossDrv}
--with-mpfr=${mpfr.crossDrv}
--disable-libstdcxx-pch
--without-included-gettext
--with-system-zlib
@@ -299,7 +299,7 @@ stdenv.mkDerivation ({
)
}
${if langAda then " --enable-libada" else ""}
${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""}
${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
${if cross != null then crossConfigureFlags else ""}
--target=${stdenv.cross.config}
'';
@@ -391,7 +391,7 @@ stdenv.mkDerivation ({
// optionalAttrs (cross != null || libcCross != null) {
# `builder.sh' sets $CPP, which leads configure to use "gcc -E" instead of,
# say, "i586-pc-gnu-gcc -E" when building `gcc.hostDrv'.
# say, "i586-pc-gnu-gcc -E" when building `gcc.crossDrv'.
# FIXME: Fix `builder.sh' directly in the next stdenv-update.
postUnpack = "unset CPP";
}

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

@@ -104,7 +104,7 @@ let version = "4.6.3";
withCpu +
withAbi +
withFpu +
(if (crossMingw && crossStageStatic) then
(if crossMingw && crossStageStatic then
" --with-headers=${libcCross}/include" +
" --with-gcc" +
" --with-gnu-as" +
@@ -152,9 +152,9 @@ let version = "4.6.3";
" --enable-nls" +
" --disable-decimal-float") # No final libdecnumber (it may work only in 386)
);
stageNameAddon = if (crossStageStatic) then "-stage-static" else
stageNameAddon = if crossStageStatic then "-stage-static" else
"-stage-final";
crossNameAddon = if (cross != null) then "-${cross.config}" + stageNameAddon else "";
crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else "";
bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips;
@@ -177,7 +177,7 @@ stdenv.mkDerivation ({
postPatch =
if (stdenv.isGNU
|| (libcCross != null # e.g., building `gcc.hostDrv'
|| (libcCross != null # e.g., building `gcc.crossDrv'
&& libcCross ? crossConfig
&& libcCross.crossConfig == "i586-pc-gnu")
|| (crossGNU && libcCross != null))
@@ -219,7 +219,7 @@ stdenv.mkDerivation ({
# On NixOS, use the right path to the dynamic linker instead of
# `/lib/ld*.so'.
let
libc = if (libcCross != null) then libcCross else stdenv.gcc.libc;
libc = if libcCross != null then libcCross else stdenv.gcc.libc;
in
'' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..."
for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h
@@ -235,7 +235,7 @@ stdenv.mkDerivation ({
inherit noSysDirs staticCompiler langJava crossStageStatic
libcCross crossMingw;
buildNativeInputs = [ texinfo which gettext ]
nativeBuildInputs = [ texinfo which gettext ]
++ (optional (perl != null) perl)
++ (optional javaAwtGtk pkgconfig);
@@ -278,7 +278,7 @@ stdenv.mkDerivation ({
--with-gmp=${gmp}
--with-mpfr=${mpfr}
--with-mpc=${mpc}
${if (libelf != null) then "--with-libelf=${libelf}" else ""}
${if libelf != null then "--with-libelf=${libelf}" else ""}
--disable-libstdcxx-pch
--without-included-gettext
--with-system-zlib
@@ -297,12 +297,12 @@ stdenv.mkDerivation ({
${ # Trick that should be taken out once we have a mips64el-linux not loongson2f
if cross == null && stdenv.system == "mips64el-linux" then "--with-arch=loongson2f" else ""}
${if langAda then " --enable-libada" else ""}
${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""}
${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
${if cross != null then crossConfigureFlags else ""}
${if !bootstrap then "--disable-bootstrap" else ""}
";
targetConfig = if (cross != null) then cross.config else null;
targetConfig = if cross != null then cross.config else null;
buildFlags = if bootstrap then
(if profiledCompiler then "profiledbootstrap" else "bootstrap")
@@ -330,13 +330,13 @@ stdenv.mkDerivation ({
configureFlags = ''
${if enableMultilib then "" else "--disable-multilib"}
${if enableShared then "" else "--disable-shared"}
${if ppl != null then "--with-ppl=${ppl.hostDrv}" else ""}
${if cloog != null then "--with-cloog=${cloog.hostDrv} --enable-cloog-backend=isl" else ""}
${if langJava then "--with-ecj-jar=${javaEcj.hostDrv}" else ""}
${if ppl != null then "--with-ppl=${ppl.crossDrv}" else ""}
${if cloog != null then "--with-cloog=${cloog.crossDrv} --enable-cloog-backend=isl" else ""}
${if langJava then "--with-ecj-jar=${javaEcj.crossDrv}" else ""}
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.hostDrv}" else ""}
--with-gmp=${gmp.hostDrv}
--with-mpfr=${mpfr.hostDrv}
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""}
--with-gmp=${gmp.crossDrv}
--with-mpfr=${mpfr.crossDrv}
--disable-libstdcxx-pch
--without-included-gettext
--with-system-zlib
@@ -353,7 +353,7 @@ stdenv.mkDerivation ({
)
}
${if langAda then " --enable-libada" else ""}
${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""}
${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
${if cross != null then crossConfigureFlags else ""}
--target=${stdenv.cross.config}
'';

30
pkgs/development/compilers/gcc/4.7/default.nix
View File

@@ -105,7 +105,7 @@ let version = "4.7.2";
withAbi +
withFpu +
withFloat +
(if (crossMingw && crossStageStatic) then
(if crossMingw && crossStageStatic then
" --with-headers=${libcCross}/include" +
" --with-gcc" +
" --with-gnu-as" +
@@ -153,9 +153,9 @@ let version = "4.7.2";
" --enable-nls" +
" --disable-decimal-float") # No final libdecnumber (it may work only in 386)
);
stageNameAddon = if (crossStageStatic) then "-stage-static" else
stageNameAddon = if crossStageStatic then "-stage-static" else
"-stage-final";
crossNameAddon = if (cross != null) then "-${cross.config}" + stageNameAddon else "";
crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else "";
bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips;
@@ -178,7 +178,7 @@ stdenv.mkDerivation ({
postPatch =
if (stdenv.isGNU
|| (libcCross != null # e.g., building `gcc.hostDrv'
|| (libcCross != null # e.g., building `gcc.crossDrv'
&& libcCross ? crossConfig
&& libcCross.crossConfig == "i586-pc-gnu")
|| (crossGNU && libcCross != null))
@@ -217,7 +217,7 @@ stdenv.mkDerivation ({
# On NixOS, use the right path to the dynamic linker instead of
# `/lib/ld*.so'.
let
libc = if (libcCross != null) then libcCross else stdenv.gcc.libc;
libc = if libcCross != null then libcCross else stdenv.gcc.libc;
in
'' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..."
for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h
@@ -233,7 +233,7 @@ stdenv.mkDerivation ({
inherit noSysDirs staticCompiler langJava crossStageStatic
libcCross crossMingw;
buildNativeInputs = [ texinfo which gettext ]
nativeBuildInputs = [ texinfo which gettext ]
++ (optional (perl != null) perl)
++ (optional javaAwtGtk pkgconfig);
@@ -280,7 +280,7 @@ stdenv.mkDerivation ({
--with-gmp=${gmp}
--with-mpfr=${mpfr}
--with-mpc=${mpc}
${if (libelf != null) then "--with-libelf=${libelf}" else ""}
${if libelf != null then "--with-libelf=${libelf}" else ""}
--disable-libstdcxx-pch
--without-included-gettext
--with-system-zlib
@@ -302,12 +302,12 @@ stdenv.mkDerivation ({
${ # Trick that should be taken out once we have a mips64el-linux not loongson2f
if cross == null && stdenv.system == "mips64el-linux" then "--with-arch=loongson2f" else ""}
${if langAda then " --enable-libada" else ""}
${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""}
${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
${if cross != null then crossConfigureFlags else ""}
${if !bootstrap then "--disable-bootstrap" else ""}
";
targetConfig = if (cross != null) then cross.config else null;
targetConfig = if cross != null then cross.config else null;
buildFlags = if bootstrap then
(if profiledCompiler then "profiledbootstrap" else "bootstrap")
@@ -345,13 +345,13 @@ stdenv.mkDerivation ({
configureFlags = ''
${if enableMultilib then "" else "--disable-multilib"}
${if enableShared then "" else "--disable-shared"}
${if ppl != null then "--with-ppl=${ppl.hostDrv}" else ""}
${if cloog != null then "--with-cloog=${cloog.hostDrv} --enable-cloog-backend=isl" else ""}
${if langJava then "--with-ecj-jar=${javaEcj.hostDrv}" else ""}
${if ppl != null then "--with-ppl=${ppl.crossDrv}" else ""}
${if cloog != null then "--with-cloog=${cloog.crossDrv} --enable-cloog-backend=isl" else ""}
${if langJava then "--with-ecj-jar=${javaEcj.crossDrv}" else ""}
${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.hostDrv}" else ""}
--with-gmp=${gmp.hostDrv}
--with-mpfr=${mpfr.hostDrv}
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""}
--with-gmp=${gmp.crossDrv}
--with-mpfr=${mpfr.crossDrv}
--disable-libstdcxx-pch
--without-included-gettext
--with-system-zlib

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

@@ -3,12 +3,12 @@
stdenv.mkDerivation {
name = "gentoo-gnatboot-4.1";
src = if (stdenv.system == "i686-linux") then
src = if stdenv.system == "i686-linux" then
fetchurl {
url = "mirror://gentoo/distfiles/gnatboot-4.1-i386.tar.bz2";
sha256 = "0665zk71598204bf521vw68i5y6ccqarq9fcxsqp7ccgycb4lysr";
}
else if (stdenv.system == "x86_64-linux") then
else if stdenv.system == "x86_64-linux" then
fetchurl {
url = "mirror://gentoo/distfiles/gnatboot-4.1-amd64.tar.bz2";
sha256 = "1li4d52lmbnfs6llcshlbqyik2q2q4bvpir0f7n38nagp0h6j0d4";

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

@@ -54,9 +54,9 @@ stdenv.mkDerivation {
patches = [ ./cacert.patch ];
GOOS = "linux";
GOARCH = if (stdenv.system == "i686-linux") then "386"
else if (stdenv.system == "x86_64-linux") then "amd64"
else if (stdenv.system == "armv5tel-linux") then "arm"
GOARCH = if stdenv.system == "i686-linux" then "386"
else if stdenv.system == "x86_64-linux" then "amd64"
else if stdenv.system == "armv5tel-linux" then "arm"
else throw "Unsupported system";
GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
@@ -74,7 +74,7 @@ stdenv.mkDerivation {
for a in go gofmt godoc; do
wrapProgram "$out/bin/$a" \
--set "GOROOT" $out/share/go \
${if (stdenv.system == "armv5tel-linux") then "--set GOARM $GOARM" else ""}
${if stdenv.system == "armv5tel-linux" then "--set GOARM $GOARM" else ""}
done
# Copy the emacs configuration for Go files.

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

@@ -46,7 +46,7 @@ stdenv.mkDerivation {
make install -C doc
'';
buildNativeInputs = [ gnum4 texinfo texLive automake ];
nativeBuildInputs = [ gnum4 texinfo texLive automake ];
# XXX: The `check' target doesn't exist.
doCheck = false;

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

@@ -11,7 +11,7 @@ let version = "0.9.25"; in
sha256 = "0dfycf80x73dz67c97j1ry29wrv35393ai5ry46i1x1fzfq6rv8v";
};
buildNativeInputs = [ perl texinfo ];
nativeBuildInputs = [ perl texinfo ];
patches =
[ (fetchurl {

2
pkgs/development/compilers/vala/15.2.nix
View File

@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0g71zq6dpqrw2f40wfzdf18fdw41ymr17laqniy2kr622hkxdi8w";
};
buildNativeInputs = [ yacc flex pkgconfig xz ];
nativeBuildInputs = [ yacc flex pkgconfig xz ];
buildInputs = [ glib ];

2
pkgs/development/compilers/vala/16.1.nix
View File

@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1n708n9ixyy9qrzyv1wf4ybvcclx43ib9ki028wwpvkz6kv8zqlb";
};
buildNativeInputs = [ yacc flex pkgconfig xz ];
nativeBuildInputs = [ yacc flex pkgconfig xz ];
buildInputs = [ glib ];

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

@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "09i2s0dwmrk147ind2dx7nq845g12fp6fsjqrphhrr0dbi0zzgh3";
};
buildNativeInputs = [ yacc flex pkgconfig xz ];
nativeBuildInputs = [ yacc flex pkgconfig xz ];
buildInputs = [ glib ];