From 667e2020cc12d629a08491b9a94972ecba324064 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 6 Oct 2011 10:23:23 +0000
Subject: [PATCH] cppunit: dropped obsolete version 1.10
svn path=/nixpkgs/trunk/; revision=29682
---
pkgs/development/libraries/cppunit/1.10.nix | 12 ------------
.../libraries/cppunit/include-cstdlib.patch | 12 ------------
pkgs/top-level/all-packages.nix | 1 -
3 files changed, 25 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 546f2bbba1e0..000000000000
--- 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/include-cstdlib.patch b/pkgs/development/libraries/cppunit/include-cstdlib.patch
deleted file mode 100644
index 8a00c370ce29..000000000000
--- 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 023a05230c04..b8866f8a369d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3168,7 +3168,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 { };