From 10d9d4b456be5b4fea96e1a803dabd730c411158 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 Nov 2007 15:32:20 +0000
Subject: [PATCH] * Dietlibc 0.31

svn path=/nixpkgs/branches/stdenv-updates/; revision=9770
---
 pkgs/os-specific/linux/dietlibc/default.nix | 16 +++++++++-------
 pkgs/top-level/all-packages.nix             |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/dietlibc/default.nix b/pkgs/os-specific/linux/dietlibc/default.nix
index 9a501188d535..a98c7608820d 100644
--- a/pkgs/os-specific/linux/dietlibc/default.nix
+++ b/pkgs/os-specific/linux/dietlibc/default.nix
@@ -3,10 +3,10 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation {
-  name = "dietlibc-0.30";
+  name = "dietlibc-0.31";
   src = fetchurl {
-    url = mirror://kernel/linux/libs/dietlibc/dietlibc-0.30.tar.bz2;
-    md5 = "2465d652fff6f1fad3da3b98e60e83c9";
+    url = mirror://kernel/linux/libs/dietlibc/dietlibc-0.31.tar.bz2;
+    sha256 = "1kanrwjcmqs28z8arj9py9mbgjx5rgvi7il484pgaizpcxm3sqcr";
   };
   builder = ./builder.sh;
   
@@ -24,14 +24,16 @@ stdenv.mkDerivation {
     # Remove them.
     ./no-wchar.patch
 
-    # Fix to get DNS resolution to work on 64-bit platforms.  Taken
-    # from 0.31 CVS.
-    ./dns64.patch
-
     # Get lseek64 working on x86_64.  From
     # http://svn.annvix.org/cgi-bin/viewvc.cgi/packages/releases/2.0-CURRENT/dietlibc/SOURCES
     ./x86_64-lseek64.patch
     #./x86_64-stat64.patch
 
   ];
+
+  meta = {
+    homepage = http://www.fefe.de/dietlibc/;
+    description = "A small implementation of the C library";
+    license = "GPL";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a3c616ce1fd..a318fdf442d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2827,7 +2827,7 @@ rec {
   dietlibc = import ../os-specific/linux/dietlibc {
     inherit fetchurl glibc;
     # Dietlibc 0.30 doesn't compile on PPC with GCC 4.1, bus GCC 3.4 works.
-   stdenv = if stdenv.system == "powerpc-linux" then overrideGCC stdenv gcc34 else stdenv;
+    stdenv = if stdenv.system == "powerpc-linux" then overrideGCC stdenv gcc34 else stdenv;
   };
 
   e2fsprogs = import ../os-specific/linux/e2fsprogs {