From 1df4221cb33b5c8433779a91916d0c074f1c72dc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Jun 2009 14:14:58 +0000
Subject: [PATCH] * klibc 1.5.15.  Fixes a segfault in cpio.

svn path=/nixpkgs/trunk/; revision=16020
---
 pkgs/os-specific/linux/klibc/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix          | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix
index 3a92c2f4d29..7f4229efe85 100644
--- a/pkgs/os-specific/linux/klibc/default.nix
+++ b/pkgs/os-specific/linux/klibc/default.nix
@@ -2,14 +2,14 @@
 
 assert stdenv.isLinux;
 
-let version = "1.5"; in
+let version = "1.5.15"; in
 
 stdenv.mkDerivation {
   name = "klibc-${version}";
 
   src = fetchurl {
-    url = "mirror://kernel/linux/libs/klibc/klibc-${version}.tar.bz2";
-    sha256 = "1izhf8kscjymsvsvhcqw9awnmp94vwv70zdj09srg9bkpjj0n017";
+    url = "mirror://kernel/linux/libs/klibc/Testing/klibc-${version}.tar.bz2";
+    sha256 = "1x401wmjca6zkyikf9xz45b3wb1hnj0m2s9in1sg6xdhi3pk8lwb";
   };
   
   makeFlags = ["V=1" "prefix=$out" "SHLIBDIR=$out/lib"];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2af399d1e89..4fe40b6d6b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5248,12 +5248,12 @@ let
     inherit fetchurl stdenv bison flex perl;
   };
 
-  klibc = composedArgsAndFun (import ../os-specific/linux/klibc) {
+  klibc = makeOverridable (import ../os-specific/linux/klibc) {
     inherit fetchurl stdenv perl bison mktemp;
     kernelHeaders = glibc.kernelHeaders;
   };
 
-  klibcShrunk = composedArgsAndFun (import ../os-specific/linux/klibc/shrunk.nix) {
+  klibcShrunk = makeOverridable (import ../os-specific/linux/klibc/shrunk.nix) {
     inherit stdenv klibc;
   };