summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/glibc/builder.sh (renamed from pkgs/development/libraries/glibc/2.19/builder.sh)0
-rw-r--r--pkgs/development/libraries/glibc/common.nix (renamed from pkgs/development/libraries/glibc/2.19/common.nix)0
-rw-r--r--pkgs/development/libraries/glibc/cve-2014-0475.patch (renamed from pkgs/development/libraries/glibc/2.19/cve-2014-0475.patch)0
-rw-r--r--pkgs/development/libraries/glibc/cve-2014-5119.patch (renamed from pkgs/development/libraries/glibc/2.19/cve-2014-5119.patch)0
-rw-r--r--pkgs/development/libraries/glibc/default.nix (renamed from pkgs/development/libraries/glibc/2.19/default.nix)0
-rw-r--r--pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch (renamed from pkgs/development/libraries/glibc/2.19/dont-use-system-ld-so-cache.patch)0
-rw-r--r--pkgs/development/libraries/glibc/dont-use-system-ld-so-preload.patch (renamed from pkgs/development/libraries/glibc/2.19/dont-use-system-ld-so-preload.patch)0
-rw-r--r--pkgs/development/libraries/glibc/fix-math.patch (renamed from pkgs/development/libraries/glibc/2.19/fix-math.patch)0
-rw-r--r--pkgs/development/libraries/glibc/fix_path_attribute_in_getconf.patch (renamed from pkgs/development/libraries/glibc/2.19/fix_path_attribute_in_getconf.patch)0
-rw-r--r--pkgs/development/libraries/glibc/glibc-crypt-blowfish.patch (renamed from pkgs/development/libraries/glibc/2.19/glibc-crypt-blowfish.patch)0
-rw-r--r--pkgs/development/libraries/glibc/glibc-remove-date-from-compilation-banner.patch (renamed from pkgs/development/libraries/glibc/2.19/glibc-remove-date-from-compilation-banner.patch)0
-rw-r--r--pkgs/development/libraries/glibc/glibc-remove-datetime-from-nscd.patch (renamed from pkgs/development/libraries/glibc/2.19/glibc-remove-datetime-from-nscd.patch)0
-rw-r--r--pkgs/development/libraries/glibc/info.nix (renamed from pkgs/development/libraries/glibc/2.19/info.nix)0
-rw-r--r--pkgs/development/libraries/glibc/locales-builder.sh (renamed from pkgs/development/libraries/glibc/2.19/locales-builder.sh)0
-rw-r--r--pkgs/development/libraries/glibc/locales.nix (renamed from pkgs/development/libraries/glibc/2.19/locales.nix)0
-rw-r--r--pkgs/development/libraries/glibc/multi.nix (renamed from pkgs/development/libraries/glibc/2.19/multi.nix)0
-rw-r--r--pkgs/development/libraries/glibc/nix-locale-archive.patch (renamed from pkgs/development/libraries/glibc/2.19/nix-locale-archive.patch)0
-rw-r--r--pkgs/development/libraries/glibc/rpcgen-path.patch (renamed from pkgs/development/libraries/glibc/2.19/rpcgen-path.patch)0
-rw-r--r--pkgs/top-level/all-packages.nix12
19 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/libraries/glibc/2.19/builder.sh b/pkgs/development/libraries/glibc/builder.sh
index 3b077cbb3fd..3b077cbb3fd 100644
--- a/pkgs/development/libraries/glibc/2.19/builder.sh
+++ b/pkgs/development/libraries/glibc/builder.sh
diff --git a/pkgs/development/libraries/glibc/2.19/common.nix b/pkgs/development/libraries/glibc/common.nix
index 23efc01a397..23efc01a397 100644
--- a/pkgs/development/libraries/glibc/2.19/common.nix
+++ b/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
index a4f983de8f6..a4f983de8f6 100644
--- a/pkgs/development/libraries/glibc/2.19/cve-2014-0475.patch
+++ b/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
index cbae03425eb..cbae03425eb 100644
--- a/pkgs/development/libraries/glibc/2.19/cve-2014-5119.patch
+++ b/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
index 52a94bd0a0d..52a94bd0a0d 100644
--- a/pkgs/development/libraries/glibc/2.19/default.nix
+++ b/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
index 95f53773320..95f53773320 100644
--- 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
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
index fabb6c3ec5e..fabb6c3ec5e 100644
--- 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
diff --git a/pkgs/development/libraries/glibc/2.19/fix-math.patch b/pkgs/development/libraries/glibc/fix-math.patch
index 516f53954dd..516f53954dd 100644
--- a/pkgs/development/libraries/glibc/2.19/fix-math.patch
+++ b/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
index 714e49db560..714e49db560 100644
--- a/pkgs/development/libraries/glibc/2.19/fix_path_attribute_in_getconf.patch
+++ b/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
index a0a8acdab63..a0a8acdab63 100644
--- a/pkgs/development/libraries/glibc/2.19/glibc-crypt-blowfish.patch
+++ b/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
index 5d0b1a51762..5d0b1a51762 100644
--- 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
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
index 0a5456ea5c4..0a5456ea5c4 100644
--- a/pkgs/development/libraries/glibc/2.19/glibc-remove-datetime-from-nscd.patch
+++ b/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
index e4cdb42dd68..e4cdb42dd68 100644
--- a/pkgs/development/libraries/glibc/2.19/info.nix
+++ b/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
index d732e208fa2..d732e208fa2 100644
--- a/pkgs/development/libraries/glibc/2.19/locales-builder.sh
+++ b/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
index 9f9fb86a396..9f9fb86a396 100644
--- a/pkgs/development/libraries/glibc/2.19/locales.nix
+++ b/pkgs/development/libraries/glibc/locales.nix
diff --git a/pkgs/development/libraries/glibc/2.19/multi.nix b/pkgs/development/libraries/glibc/multi.nix
index ad4a34152b6..ad4a34152b6 100644
--- a/pkgs/development/libraries/glibc/2.19/multi.nix
+++ b/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
index 88c8adef922..88c8adef922 100644
--- a/pkgs/development/libraries/glibc/2.19/nix-locale-archive.patch
+++ b/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
index 3349449d916..3349449d916 100644
--- a/pkgs/development/libraries/glibc/2.19/rpcgen-path.patch
+++ b/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;
   };