Author: viric
Date: Thu Sep 1 14:28:13 2011
New Revision: 28958
URL: https://svn.nixos.org/websvn/nix/?rev=28958&sc=1
Log:
Making gcc 4.6 that of stdenv.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Modified: nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix Thu Sep
1 13:41:42 2011 (r28957)
+++ nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/default.nix Thu Sep
1 14:28:13 2011 (r28958)
@@ -218,10 +218,13 @@
static = true;
};
};
- cloogppl = stdenvLinuxBoot3Pkgs.cloogppl.override {
- inherit ppl;
+ cloog = stdenvLinuxBoot3Pkgs.cloog.override {
+ isl = stdenvLinuxBoot3Pkgs.isl.override {
+ static = true;
+ };
static = true;
};
+ cloogppl = null;
});
# 8) Construct a fourth stdenv identical to the second, except that
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Thu Sep
1 13:41:42 2011 (r28957)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Thu Sep
1 14:28:13 2011 (r28958)
@@ -1642,7 +1642,7 @@
gambit = callPackage ../development/compilers/gambit { };
- gcc = gcc45;
+ gcc = gcc46;
gcc295 = wrapGCC (import ../development/compilers/gcc-2.95 {
inherit fetchurl stdenv noSysDirs;
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
