From dfd401259c7b42321896d951ccf030f705fc1cf7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 May 2007 11:49:18 +0000
Subject: [PATCH] * Added cvs2svn. * Berkeley DB 4.5 is now the default.

svn path=/nixpkgs/trunk/; revision=8641
---
 .../version-management/cvs2svn/default.nix    | 25 +++++++++++++++++++
 .../python-modules/bsddb3/default.nix         | 12 +++++++++
 pkgs/top-level/all-packages.nix               | 10 +++++++-
 3 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/version-management/cvs2svn/default.nix
 create mode 100644 pkgs/development/python-modules/bsddb3/default.nix

diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix
new file mode 100644
index 000000000000..e519be927335
--- /dev/null
+++ b/pkgs/applications/version-management/cvs2svn/default.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchurl, python, bsddb3, makeWrapper}:
+
+stdenv.mkDerivation {
+  name = "cvs2svn-1.5.1";
+
+  src = fetchurl {
+    url = http://cvs2svn.tigris.org/files/documents/1462/36129/cvs2svn-1.5.1.tar.gz;
+    md5 = "d1e42ea51b373be0023f2b3f6b80ec01";
+  };
+
+  buildInputs = [python bsddb3];
+
+  buildPhase = "true";
+  installPhase = "
+    python ./setup.py install --prefix=$out
+
+    source ${makeWrapper}
+    mv $out/bin/cvs2svn $out/bin/.orig-cvs2svn
+    makeWrapper $out/bin/.orig-cvs2svn $out/bin/cvs2svn \\
+        --set PYTHONPATH \"$(toPythonPath $out):$(toPythonPath ${bsddb3}):$PYTHONPATH\"
+  ";
+
+  /* !!! maybe we should absolutise the program names in
+     $out/lib/python2.4/site-packages/cvs2svn_lib/config.py. */
+}
\ No newline at end of file
diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix
new file mode 100644
index 000000000000..ce7e0e9eddbe
--- /dev/null
+++ b/pkgs/development/python-modules/bsddb3/default.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, python, db4}:
+
+stdenv.mkDerivation {
+  name = "bsddb3-4.5.0";
+  src = fetchurl {
+    url = http://heanet.dl.sourceforge.net/sourceforge/pybsddb/bsddb3-4.5.0.tar.gz;
+    sha256 = "1h09kij32iikr9racp5p7qrb4li2gf2hs0lyq6d312qarja4d45v";
+  };
+  buildInputs = [python];
+  buildPhase = "true";
+  installPhase = "python ./setup.py install --prefix=$out --berkeley-db=${db4}";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 08941a77c438..d7905dcb1c2a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1223,7 +1223,7 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  db4 = db44;
+  db4 = db45;
 
   db44 = import ../development/libraries/db4/db4-4.4.nix {
     inherit fetchurl stdenv;
@@ -2024,6 +2024,10 @@ rec {
   ### DEVELOPMENT / PYTHON MODULES
 
 
+  bsddb3 = import ../development/python-modules/bsddb3 {
+    inherit fetchurl stdenv python db4;
+  };
+
   psyco = import ../development/python-modules/psyco {
     inherit fetchurl stdenv python;
   };
@@ -2546,6 +2550,10 @@ rec {
     inherit fetchurl stdenv vim;
   };
 
+  cvs2svn = import ../applications/version-management/cvs2svn {
+    inherit fetchurl stdenv python bsddb3 makeWrapper;
+  };
+  
   darcs = import ../applications/version-management/darcs {
     inherit fetchurl stdenv ghc zlib ncurses curl;
   };