Author: eelco
Date: Fri Feb 17 21:47:08 2012
New Revision: 32371
URL: https://nixos.org/websvn/nix/?rev=32371&sc=1
Log:
* Move all gcc versions to development/compilers/gcc.
Added:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/2.95/
- copied from r32369,
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-2.95/
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/3.3/
- copied from r32369,
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-3.3/
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/3.4/
- copied from r32369,
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-3.4/
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/4.0/
- copied from r32369,
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.0/
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/4.1/
- copied from r32369,
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.1/
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/4.2/
- copied from r32369,
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.2/
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/4.2-apple32/
- copied from r32369,
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-apple/
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/4.2-apple64/
- copied from r32369,
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-apple64/
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/4.3/
- copied from r32369,
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.3/
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/4.4/
- copied from r32369,
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.4/
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/4.5/
- copied from r32369,
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/4.6/
- copied from r32369,
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.6/
Deleted:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-2.95/
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-3.3/
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-3.4/
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.0/
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.1/
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.2/
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.3/
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.4/
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.5/
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.6/
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-apple/
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-apple64/
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-upc-4.0/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/3.4/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/4.0/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/4.1/default.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-upc-4.0/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-upc-4.0/default.nix
Fri Feb 17 21:40:14 2012 (r32370)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-upc-4.0/default.nix
Fri Feb 17 21:47:08 2012 (r32371)
@@ -6,14 +6,16 @@
, texinfo ? null
}:
-with import ../../../lib;
+with stdenv.lib;
# GCC-UPC apparently doesn't support GCov and friends.
assert profiledCompiler == false;
stdenv.mkDerivation {
name = "gcc-upc-4.0.3.5";
- builder = ../gcc-4.0/builder.sh;
+
+ builder = ../gcc/4.0/builder.sh;
+
src = fetchurl {
url =
"ftp://ftp.intrepid.com/pub/upc/rls/upc-4.0.3.5/upc-4.0.3.5.src.tar.gz";;
sha256 = "0afnz1bz0kknhl18205bbwncyza08983ivfaagj5yl7x3nwy7prv";
@@ -30,13 +32,13 @@
langF77 = false;
langUPC = true; # unused
- buildInputs = [gmp mpfr texinfo
-
- # Bison is needed to build the parsers.
- bison
-
- # For some reason, `autoheader' and `m4' are needed.
- autoconf gnum4];
+ buildInputs =
+ [ gmp mpfr texinfo
+ # Bison is needed to build the parsers.
+ bison
+ # For some reason, `autoheader' and `m4' are needed.
+ autoconf gnum4
+ ];
# Note: We use `--enable-maintainer-mode' so that `bison' is actually
# run when needed.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/3.4/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-3.4/default.nix
Fri Feb 17 21:37:15 2012 (r32369)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/3.4/default.nix
Fri Feb 17 21:47:08 2012 (r32371)
@@ -5,7 +5,7 @@
assert langC;
-with import ../../../lib;
+with stdenv.lib;
stdenv.mkDerivation {
name = "gcc-3.4.6";
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/4.0/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.0/default.nix
Fri Feb 17 21:37:15 2012 (r32369)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/4.0/default.nix
Fri Feb 17 21:47:08 2012 (r32371)
@@ -8,7 +8,7 @@
assert langC;
-with import ../../../lib;
+with stdenv.lib;
stdenv.mkDerivation {
name = "${name}-4.0.4";
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/4.1/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc-4.1/default.nix
Fri Feb 17 21:37:15 2012 (r32369)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/4.1/default.nix
Fri Feb 17 21:47:08 2012 (r32371)
@@ -10,7 +10,7 @@
assert langC || langFortran;
-with import ../../../lib;
+with stdenv.lib;
stdenv.mkDerivation {
name = "${name}-4.1.2";
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Fri Feb
17 21:40:14 2012 (r32370)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Fri Feb
17 21:47:08 2012 (r32371)
@@ -1733,15 +1733,15 @@
gcc = gcc46;
- gcc295 = wrapGCC (import ../development/compilers/gcc-2.95 {
+ gcc295 = wrapGCC (import ../development/compilers/gcc/2.95 {
inherit fetchurl stdenv noSysDirs;
});
- gcc33 = wrapGCC (import ../development/compilers/gcc-3.3 {
+ gcc33 = wrapGCC (import ../development/compilers/gcc/3.3 {
inherit fetchurl stdenv noSysDirs;
});
- gcc34 = wrapGCC (import ../development/compilers/gcc-3.4 {
+ gcc34 = wrapGCC (import ../development/compilers/gcc/3.4 {
inherit fetchurl stdenv noSysDirs;
});
@@ -1750,30 +1750,30 @@
# expects a single digit after the dot. As a workaround, we feed
# GCC with Texinfo 4.9. Stupid bug, hackish workaround.
- gcc40 = wrapGCC (makeOverridable (import ../development/compilers/gcc-4.0) {
+ gcc40 = wrapGCC (makeOverridable (import ../development/compilers/gcc/4.0) {
inherit fetchurl stdenv noSysDirs;
texinfo = texinfo49;
profiledCompiler = true;
});
- gcc41 = wrapGCC (makeOverridable (import ../development/compilers/gcc-4.1) {
+ gcc41 = wrapGCC (makeOverridable (import ../development/compilers/gcc/4.1) {
inherit fetchurl noSysDirs gmp mpfr;
stdenv = overrideGCC stdenv gcc42;
texinfo = texinfo49;
profiledCompiler = false;
});
- gcc42 = wrapGCC (makeOverridable (import ../development/compilers/gcc-4.2) {
+ gcc42 = wrapGCC (makeOverridable (import ../development/compilers/gcc/4.2) {
inherit fetchurl stdenv noSysDirs;
profiledCompiler = false;
});
- gcc43 = lowPrio (wrapGCC (makeOverridable (import
../development/compilers/gcc-4.3) {
+ gcc43 = lowPrio (wrapGCC (makeOverridable (import
../development/compilers/gcc/4.3) {
inherit stdenv fetchurl texinfo gmp mpfr noSysDirs;
profiledCompiler = true;
}));
- gcc43_realCross = makeOverridable (import ../development/compilers/gcc-4.3) {
+ gcc43_realCross = makeOverridable (import ../development/compilers/gcc/4.3) {
inherit stdenv fetchurl texinfo gmp mpfr noSysDirs;
binutilsCross = binutilsCross;
libcCross = libcCross;
@@ -1784,7 +1784,7 @@
};
gcc44_realCross = lib.addMetaAttrs { platforms = []; }
- (makeOverridable (import ../development/compilers/gcc-4.4) {
+ (makeOverridable (import ../development/compilers/gcc/4.4) {
inherit stdenv fetchurl texinfo gmp mpfr /* ppl cloogppl */ noSysDirs
gettext which;
binutilsCross = binutilsCross;
@@ -1800,7 +1800,7 @@
gcc46 = gcc46_real;
gcc45_realCross = lib.addMetaAttrs { platforms = []; }
- (makeOverridable (import ../development/compilers/gcc-4.5) {
+ (makeOverridable (import ../development/compilers/gcc/4.5) {
inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib
ppl cloogppl gettext which noSysDirs;
binutilsCross = binutilsCross;
@@ -1812,7 +1812,7 @@
});
gcc46_realCross = lib.addMetaAttrs { platforms = []; }
- (makeOverridable (import ../development/compilers/gcc-4.6) {
+ (makeOverridable (import ../development/compilers/gcc/4.6) {
inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib
cloog ppl gettext which noSysDirs;
binutilsCross = binutilsCross;
@@ -1869,13 +1869,13 @@
enableMultilib = true;
}));
- gcc44 = lowPrio (wrapGCC (makeOverridable (import
../development/compilers/gcc-4.4) {
+ gcc44 = lowPrio (wrapGCC (makeOverridable (import
../development/compilers/gcc/4.4) {
inherit fetchurl stdenv texinfo gmp mpfr /* ppl cloogppl */
gettext which noSysDirs;
profiledCompiler = true;
}));
- gcc45_real = lowPrio (wrapGCC (makeOverridable (import
../development/compilers/gcc-4.5) {
+ gcc45_real = lowPrio (wrapGCC (makeOverridable (import
../development/compilers/gcc/4.5) {
inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib perl
ppl cloogppl
gettext which noSysDirs;
@@ -1895,7 +1895,7 @@
}));
# A non-stripped version of GCC.
- gcc45_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc-4.5
{
+ gcc45_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.5
{
stripped = false;
inherit noSysDirs;
@@ -1908,7 +1908,7 @@
profiledCompiler = if stdenv.system == "armv5tel-linux" then false else
true;
}));
- gcc46_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc-4.6 {
+ gcc46_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.6 {
inherit noSysDirs;
cross = null;
libcCross = null;
@@ -1920,7 +1920,7 @@
}));
# A non-stripped version of GCC.
- gcc46_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc-4.6
{
+ gcc46_debug = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.6
{
stripped = false;
inherit noSysDirs;
@@ -1930,10 +1930,10 @@
}));
gccApple =
- wrapGCC ( (if stdenv.system == "i686-darwin" then import
../development/compilers/gcc-apple else import
../development/compilers/gcc-apple64) {
+ wrapGCC ( (if stdenv.system == "i686-darwin" then import
../development/compilers/gcc/4.2-apple32 else import
../development/compilers/gcc/4.2-apple64) {
inherit fetchurl stdenv noSysDirs;
profiledCompiler = true;
- }) ;
+ });
gccupc40 = wrapGCCUPC (import ../development/compilers/gcc-upc-4.0 {
inherit fetchurl stdenv bison autoconf gnum4 noSysDirs;
@@ -2094,7 +2094,7 @@
langGo = true;
});
- ghdl = wrapGCC (import ../development/compilers/gcc-4.3 {
+ ghdl = wrapGCC (import ../development/compilers/gcc/4.3 {
inherit stdenv fetchurl texinfo gmp mpfr noSysDirs gnat;
name = "ghdl";
langVhdl = true;
@@ -2105,7 +2105,7 @@
});
# Not officially supported version for ghdl
- ghdl_gcc44 = lowPrio (wrapGCC (import ../development/compilers/gcc-4.4 {
+ ghdl_gcc44 = lowPrio (wrapGCC (import ../development/compilers/gcc/4.4 {
inherit stdenv fetchurl texinfo gmp mpfr noSysDirs gnat gettext which
ppl cloogppl;
name = "ghdl";
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
