Author: ludo
Date: Fri Feb 25 15:28:17 2011
New Revision: 26116
URL: https://svn.nixos.org/websvn/nix/?rev=26116&sc=1
Log:
GNU libc 2.13.
Added:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.13/
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.13/builder.sh
- copied, changed from r26115,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/builder.sh
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.13/common.nix
- copied, changed from r26115,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/common.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.13/default.nix
- copied, changed from r26115,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.13/info.nix
- copied, changed from r26115,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/info.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.13/locales-builder.sh
- copied, changed from r26115,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/locales-builder.sh
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.13/locales.nix
- copied, changed from r26115,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/locales.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.13/nix-locale-archive.patch
- copied, changed from r26115,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/nix-locale-archive.patch
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.13/nss-skip-unavail.patch
- copied, changed from r26115,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/nss-skip-unavail.patch
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.13/rpcgen-path.patch
- copied, changed from r26115,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/rpcgen-path.patch
Deleted:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/builder.sh
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/common.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/info.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/locales-builder.sh
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/locales.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/nix-locale-archive.patch
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/nss-skip-unavail.patch
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/rpcgen-path.patch
Modified:
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Copied and modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.13/builder.sh
(from r26115,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/builder.sh)
==============================================================================
Copied and modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.13/common.nix
(from r26115,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/common.nix)
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/common.nix
Fri Feb 25 15:28:11 2011 (r26115, copy source)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.13/common.nix
Fri Feb 25 15:28:17 2011 (r26116)
@@ -11,7 +11,7 @@
let
# For GNU/Hurd, see below.
- version = if hurdHeaders != null then "20100512" else "2.12.2";
+ version = if hurdHeaders != null then "20100512" else "2.13";
needsPortsNative = stdenv.isMips || stdenv.isArm;
needsPortsCross = cross.arch == "mips" || cross.arch == "arm";
@@ -20,7 +20,7 @@
else needsPortsCross;
srcPorts = fetchurl {
- # These should work equally well for 2.12.2
+ # These should work equally well for 2.13
url = "mirror://gnu/glibc/glibc-ports-2.12.1.tar.bz2";
sha256 = "041ix0nq7nc5r7jf80jsdlw4idah2mjp5nf7khybhc4cs1kc31ir";
};
@@ -147,7 +147,7 @@
}
else fetchurl {
url = "mirror://gnu/glibc/glibc-${version}.tar.bz2";
- sha256 = "05hjz816a2hmzc44gxxi9vrdx6l9f23az794zj45xsxr94yfpy12";
+ sha256 = "1cnv319ysc8nkwpqw6f6ymb6b8hbl0nyvyx48sddkrj50lmcjwq1";
};
# `fetchurl' is a function and thus should not be passed to the
Copied and modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.13/default.nix
(from r26115,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/default.nix)
==============================================================================
Copied and modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.13/info.nix
(from r26115,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/info.nix)
==============================================================================
Copied and modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.13/locales-builder.sh
(from r26115,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/locales-builder.sh)
==============================================================================
Copied and modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.13/locales.nix
(from r26115,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/locales.nix)
==============================================================================
Copied and modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.13/nix-locale-archive.patch
(from r26115,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/nix-locale-archive.patch)
==============================================================================
Copied and modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.13/nss-skip-unavail.patch
(from r26115,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/nss-skip-unavail.patch)
==============================================================================
Copied and modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.13/rpcgen-path.patch
(from r26115,
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/rpcgen-path.patch)
==============================================================================
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Fri Feb
25 15:28:11 2011 (r26115)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Fri Feb
25 15:28:17 2011 (r26116)
@@ -2970,7 +2970,7 @@
glfw = callPackage ../development/libraries/glfw { };
- glibc = glibc212;
+ glibc = glibc213;
glibc25 = callPackage ../development/libraries/glibc-2.5 {
kernelHeaders = linuxHeaders;
@@ -2994,15 +2994,15 @@
installLocales = getPkgConfig "glibc" "locales" false;
});
- glibc212 = (callPackage ../development/libraries/glibc-2.12 {
+ glibc213 = (callPackage ../development/libraries/glibc-2.13 {
kernelHeaders = linuxHeaders;
installLocales = getPkgConfig "glibc" "locales" false;
machHeaders = null;
hurdHeaders = null;
gccCross = null;
- }) // (if crossSystem != null then { hostDrv = glibc212Cross; } else {});
+ }) // (if crossSystem != null then { hostDrv = glibc213Cross; } else {});
- glibc212Cross = forceBuildDrv (makeOverridable (import
../development/libraries/glibc-2.12)
+ glibc213Cross = forceBuildDrv (makeOverridable (import
../development/libraries/glibc-2.13)
(let crossGNU = (crossSystem != null && crossSystem.config ==
"i586-pc-gnu");
in ({
inherit stdenv fetchurl;
@@ -3017,7 +3017,7 @@
then { inherit machHeaders hurdHeaders mig fetchgit; }
else { }))));
- glibcCross = glibc212Cross;
+ glibcCross = glibc213Cross;
# We can choose:
libcCrossChooser = name : if (name == "glibc") then glibcCross
@@ -3038,9 +3038,9 @@
installLocales = getPkgConfig "glibc" "locales" false;
};
- glibcLocales = callPackage ../development/libraries/glibc-2.12/locales.nix {
};
+ glibcLocales = callPackage ../development/libraries/glibc-2.13/locales.nix {
};
- glibcInfo = callPackage ../development/libraries/glibc-2.12/info.nix { };
+ glibcInfo = callPackage ../development/libraries/glibc-2.13/info.nix { };
glibc_multi =
runCommand "${glibc.name}-multi"
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
