From 1b55b07eeb43ba41470eed1ce21991df96110e70 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 27 Oct 2014 11:34:38 +0100 Subject: [PATCH] glibc/2.19 -> glibc We only have one version of Glibc so no need for a separate directory. --- .../libraries/glibc/{2.19 => }/builder.sh | 0 .../libraries/glibc/{2.19 => }/common.nix | 0 .../libraries/glibc/{2.19 => }/cve-2014-0475.patch | 0 .../libraries/glibc/{2.19 => }/cve-2014-5119.patch | 0 .../libraries/glibc/{2.19 => }/default.nix | 0 .../{2.19 => }/dont-use-system-ld-so-cache.patch | 0 .../{2.19 => }/dont-use-system-ld-so-preload.patch | 0 .../libraries/glibc/{2.19 => }/fix-math.patch | 0 .../{2.19 => }/fix_path_attribute_in_getconf.patch | 0 .../glibc/{2.19 => }/glibc-crypt-blowfish.patch | 0 .../glibc-remove-date-from-compilation-banner.patch | 0 .../{2.19 => }/glibc-remove-datetime-from-nscd.patch | 0 pkgs/development/libraries/glibc/{2.19 => }/info.nix | 0 .../libraries/glibc/{2.19 => }/locales-builder.sh | 0 .../libraries/glibc/{2.19 => }/locales.nix | 0 .../development/libraries/glibc/{2.19 => }/multi.nix | 0 .../glibc/{2.19 => }/nix-locale-archive.patch | 0 .../libraries/glibc/{2.19 => }/rpcgen-path.patch | 0 pkgs/top-level/all-packages.nix | 12 ++++++------ 19 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/development/libraries/glibc/{2.19 => }/builder.sh (100%) rename pkgs/development/libraries/glibc/{2.19 => }/common.nix (100%) rename pkgs/development/libraries/glibc/{2.19 => }/cve-2014-0475.patch (100%) rename pkgs/development/libraries/glibc/{2.19 => }/cve-2014-5119.patch (100%) rename pkgs/development/libraries/glibc/{2.19 => }/default.nix (100%) rename pkgs/development/libraries/glibc/{2.19 => }/dont-use-system-ld-so-cache.patch (100%) rename pkgs/development/libraries/glibc/{2.19 => }/dont-use-system-ld-so-preload.patch (100%) rename pkgs/development/libraries/glibc/{2.19 => }/fix-math.patch (100%) rename pkgs/development/libraries/glibc/{2.19 => }/fix_path_attribute_in_getconf.patch (100%) rename pkgs/development/libraries/glibc/{2.19 => }/glibc-crypt-blowfish.patch (100%) rename pkgs/development/libraries/glibc/{2.19 => }/glibc-remove-date-from-compilation-banner.patch (100%) rename pkgs/development/libraries/glibc/{2.19 => }/glibc-remove-datetime-from-nscd.patch (100%) rename pkgs/development/libraries/glibc/{2.19 => }/info.nix (100%) rename pkgs/development/libraries/glibc/{2.19 => }/locales-builder.sh (100%) rename pkgs/development/libraries/glibc/{2.19 => }/locales.nix (100%) rename pkgs/development/libraries/glibc/{2.19 => }/multi.nix (100%) rename pkgs/development/libraries/glibc/{2.19 => }/nix-locale-archive.patch (100%) rename pkgs/development/libraries/glibc/{2.19 => }/rpcgen-path.patch (100%) diff --git a/pkgs/development/libraries/glibc/2.19/builder.sh b/pkgs/development/libraries/glibc/builder.sh similarity index 100% rename from pkgs/development/libraries/glibc/2.19/builder.sh rename to pkgs/development/libraries/glibc/builder.sh diff --git a/pkgs/development/libraries/glibc/2.19/common.nix b/pkgs/development/libraries/glibc/common.nix similarity index 100% rename from pkgs/development/libraries/glibc/2.19/common.nix rename to pkgs/development/libraries/glibc/common.nix diff --git a/pkgs/development/libraries/glibc/2.19/cve-2014-0475.patch b/pkgs/development/libraries/glibc/cve-2014-0475.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.19/cve-2014-0475.patch rename to pkgs/development/libraries/glibc/cve-2014-0475.patch diff --git a/pkgs/development/libraries/glibc/2.19/cve-2014-5119.patch b/pkgs/development/libraries/glibc/cve-2014-5119.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.19/cve-2014-5119.patch rename to pkgs/development/libraries/glibc/cve-2014-5119.patch diff --git a/pkgs/development/libraries/glibc/2.19/default.nix b/pkgs/development/libraries/glibc/default.nix similarity index 100% rename from pkgs/development/libraries/glibc/2.19/default.nix rename to pkgs/development/libraries/glibc/default.nix diff --git a/pkgs/development/libraries/glibc/2.19/dont-use-system-ld-so-cache.patch b/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.19/dont-use-system-ld-so-cache.patch rename to pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch diff --git a/pkgs/development/libraries/glibc/2.19/dont-use-system-ld-so-preload.patch b/pkgs/development/libraries/glibc/dont-use-system-ld-so-preload.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.19/dont-use-system-ld-so-preload.patch rename to pkgs/development/libraries/glibc/dont-use-system-ld-so-preload.patch diff --git a/pkgs/development/libraries/glibc/2.19/fix-math.patch b/pkgs/development/libraries/glibc/fix-math.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.19/fix-math.patch rename to pkgs/development/libraries/glibc/fix-math.patch diff --git a/pkgs/development/libraries/glibc/2.19/fix_path_attribute_in_getconf.patch b/pkgs/development/libraries/glibc/fix_path_attribute_in_getconf.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.19/fix_path_attribute_in_getconf.patch rename to pkgs/development/libraries/glibc/fix_path_attribute_in_getconf.patch diff --git a/pkgs/development/libraries/glibc/2.19/glibc-crypt-blowfish.patch b/pkgs/development/libraries/glibc/glibc-crypt-blowfish.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.19/glibc-crypt-blowfish.patch rename to pkgs/development/libraries/glibc/glibc-crypt-blowfish.patch diff --git a/pkgs/development/libraries/glibc/2.19/glibc-remove-date-from-compilation-banner.patch b/pkgs/development/libraries/glibc/glibc-remove-date-from-compilation-banner.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.19/glibc-remove-date-from-compilation-banner.patch rename to pkgs/development/libraries/glibc/glibc-remove-date-from-compilation-banner.patch diff --git a/pkgs/development/libraries/glibc/2.19/glibc-remove-datetime-from-nscd.patch b/pkgs/development/libraries/glibc/glibc-remove-datetime-from-nscd.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.19/glibc-remove-datetime-from-nscd.patch rename to pkgs/development/libraries/glibc/glibc-remove-datetime-from-nscd.patch diff --git a/pkgs/development/libraries/glibc/2.19/info.nix b/pkgs/development/libraries/glibc/info.nix similarity index 100% rename from pkgs/development/libraries/glibc/2.19/info.nix rename to pkgs/development/libraries/glibc/info.nix diff --git a/pkgs/development/libraries/glibc/2.19/locales-builder.sh b/pkgs/development/libraries/glibc/locales-builder.sh similarity index 100% rename from pkgs/development/libraries/glibc/2.19/locales-builder.sh rename to pkgs/development/libraries/glibc/locales-builder.sh diff --git a/pkgs/development/libraries/glibc/2.19/locales.nix b/pkgs/development/libraries/glibc/locales.nix similarity index 100% rename from pkgs/development/libraries/glibc/2.19/locales.nix rename to pkgs/development/libraries/glibc/locales.nix diff --git a/pkgs/development/libraries/glibc/2.19/multi.nix b/pkgs/development/libraries/glibc/multi.nix similarity index 100% rename from pkgs/development/libraries/glibc/2.19/multi.nix rename to pkgs/development/libraries/glibc/multi.nix diff --git a/pkgs/development/libraries/glibc/2.19/nix-locale-archive.patch b/pkgs/development/libraries/glibc/nix-locale-archive.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.19/nix-locale-archive.patch rename to pkgs/development/libraries/glibc/nix-locale-archive.patch diff --git a/pkgs/development/libraries/glibc/2.19/rpcgen-path.patch b/pkgs/development/libraries/glibc/rpcgen-path.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.19/rpcgen-path.patch rename to pkgs/development/libraries/glibc/rpcgen-path.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 37237470c9b..f586b260422 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5072,7 +5072,7 @@ let glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; glfw3 = callPackage ../development/libraries/glfw/3.x.nix { }; - glibc = callPackage ../development/libraries/glibc/2.19 { + glibc = callPackage ../development/libraries/glibc { kernelHeaders = linuxHeaders; installLocales = config.glibc.locales or false; machHeaders = null; @@ -5080,13 +5080,13 @@ let gccCross = null; }; - glibc_memusage = callPackage ../development/libraries/glibc/2.19 { + glibc_memusage = callPackage ../development/libraries/glibc { kernelHeaders = linuxHeaders; installLocales = false; withGd = true; }; - glibcCross = forceNativeDrv (makeOverridable (import ../development/libraries/glibc/2.19) + glibcCross = forceNativeDrv (makeOverridable (import ../development/libraries/glibc) (let crossGNU = crossSystem != null && crossSystem.config == "i586-pc-gnu"; in { inherit stdenv fetchurl; @@ -5114,11 +5114,11 @@ let installLocales = config.glibc.locales or false; }; - glibcLocales = callPackage ../development/libraries/glibc/2.19/locales.nix { }; + glibcLocales = callPackage ../development/libraries/glibc/locales.nix { }; - glibcInfo = callPackage ../development/libraries/glibc/2.19/info.nix { }; + glibcInfo = callPackage ../development/libraries/glibc/info.nix { }; - glibc_multi = callPackage ../development/libraries/glibc/2.19/multi.nix { + glibc_multi = callPackage ../development/libraries/glibc/multi.nix { inherit glibc; glibc32 = (import ./all-packages.nix {system = "i686-linux";}).glibc; };