From ba6cc24ca8c71787226964aaf9d7b0e9d7cd4284 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Oct 2011 10:27:33 +0000
Subject: [PATCH] synchronize with trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=29685
---
 pkgs/development/libraries/cppunit/1.10.nix   | 12 ---------
 .../development/libraries/cppunit/default.nix |  9 ++++++-
 .../libraries/cppunit/include-cstdlib.patch   | 12 ---------
 pkgs/os-specific/linux/libsmbios/default.nix  | 26 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  1 -
 5 files changed, 24 insertions(+), 36 deletions(-)
 delete mode 100644 pkgs/development/libraries/cppunit/1.10.nix
 delete mode 100644 pkgs/development/libraries/cppunit/include-cstdlib.patch

diff --git a/pkgs/development/libraries/cppunit/1.10.nix b/pkgs/development/libraries/cppunit/1.10.nix
deleted file mode 100644
index 546f2bbba1e..00000000000
--- a/pkgs/development/libraries/cppunit/1.10.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl}:
-
-stdenv.mkDerivation {
-  name = "cppunit-1.10.0";
-  
-  src = fetchurl {
-    url = mirror://sf/cppunit/cppunit-1.10.0.tar.gz;
-    sha256 = "08w5ljd3rbz6wzipzxqx1ma779b6k930iwjrg4bckddigrq897bg";
-  };
-
-  patches = [./include-cstdlib.patch];
-}
diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix
index 5e55bd51bcd..dbbcf4388c5 100644
--- a/pkgs/development/libraries/cppunit/default.nix
+++ b/pkgs/development/libraries/cppunit/default.nix
@@ -2,9 +2,16 @@
 
 stdenv.mkDerivation {
   name = "cppunit-1.12.0";
-  
+
   src = fetchurl {
     url = mirror://sf/cppunit/cppunit-1.12.0.tar.gz;
     sha256 = "07zyyx5dyai94y8r8va28971f5mw84mb93xx9pm6m4ddpj6c79cq";
   };
+
+  meta = {
+    homepage = "http://sourceforge.net/apps/mediawiki/cppunit/";
+    description = "C++ unit testing framework";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.simons ];
+  };
 }
diff --git a/pkgs/development/libraries/cppunit/include-cstdlib.patch b/pkgs/development/libraries/cppunit/include-cstdlib.patch
deleted file mode 100644
index 8a00c370ce2..00000000000
--- a/pkgs/development/libraries/cppunit/include-cstdlib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rc cppunit-1.10.0/src/cppunit/TypeInfoHelper.cpp cppunit-1.10.0-2/src/cppunit/TypeInfoHelper.cpp
-*** cppunit-1.10.0/src/cppunit/TypeInfoHelper.cpp	2004-02-18 21:45:44.000000000 +0100
---- cppunit-1.10.0-2/src/cppunit/TypeInfoHelper.cpp	2011-04-13 09:20:57.000000000 +0200
-***************
-*** 1,5 ****
---- 1,6 ----
-  #include <cppunit/Portability.h>
-  #include <cppunit/extensions/TypeInfoHelper.h>
-+ #include <cstdlib>
-  
-  #if CPPUNIT_HAVE_RTTI
-  
diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix
index 41b440a4898..7b7e1c96ab5 100644
--- a/pkgs/os-specific/linux/libsmbios/default.nix
+++ b/pkgs/os-specific/linux/libsmbios/default.nix
@@ -1,13 +1,16 @@
 { stdenv, fetchurl, pkgconfig, libxml2, perl }:
 
-stdenv.mkDerivation rec {
-  name = "libsmbios-2.2.19";
+let
+  name = "libsmbios-2.2.28";
+in
+stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
     url = "http://linux.dell.com/libsmbios/download/libsmbios/${name}/${name}.tar.gz";
-    sha256 = "0f4wnjml734ssg583r448ypax7vf3f9n8gybzvzg170lc3byayhv";
+    sha256 = "03m0n834w49acwbf5cf9ync1ksnn2jkwaysvy7584y60qpmngb91";
   };
-  
+
   buildInputs = [ pkgconfig libxml2 perl ];
 
   # It tries to install some Python stuff even when Python is disabled.
@@ -16,13 +19,16 @@ stdenv.mkDerivation rec {
   # It forgets to install headers.
   postInstall =
     ''
-      cp -a src/include/* $out/include
-      cp -a out/public-include/* $out/include
-    ''; # */
+      cp -va "src/include/"* "$out/include/"
+      cp -va "out/public-include/"* "$out/include/"
+    '';
 
   meta = {
-    homepage = http://linux.dell.com/libsmbios/main/index.html;
-    description = "A library to obtain BIOS information";
-    license = "GPLv2+"; # alternatively, under the Open Software License version 2.1
+    homepage = "http://linux.dell.com/libsmbios/main";
+    description = "a library to obtain BIOS information";
+    license = stdenv.lib.licenses.gpl2Plus; # alternatively, under the Open Software License version 2.1
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d2718d53b63..6ecbe6fadc7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3178,7 +3178,6 @@ let
   ctl = callPackage ../development/libraries/ctl { };
 
   cppunit = callPackage ../development/libraries/cppunit { };
-  cppunit_1_10 = callPackage ../development/libraries/cppunit/1.10.nix { };
 
   cracklib = callPackage ../development/libraries/cracklib { };