diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-27 11:34:38 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-10-29 13:42:59 +0100 |
commit | 1b55b07eeb43ba41470eed1ce21991df96110e70 (patch) | |
tree | ff072d1eeedf640261886a76c3f4610b80e9feb1 /pkgs | |
parent | 2ee8b30b64a0ee2837c3630a50ec1a74820b7047 (diff) | |
download | nixlib-1b55b07eeb43ba41470eed1ce21991df96110e70.tar nixlib-1b55b07eeb43ba41470eed1ce21991df96110e70.tar.gz nixlib-1b55b07eeb43ba41470eed1ce21991df96110e70.tar.bz2 nixlib-1b55b07eeb43ba41470eed1ce21991df96110e70.tar.lz nixlib-1b55b07eeb43ba41470eed1ce21991df96110e70.tar.xz nixlib-1b55b07eeb43ba41470eed1ce21991df96110e70.tar.zst nixlib-1b55b07eeb43ba41470eed1ce21991df96110e70.zip |
glibc/2.19 -> glibc
We only have one version of Glibc so no need for a separate directory.
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.nix | 12 |
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 3b077cbb3fd5..3b077cbb3fd5 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 23efc01a3975..23efc01a3975 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 a4f983de8f6c..a4f983de8f6c 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 cbae03425eb9..cbae03425eb9 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 52a94bd0a0d5..52a94bd0a0d5 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 95f537733204..95f537733204 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 fabb6c3ec5e1..fabb6c3ec5e1 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 516f53954ddd..516f53954ddd 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 714e49db5607..714e49db5607 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 a0a8acdab63d..a0a8acdab63d 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 5d0b1a51762e..5d0b1a51762e 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 0a5456ea5c42..0a5456ea5c42 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 e4cdb42dd689..e4cdb42dd689 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 d732e208fa22..d732e208fa22 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 9f9fb86a396d..9f9fb86a396d 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 ad4a34152b65..ad4a34152b65 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 88c8adef9226..88c8adef9226 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 3349449d9163..3349449d9163 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 37237470c9b1..f586b260422a 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; }; |