From 09fbef5e2b0879dd596e7ea1d6eb717b3f9731c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 7 Jul 2009 22:20:53 +0000
Subject: [PATCH] pysqlite 2.5.5.

svn path=/nixpkgs/trunk/; revision=16228
---
 .../python-modules/pysqlite/builder.sh        |  7 ++-
 .../python-modules/pysqlite/default.nix       | 44 ++++++++++++++++---
 2 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pysqlite/builder.sh b/pkgs/development/python-modules/pysqlite/builder.sh
index 04027c22971a..6263ca93d65b 100644
--- a/pkgs/development/python-modules/pysqlite/builder.sh
+++ b/pkgs/development/python-modules/pysqlite/builder.sh
@@ -8,11 +8,14 @@ configurePhase() {
 }
 
 buildPhase() {
-	$python/bin/python setup.py build
+	python setup.py build
 }
 
 installPhase() {
-	$python/bin/python setup.py install --prefix=$out
+	python setup.py install --prefix=$out
+
+	ensureDir "$out/doc"
+	mv -v "$out/pysqlite2-doc" "$out/doc/$name"
 }
 
 genericBuild
diff --git a/pkgs/development/python-modules/pysqlite/default.nix b/pkgs/development/python-modules/pysqlite/default.nix
index 1a29e05132a8..a9fb43dff97c 100644
--- a/pkgs/development/python-modules/pysqlite/default.nix
+++ b/pkgs/development/python-modules/pysqlite/default.nix
@@ -1,12 +1,46 @@
 {stdenv, fetchurl, python, sqlite}:
 
-stdenv.mkDerivation {
-  name = "pysqlite-2.2.2";
+stdenv.mkDerivation rec {
+  name = "pysqlite-2.5.5";
+
   src = fetchurl {
-    url = http://initd.org/pub/software/pysqlite/releases/2.2/2.2.2/pysqlite-2.2.2.tar.gz;
-    md5 = "3260547d3f11c85613b2de8ed529a4fc";
+    url = "http://oss.itsystementwicklung.de/download/pysqlite/2.5/2.5.5/${name}.tar.gz";
+    sha256 = "0kylyjzxc4kd0z3xsvs0i63163kphfh0xcc4f0d0wyck93safz7g";
   };
+
   builder = ./builder.sh;
 
-  inherit stdenv python sqlite;
+  buildInputs = [ python sqlite ];
+
+  inherit stdenv sqlite;
+
+  meta = {
+    homepage = http://pysqlite.org/;
+
+    description = "Python bindings for the SQLite embedded relational database engine";
+
+    longDescription = ''
+      pysqlite is a DB-API 2.0-compliant database interface for SQLite.
+
+      SQLite is a relational database management system contained in
+      a relatively small C library.  It is a public domain project
+      created by D. Richard Hipp.  Unlike the usual client-server
+      paradigm, the SQLite engine is not a standalone process with
+      which the program communicates, but is linked in and thus
+      becomes an integral part of the program.  The library
+      implements most of SQL-92 standard, including transactions,
+      triggers and most of complex queries.
+
+      pysqlite makes this powerful embedded SQL engine available to
+      Python programmers.  It stays compatible with the Python
+      database API specification 2.0 as much as possible, but also
+      exposes most of SQLite's native API, so that it is for example
+      possible to create user-defined SQL functions and aggregates
+      in Python.
+    '';
+
+    license = "revised BSD";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+  };
 }