Author: eelco
Date: Thu Mar 1 23:15:21 2012
New Revision: 32734
URL: https://nixos.org/websvn/nix/?rev=32734&sc=1
Log:
* GCC 4.6.3 and 4.5.3.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/4.5/sources.nix
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/4.6/sources.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/zlib/default.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/4.5/sources.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/4.5/sources.nix
Thu Mar 1 23:14:14 2012 (r32733)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/4.5/sources.nix
Thu Mar 1 23:15:21 2012 (r32734)
@@ -1,26 +1,26 @@
/* Automatically generated by `update-gcc.sh', do not edit.
- For GCC 4.5.2. */
+ For GCC 4.5.3. */
{ fetchurl, optional, version, langC, langCC, langFortran, langJava, langAda }:
-assert version == "4.5.2";
+assert version == "4.5.3";
optional /* langC */ true (fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2";
- sha256 = "d1099165702ccdfd65f2411ed8d1015452190fe6bc7b87baf124794e5c8e7464";
+ sha256 = "fef7ef1396d41f4af2dacbea8826a895060a8a72d9f05546c091085b036f1f87";
}) ++
optional langCC (fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2";
- sha256 = "fdd45dc9158d1d5a1c2ef0054b353d5f403e29ec360c1f8e058dc7e4531fe83b";
+ sha256 = "e088b9fe0016070da921f353ef8c0c2f81fd11d21e3aeb09210ab7bad080804b";
}) ++
optional langFortran (fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2";
- sha256 = "19c3c8a4b23c880a369d3229ef65406fde6af47f5127d494a87f19e1de3d9a13";
+ sha256 = "618e8a2334eb3e2baf00891e9b2da47f32e797520e230acddb5f02fada0006cd";
}) ++
optional langJava (fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2";
- sha256 = "c120e2dc39dd707a3d5461744b879e41f5e642661d7b8a023fc620b24bb7a2ab";
+ sha256 = "c687198d4882c9d505eeb406595dad041602a5b6c67da5cf15d4941b34d20144";
}) ++
optional langAda (fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-ada-${version}.tar.bz2";
- sha256 = "7ed5bb26b72dfbfaf533d09e3d34df96305c09f57f5da67939087fb2726cc771";
+ sha256 = "686a6d2453bc325f32ddc90edf86502dc68320c7cd6948d60d93d0b0f5965b8f";
}) ++
[]
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/4.6/sources.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/4.6/sources.nix
Thu Mar 1 23:14:14 2012 (r32733)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/gcc/4.6/sources.nix
Thu Mar 1 23:15:21 2012 (r32734)
@@ -1,31 +1,31 @@
/* Automatically generated by `update-gcc.sh', do not edit.
- For GCC 4.6.2. */
+ For GCC 4.6.3. */
{ fetchurl, optional, version, langC, langCC, langFortran, langJava, langAda,
langGo }:
-assert version == "4.6.2";
+assert version == "4.6.3";
optional /* langC */ true (fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2";
- sha256 = "dcbf391f05277b7e09d14d54f3bdaba5515a3a8e7dd1d8af93af3f6f68455e10";
+ sha256 = "283e00881c0de258fafc5170843e4d9b14ee2a7dc4426f0d426e6be0400251c1";
}) ++
optional langCC (fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2";
- sha256 = "5470bea8093438cf5840fbbef3546b6dba7b0153ef6a16e142c1fba1fac6e598";
+ sha256 = "b3e0c733e900e99096b0c5480f57e22e3e583ec3d83596cc2cb9986bd64b29e8";
}) ++
optional langFortran (fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2";
- sha256 = "492becd732662349eaa5e7c4e458ac009df0ccb8904df54ae295d277c4d6be6f";
+ sha256 = "fe1bdf3485f33e6d0a998ff7bcb42526fbf3083dbfc107c3d95a88c00739eadb";
}) ++
optional langJava (fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2";
- sha256 = "d021a16816daeb5db9a3280909d846b38cbdb4cc0d9aa47714c49b08a81d11f1";
+ sha256 = "d0f9aafbd8fe95fdee5797cd02a9a734de0078aa62a9a249b0752adabf76d6e6";
}) ++
optional langAda (fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-ada-${version}.tar.bz2";
- sha256 = "9ac26821ad900d02ed251b62e6a0506ee12417b506a7bb9b02ec9f09e5d9c84f";
+ sha256 = "7bb213ec3948646df72720580fcba3489c84aa452bd0e4238712607ef83cbdf6";
}) ++
optional langGo (fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-go-${version}.tar.bz2";
- sha256 = "1cafbb254d70f60c39a62a39a3b236674e02c875a1775057ddd33ffafe0fd4e1";
+ sha256 = "7589c16f33ad383769510bb5b9c1aeb7f865f3ae0b89b07b2370d988a4c1fe6d";
}) ++
[]
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/zlib/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/zlib/default.nix
Thu Mar 1 23:14:14 2012 (r32733)
+++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/zlib/default.nix
Thu Mar 1 23:15:21 2012 (r32734)
@@ -13,8 +13,6 @@
sha256 = "06x6m33ls1606ni7275q5z392csvh18dgs55kshfnvrfal45w8r1";
};
- patches = [ ];
-
configureFlags = if static then "" else "--shared";
preConfigure = ''
@@ -30,7 +28,7 @@
crossAttrs = {
dontStrip = if static then true else false;
- } // (if stdenv.cross.libc == "msvcrt" then {
+ } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "msvcrt") {
configurePhase=''
installFlags="BINARY_PATH=$out/bin INCLUDE_PATH=$out/include
LIBRARY_PATH=$out/lib"
'';
@@ -38,7 +36,7 @@
"-f" "win32/Makefile.gcc"
"PREFIX=${stdenv.cross.config}-"
] ++ (if static then [] else [ "SHARED_MODE=1" ]);
- } else {});
+ };
# zlib doesn't like the automatic --disable-shared from the Cygwin stdenv.
cygwinConfigureEnableShared = true;
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
