Author: ludo
Date: Fri Aug 20 15:26:50 2010
New Revision: 23282
URL: https://svn.nixos.org/websvn/nix/?rev=23282&sc=1
Log:
glibc 2.12.1.
Added:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/builder.sh
- copied, changed from r23281,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/builder.sh
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/common.nix
- copied, changed from r23281,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/common.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/default.nix
- copied, changed from r23281,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/gnu89-inline.patch
- copied, changed from r23281,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/gnu89-inline.patch
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/info.nix
- copied, changed from r23281,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/info.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/locales-builder.sh
- copied, changed from r23281,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/locales-builder.sh
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/locales.nix
- copied, changed from r23281,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/locales.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/mod_nano.patch
- copied, changed from r23281,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/mod_nano.patch
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/nix-locale-archive.patch
- copied, changed from r23281,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/nix-locale-archive.patch
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/nss-skip-unavail.patch
- copied, changed from r23281,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/nss-skip-unavail.patch
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/rpcgen-path.patch
- copied, changed from r23281,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/rpcgen-path.patch
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/stack-protector-link.patch
- copied, changed from r23281,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/stack-protector-link.patch
Deleted:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/builder.sh
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/common.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/gnu89-inline.patch
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/info.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/locales-builder.sh
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/locales.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/mod_nano.patch
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/nix-locale-archive.patch
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/nss-skip-unavail.patch
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/rpcgen-path.patch
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/stack-protector-link.patch
Modified:
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Copied and modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/builder.sh
(from r23281,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/builder.sh)
==============================================================================
Copied and modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/common.nix
(from r23281,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/common.nix)
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/common.nix
Fri Aug 20 15:26:41 2010 (r23281, copy source)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/common.nix
Fri Aug 20 15:26:50 2010 (r23282)
@@ -11,7 +11,7 @@
let
# For GNU/Hurd, see below.
- version = if hurdHeaders != null then "20100512" else "2.11.2";
+ version = if hurdHeaders != null then "20100512" else "2.12.1";
in
assert (cross != null) -> (gccCross != null);
@@ -128,11 +128,11 @@
}
else fetchurl {
url = "mirror://gnu/glibc/glibc-${version}.tar.bz2";
- sha256 = "04w74879psq961cas1amidkg8fc1h6r9yj3plfr33v9y6vp7db62";
+ sha256 = "01vlr473skl08xpcjz0b4lw23lsnskf5kx9s8nxwa4mwa9f137vm";
};
srcPorts = fetchurl {
- url = "mirror://gnu/glibc/glibc-ports-2.11.tar.bz2";
+ url = "mirror://gnu/glibc/glibc-ports-2.11.tar.bz2"; # FIXME: 2.12.1
unavailable.
sha256 = "12b53f5k4gcr8rr1kg2ycf2701rygqsyf9r8gz4j3l9flaqi5liq";
};
Copied and modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/default.nix
(from r23281,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/default.nix)
==============================================================================
Copied and modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/gnu89-inline.patch
(from r23281,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/gnu89-inline.patch)
==============================================================================
Copied and modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/info.nix
(from r23281,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/info.nix)
==============================================================================
Copied and modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/locales-builder.sh
(from r23281,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/locales-builder.sh)
==============================================================================
Copied and modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/locales.nix
(from r23281,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/locales.nix)
==============================================================================
Copied and modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/mod_nano.patch
(from r23281,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/mod_nano.patch)
==============================================================================
Copied and modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/nix-locale-archive.patch
(from r23281,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/nix-locale-archive.patch)
==============================================================================
Copied and modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/nss-skip-unavail.patch
(from r23281,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/nss-skip-unavail.patch)
==============================================================================
Copied and modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/rpcgen-path.patch
(from r23281,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/rpcgen-path.patch)
==============================================================================
Copied and modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/stack-protector-link.patch
(from r23281,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/stack-protector-link.patch)
==============================================================================
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Fri Aug
20 15:26:41 2010 (r23281)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Fri Aug
20 15:26:50 2010 (r23282)
@@ -2821,7 +2821,7 @@
glfw = callPackage ../development/libraries/glfw { };
- glibc = glibc211;
+ glibc = glibc212;
glibc25 = callPackage ../development/libraries/glibc-2.5 {
kernelHeaders = linuxHeaders;
@@ -2845,7 +2845,7 @@
installLocales = getPkgConfig "glibc" "locales" false;
});
- glibc211 = callPackage ../development/libraries/glibc-2.11 {
+ glibc212 = callPackage ../development/libraries/glibc-2.12 {
kernelHeaders = linuxHeaders;
installLocales = getPkgConfig "glibc" "locales" false;
machHeaders = null;
@@ -2853,7 +2853,7 @@
gccCross = null;
};
- glibc211Cross = forceBuildDrv (makeOverridable (import
../development/libraries/glibc-2.11)
+ glibc212Cross = forceBuildDrv (makeOverridable (import
../development/libraries/glibc-2.12)
(let crossGNU = (crossSystem != null && crossSystem.config ==
"i586-pc-gnu");
in ({
inherit stdenv fetchurl;
@@ -2868,7 +2868,7 @@
then { inherit machHeaders hurdHeaders mig fetchgit; }
else { }))));
- glibcCross = glibc211Cross;
+ glibcCross = glibc212Cross;
# We can choose:
libcCrossChooser = name : if (name == "glibc") then glibcCross
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
