glibc: Rename 2.18 -> 2.19

This commit is contained in:
Eelco Dolstra 2014-02-14 15:49:50 +01:00
parent 48b8118f2c
commit de605827f8
20 changed files with 5 additions and 5 deletions

View File

@ -4197,7 +4197,7 @@ let
glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; glfw2 = callPackage ../development/libraries/glfw/2.x.nix { };
glfw3 = callPackage ../development/libraries/glfw/3.x.nix { }; glfw3 = callPackage ../development/libraries/glfw/3.x.nix { };
glibc = callPackage ../development/libraries/glibc/2.18 { glibc = callPackage ../development/libraries/glibc/2.19 {
kernelHeaders = linuxHeaders; kernelHeaders = linuxHeaders;
installLocales = config.glibc.locales or false; installLocales = config.glibc.locales or false;
machHeaders = null; machHeaders = null;
@ -4205,13 +4205,13 @@ let
gccCross = null; gccCross = null;
}; };
glibc_memusage = callPackage ../development/libraries/glibc/2.18 { glibc_memusage = callPackage ../development/libraries/glibc/2.19 {
kernelHeaders = linuxHeaders; kernelHeaders = linuxHeaders;
installLocales = false; installLocales = false;
withGd = true; withGd = true;
}; };
glibcCross = forceNativeDrv (makeOverridable (import ../development/libraries/glibc/2.18) glibcCross = forceNativeDrv (makeOverridable (import ../development/libraries/glibc/2.19)
(let crossGNU = crossSystem != null && crossSystem.config == "i586-pc-gnu"; (let crossGNU = crossSystem != null && crossSystem.config == "i586-pc-gnu";
in { in {
inherit stdenv fetchurl; inherit stdenv fetchurl;
@ -4240,9 +4240,9 @@ let
installLocales = config.glibc.locales or false; installLocales = config.glibc.locales or false;
}; };
glibcLocales = callPackage ../development/libraries/glibc/2.18/locales.nix { }; glibcLocales = callPackage ../development/libraries/glibc/2.19/locales.nix { };
glibcInfo = callPackage ../development/libraries/glibc/2.18/info.nix { }; glibcInfo = callPackage ../development/libraries/glibc/2.19/info.nix { };
glibc_multi = glibc_multi =
runCommand "${glibc.name}-multi" runCommand "${glibc.name}-multi"