ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 06:45:54 +03:00
Code Issues Projects Releases Wiki Activity

glibc: Move 2.17 -> 2.18

Browse Source
This commit is contained in:
Eelco Dolstra 2013-11-15 12:26:37 +01:00
parent fd7bc4ebfd
commit 5b22285b53
15 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/development/libraries/glibc/2.17/builder.sh → pkgs/development/libraries/glibc/2.18/builder.sh
View File

0
pkgs/development/libraries/glibc/2.17/common.nix → pkgs/development/libraries/glibc/2.18/common.nix
View File

0
pkgs/development/libraries/glibc/2.17/cve-2013-0242.patch → pkgs/development/libraries/glibc/2.18/cve-2013-0242.patch
View File

0
pkgs/development/libraries/glibc/2.17/cve-2013-1914.patch → pkgs/development/libraries/glibc/2.18/cve-2013-1914.patch
View File

0
pkgs/development/libraries/glibc/2.17/default.nix → pkgs/development/libraries/glibc/2.18/default.nix
View File

0
pkgs/development/libraries/glibc/2.17/dont-use-system-ld-so-cache.patch → pkgs/development/libraries/glibc/2.18/dont-use-system-ld-so-cache.patch
View File

0
pkgs/development/libraries/glibc/2.17/glibc-crypt-blowfish.patch → pkgs/development/libraries/glibc/2.18/glibc-crypt-blowfish.patch
View File

0
pkgs/development/libraries/glibc/2.17/glibc-elf-localscope.patch → pkgs/development/libraries/glibc/2.18/glibc-elf-localscope.patch
View File

0
pkgs/development/libraries/glibc/2.17/glibc-rh739743.patch → pkgs/development/libraries/glibc/2.18/glibc-rh739743.patch
View File

0
pkgs/development/libraries/glibc/2.17/info.nix → pkgs/development/libraries/glibc/2.18/info.nix
View File

0
pkgs/development/libraries/glibc/2.17/locales-builder.sh → pkgs/development/libraries/glibc/2.18/locales-builder.sh
View File

0
pkgs/development/libraries/glibc/2.17/locales.nix → pkgs/development/libraries/glibc/2.18/locales.nix
View File

0
pkgs/development/libraries/glibc/2.17/nix-locale-archive.patch → pkgs/development/libraries/glibc/2.18/nix-locale-archive.patch
View File

0
pkgs/development/libraries/glibc/2.17/rpcgen-path.patch → pkgs/development/libraries/glibc/2.18/rpcgen-path.patch
View File

12
pkgs/top-level/all-packages.nix
View File

@ -4177,8 +4177,6 @@ let
glfw = callPackage ../development/libraries/glfw { }; glfw = callPackage ../development/libraries/glfw { };
glibcCross = glibc217Cross;
glibc213 = (callPackage ../development/libraries/glibc/2.13 { glibc213 = (callPackage ../development/libraries/glibc/2.13 {
kernelHeaders = linuxHeaders; kernelHeaders = linuxHeaders;
installLocales = config.glibc.locales or false; installLocales = config.glibc.locales or false;
@ -4200,7 +4198,7 @@ let
inherit fetchgit; inherit fetchgit;
})); }));
glibc = callPackage ../development/libraries/glibc/2.17 { glibc = callPackage ../development/libraries/glibc/2.18 {
kernelHeaders = linuxHeaders; kernelHeaders = linuxHeaders;
installLocales = config.glibc.locales or false; installLocales = config.glibc.locales or false;
machHeaders = null; machHeaders = null;
@ -4208,13 +4206,13 @@ let
gccCross = null; gccCross = null;
}; };
glibc_memusage = callPackage ../development/libraries/glibc/2.17 { glibc_memusage = callPackage ../development/libraries/glibc/2.18 {
kernelHeaders = linuxHeaders; kernelHeaders = linuxHeaders;
installLocales = false; installLocales = false;
withGd = true; withGd = true;
}; };
glibc217Cross = forceNativeDrv (makeOverridable (import ../development/libraries/glibc/2.17) glibcCross = forceNativeDrv (makeOverridable (import ../development/libraries/glibc/2.18)
(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;
@ -4243,9 +4241,9 @@ let
installLocales = config.glibc.locales or false; installLocales = config.glibc.locales or false;
}; };
glibcLocales = callPackage ../development/libraries/glibc/2.17/locales.nix { }; glibcLocales = callPackage ../development/libraries/glibc/2.18/locales.nix { };
glibcInfo = callPackage ../development/libraries/glibc/2.17/info.nix { }; glibcInfo = callPackage ../development/libraries/glibc/2.18/info.nix { };
glibc_multi = glibc_multi =
runCommand "${glibc.name}-multi" runCommand "${glibc.name}-multi"