From de605827f89034ad2e5ffbd32909ad725128e2b1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 14 Feb 2014 15:49:50 +0100 Subject: [PATCH] glibc: Rename 2.18 -> 2.19 --- .../libraries/glibc/{2.18 => 2.19}/builder.sh | 0 .../libraries/glibc/{2.18 => 2.19}/common.nix | 0 .../glibc/{2.18 => 2.19}/cve-2012-4412+4424.patch | 0 .../libraries/glibc/{2.18 => 2.19}/cve-2013-4237.patch | 0 .../libraries/glibc/{2.18 => 2.19}/cve-2013-4332.patch | 0 .../libraries/glibc/{2.18 => 2.19}/cve-2013-4458.patch | 0 .../libraries/glibc/{2.18 => 2.19}/cve-2013-4788.patch | 0 .../libraries/glibc/{2.18 => 2.19}/default.nix | 0 .../{2.18 => 2.19}/dont-use-system-ld-so-cache.patch | 0 .../{2.18 => 2.19}/fix_path_attribute_in_getconf.patch | 0 .../glibc/{2.18 => 2.19}/glibc-crypt-blowfish.patch | 0 .../glibc/{2.18 => 2.19}/glibc-rh739743.patch | 0 .../libraries/glibc/{2.18 => 2.19}/info.nix | 0 .../libraries/glibc/{2.18 => 2.19}/locales-builder.sh | 0 .../libraries/glibc/{2.18 => 2.19}/locales.nix | 0 .../glibc/{2.18 => 2.19}/nix-locale-archive.patch | 0 .../libraries/glibc/{2.18 => 2.19}/rpcgen-path.patch | 0 .../libraries/glibc/{2.18 => 2.19}/scanf.patch | 0 .../glibc/{2.18 => 2.19}/strstr-sse42-hack.patch | 0 pkgs/top-level/all-packages.nix | 10 +++++----- 20 files changed, 5 insertions(+), 5 deletions(-) rename pkgs/development/libraries/glibc/{2.18 => 2.19}/builder.sh (100%) rename pkgs/development/libraries/glibc/{2.18 => 2.19}/common.nix (100%) rename pkgs/development/libraries/glibc/{2.18 => 2.19}/cve-2012-4412+4424.patch (100%) rename pkgs/development/libraries/glibc/{2.18 => 2.19}/cve-2013-4237.patch (100%) rename pkgs/development/libraries/glibc/{2.18 => 2.19}/cve-2013-4332.patch (100%) rename pkgs/development/libraries/glibc/{2.18 => 2.19}/cve-2013-4458.patch (100%) rename pkgs/development/libraries/glibc/{2.18 => 2.19}/cve-2013-4788.patch (100%) rename pkgs/development/libraries/glibc/{2.18 => 2.19}/default.nix (100%) rename pkgs/development/libraries/glibc/{2.18 => 2.19}/dont-use-system-ld-so-cache.patch (100%) rename pkgs/development/libraries/glibc/{2.18 => 2.19}/fix_path_attribute_in_getconf.patch (100%) rename pkgs/development/libraries/glibc/{2.18 => 2.19}/glibc-crypt-blowfish.patch (100%) rename pkgs/development/libraries/glibc/{2.18 => 2.19}/glibc-rh739743.patch (100%) rename pkgs/development/libraries/glibc/{2.18 => 2.19}/info.nix (100%) rename pkgs/development/libraries/glibc/{2.18 => 2.19}/locales-builder.sh (100%) rename pkgs/development/libraries/glibc/{2.18 => 2.19}/locales.nix (100%) rename pkgs/development/libraries/glibc/{2.18 => 2.19}/nix-locale-archive.patch (100%) rename pkgs/development/libraries/glibc/{2.18 => 2.19}/rpcgen-path.patch (100%) rename pkgs/development/libraries/glibc/{2.18 => 2.19}/scanf.patch (100%) rename pkgs/development/libraries/glibc/{2.18 => 2.19}/strstr-sse42-hack.patch (100%) diff --git a/pkgs/development/libraries/glibc/2.18/builder.sh b/pkgs/development/libraries/glibc/2.19/builder.sh similarity index 100% rename from pkgs/development/libraries/glibc/2.18/builder.sh rename to pkgs/development/libraries/glibc/2.19/builder.sh diff --git a/pkgs/development/libraries/glibc/2.18/common.nix b/pkgs/development/libraries/glibc/2.19/common.nix similarity index 100% rename from pkgs/development/libraries/glibc/2.18/common.nix rename to pkgs/development/libraries/glibc/2.19/common.nix diff --git a/pkgs/development/libraries/glibc/2.18/cve-2012-4412+4424.patch b/pkgs/development/libraries/glibc/2.19/cve-2012-4412+4424.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.18/cve-2012-4412+4424.patch rename to pkgs/development/libraries/glibc/2.19/cve-2012-4412+4424.patch diff --git a/pkgs/development/libraries/glibc/2.18/cve-2013-4237.patch b/pkgs/development/libraries/glibc/2.19/cve-2013-4237.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.18/cve-2013-4237.patch rename to pkgs/development/libraries/glibc/2.19/cve-2013-4237.patch diff --git a/pkgs/development/libraries/glibc/2.18/cve-2013-4332.patch b/pkgs/development/libraries/glibc/2.19/cve-2013-4332.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.18/cve-2013-4332.patch rename to pkgs/development/libraries/glibc/2.19/cve-2013-4332.patch diff --git a/pkgs/development/libraries/glibc/2.18/cve-2013-4458.patch b/pkgs/development/libraries/glibc/2.19/cve-2013-4458.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.18/cve-2013-4458.patch rename to pkgs/development/libraries/glibc/2.19/cve-2013-4458.patch diff --git a/pkgs/development/libraries/glibc/2.18/cve-2013-4788.patch b/pkgs/development/libraries/glibc/2.19/cve-2013-4788.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.18/cve-2013-4788.patch rename to pkgs/development/libraries/glibc/2.19/cve-2013-4788.patch diff --git a/pkgs/development/libraries/glibc/2.18/default.nix b/pkgs/development/libraries/glibc/2.19/default.nix similarity index 100% rename from pkgs/development/libraries/glibc/2.18/default.nix rename to pkgs/development/libraries/glibc/2.19/default.nix diff --git a/pkgs/development/libraries/glibc/2.18/dont-use-system-ld-so-cache.patch b/pkgs/development/libraries/glibc/2.19/dont-use-system-ld-so-cache.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.18/dont-use-system-ld-so-cache.patch rename to pkgs/development/libraries/glibc/2.19/dont-use-system-ld-so-cache.patch diff --git a/pkgs/development/libraries/glibc/2.18/fix_path_attribute_in_getconf.patch b/pkgs/development/libraries/glibc/2.19/fix_path_attribute_in_getconf.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.18/fix_path_attribute_in_getconf.patch rename to pkgs/development/libraries/glibc/2.19/fix_path_attribute_in_getconf.patch diff --git a/pkgs/development/libraries/glibc/2.18/glibc-crypt-blowfish.patch b/pkgs/development/libraries/glibc/2.19/glibc-crypt-blowfish.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.18/glibc-crypt-blowfish.patch rename to pkgs/development/libraries/glibc/2.19/glibc-crypt-blowfish.patch diff --git a/pkgs/development/libraries/glibc/2.18/glibc-rh739743.patch b/pkgs/development/libraries/glibc/2.19/glibc-rh739743.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.18/glibc-rh739743.patch rename to pkgs/development/libraries/glibc/2.19/glibc-rh739743.patch diff --git a/pkgs/development/libraries/glibc/2.18/info.nix b/pkgs/development/libraries/glibc/2.19/info.nix similarity index 100% rename from pkgs/development/libraries/glibc/2.18/info.nix rename to pkgs/development/libraries/glibc/2.19/info.nix diff --git a/pkgs/development/libraries/glibc/2.18/locales-builder.sh b/pkgs/development/libraries/glibc/2.19/locales-builder.sh similarity index 100% rename from pkgs/development/libraries/glibc/2.18/locales-builder.sh rename to pkgs/development/libraries/glibc/2.19/locales-builder.sh diff --git a/pkgs/development/libraries/glibc/2.18/locales.nix b/pkgs/development/libraries/glibc/2.19/locales.nix similarity index 100% rename from pkgs/development/libraries/glibc/2.18/locales.nix rename to pkgs/development/libraries/glibc/2.19/locales.nix diff --git a/pkgs/development/libraries/glibc/2.18/nix-locale-archive.patch b/pkgs/development/libraries/glibc/2.19/nix-locale-archive.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.18/nix-locale-archive.patch rename to pkgs/development/libraries/glibc/2.19/nix-locale-archive.patch diff --git a/pkgs/development/libraries/glibc/2.18/rpcgen-path.patch b/pkgs/development/libraries/glibc/2.19/rpcgen-path.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.18/rpcgen-path.patch rename to pkgs/development/libraries/glibc/2.19/rpcgen-path.patch diff --git a/pkgs/development/libraries/glibc/2.18/scanf.patch b/pkgs/development/libraries/glibc/2.19/scanf.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.18/scanf.patch rename to pkgs/development/libraries/glibc/2.19/scanf.patch diff --git a/pkgs/development/libraries/glibc/2.18/strstr-sse42-hack.patch b/pkgs/development/libraries/glibc/2.19/strstr-sse42-hack.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.18/strstr-sse42-hack.patch rename to pkgs/development/libraries/glibc/2.19/strstr-sse42-hack.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90e59c96c29e..246caa8ecf7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4197,7 +4197,7 @@ let glfw2 = callPackage ../development/libraries/glfw/2.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; installLocales = config.glibc.locales or false; machHeaders = null; @@ -4205,13 +4205,13 @@ let gccCross = null; }; - glibc_memusage = callPackage ../development/libraries/glibc/2.18 { + glibc_memusage = callPackage ../development/libraries/glibc/2.19 { kernelHeaders = linuxHeaders; installLocales = false; 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"; in { inherit stdenv fetchurl; @@ -4240,9 +4240,9 @@ let 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 = runCommand "${glibc.name}-multi"