public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

synchronize with trunk

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29685
This commit is contained in:
Peter Simons 2011-10-06 10:27:33 +00:00
parent f68e44a602
commit ba6cc24ca8
5 changed files with 24 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/cppunit/1.10.nix
View File

@ -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];
}

7
pkgs/development/libraries/cppunit/default.nix
View File

@ -7,4 +7,11 @@ stdenv.mkDerivation {
url = mirror://sf/cppunit/cppunit-1.12.0.tar.gz; url = mirror://sf/cppunit/cppunit-1.12.0.tar.gz;
sha256 = "07zyyx5dyai94y8r8va28971f5mw84mb93xx9pm6m4ddpj6c79cq"; 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 ];
};
} }

12
pkgs/development/libraries/cppunit/include-cstdlib.patch
View File

@ -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

24
pkgs/os-specific/linux/libsmbios/default.nix
View File

@ -1,11 +1,14 @@
{ stdenv, fetchurl, pkgconfig, libxml2, perl }: { stdenv, fetchurl, pkgconfig, libxml2, perl }:
stdenv.mkDerivation rec { let
name = "libsmbios-2.2.19"; name = "libsmbios-2.2.28";
in
stdenv.mkDerivation {
inherit name;
src = fetchurl { src = fetchurl {
url = "http://linux.dell.com/libsmbios/download/libsmbios/${name}/${name}.tar.gz"; url = "http://linux.dell.com/libsmbios/download/libsmbios/${name}/${name}.tar.gz";
sha256 = "0f4wnjml734ssg583r448ypax7vf3f9n8gybzvzg170lc3byayhv"; sha256 = "03m0n834w49acwbf5cf9ync1ksnn2jkwaysvy7584y60qpmngb91";
}; };
buildInputs = [ pkgconfig libxml2 perl ]; buildInputs = [ pkgconfig libxml2 perl ];
@ -16,13 +19,16 @@ stdenv.mkDerivation rec {
# It forgets to install headers. # It forgets to install headers.
postInstall = postInstall =
'' ''
cp -a src/include/* $out/include cp -va "src/include/"* "$out/include/"
cp -a out/public-include/* $out/include cp -va "out/public-include/"* "$out/include/"
''; # */ '';
meta = { meta = {
homepage = http://linux.dell.com/libsmbios/main/index.html; homepage = "http://linux.dell.com/libsmbios/main";
description = "A library to obtain BIOS information"; description = "a library to obtain BIOS information";
license = "GPLv2+"; # alternatively, under the Open Software License version 2.1 license = stdenv.lib.licenses.gpl2Plus; # alternatively, under the Open Software License version 2.1
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.simons ];
}; };
} }

1
pkgs/top-level/all-packages.nix
View File

@ -3178,7 +3178,6 @@ let
ctl = callPackage ../development/libraries/ctl { }; ctl = callPackage ../development/libraries/ctl { };
cppunit = callPackage ../development/libraries/cppunit { }; cppunit = callPackage ../development/libraries/cppunit { };
cppunit_1_10 = callPackage ../development/libraries/cppunit/1.10.nix { };
cracklib = callPackage ../development/libraries/cracklib { }; cracklib = callPackage ../development/libraries/cracklib { };