From b20aba1d926a96e15cfa0842e136e4ebf8e91799 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 7 Mar 2008 06:11:08 +0000
Subject: [PATCH] Updated: RelFS. Added DictDB aggregation.

svn path=/nixpkgs/trunk/; revision=11006
---
 pkgs/tools/misc/relfs/cvs.2007.12.01.nix |  2 +-
 pkgs/tools/misc/relfs/cvs.2008.03.05.nix | 53 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  6 ++-
 3 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/misc/relfs/cvs.2008.03.05.nix

diff --git a/pkgs/tools/misc/relfs/cvs.2007.12.01.nix b/pkgs/tools/misc/relfs/cvs.2007.12.01.nix
index 5ae35b913ff..07b17bc2d15 100644
--- a/pkgs/tools/misc/relfs/cvs.2007.12.01.nix
+++ b/pkgs/tools/misc/relfs/cvs.2007.12.01.nix
@@ -5,7 +5,7 @@ args : with args;
 		cvsRoot = ":pserver:anonymous@relfs.cvs.sourceforge.net:/cvsroot/relfs";
 		module = "relfs";
 		date = "2007-12-01";
-		sha256 = "ef8e2ebfda6e43240051a7af9417092b2af50ece8b5c6c3fbd908ba91c4fe068";
+		sha256 = "39d97d0aa16b8bc953b2ef5f6308e9f9eda300c1de8a7acb6f8c8e5897c0c7b5";
 	};
 		
 		buildInputs = [ocaml fuse postgresql pcre
diff --git a/pkgs/tools/misc/relfs/cvs.2008.03.05.nix b/pkgs/tools/misc/relfs/cvs.2008.03.05.nix
new file mode 100644
index 00000000000..ca4888d117a
--- /dev/null
+++ b/pkgs/tools/misc/relfs/cvs.2008.03.05.nix
@@ -0,0 +1,53 @@
+
+args : with args;
+	let localDefs = builderDefs {
+	src = /* put a fetchurl here */
+	if args ? src then args.src else fetchcvs {
+		cvsRoot = ":pserver:anonymous@relfs.cvs.sourceforge.net:/cvsroot/relfs";
+		module = "relfs";
+		date = "2008-03-05";
+		sha256 = "949f8eff7e74ff2666cccf8a1efbfcce8d54bc41bec6ad6db8c029de7ca832a3";
+	};
+		
+		buildInputs = [ocaml fuse postgresql pcre
+			e2fsprogs gnomevfs pkgconfig GConf];
+		configureFlags = [];
+	} null; /* null is a terminator for sumArgs */
+	in with localDefs;
+let build = FullDepEntry ("
+	cd deps 
+	sed -e 's/^CPP/#&/ ; s/^# CPP=gcc/CPP=gcc/' -i Makefile.camlidl
+	make 
+	cd ../src
+	sed -e 's/NULL\\|FALSE/0/g' -i Mimetype_lib.c
+	sed -e 's@/usr/local/@'\$out/'@' -i Makefile
+	sed -e '/install:/a\\\tmkdir -p '\$out'/share' -i Makefile
+	make
+	mkdir -p \$out/bin
+	echo '
+		createuser -A -D \$1
+		dropdb relfs_\$1 ; 
+		rm -rf /tmp/relfs-\$1-tmp;  
+		mkdir /tmp/relfs-\$1-tmp;  
+		USER=\$1 relfs -f -s /tmp/relfs-raskin-tmp  & 
+		sleep 1 && 
+		kill -15 \${!};
+		rm -rf /tmp/relfs-\$1-tmp ; 
+		psql -d relfs_\$1 <<< \"ALTER DATABASE relfs_raskin OWNER TO raskin; 
+			ALTER TABLE obj OWNER TO \$1; 
+			ALTER TABLE obj_mimetype OWNER TO \$1; 
+			ALTER TABLE membership OWNER TO \$1;\"' > \$out/bin/relfs_grant;
+	chmod a+x \$out/bin/relfs_grant;
+") [minInit doUnpack addInputs];
+in
+stdenv.mkDerivation rec {
+	name = "relfs-"+version;
+	builder = writeScript (name + "-builder")
+		(textClosure localDefs [build doMakeInstall doForceShare doPropagate]);
+	meta = {
+		description = "
+	Relational FS over FUSE.
+";
+		inherit src;
+	};
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ba8163cc97..c046a8b202a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -836,7 +836,7 @@ rec {
     zlibSupport = !stdenv ? isDietLibC;
   };
 
-  relfsFun = lib.sumArgs (selectVersion ../tools/misc/relfs "cvs.2007.12.01") {
+  relfsFun = lib.sumArgs (selectVersion ../tools/misc/relfs "cvs.2008.03.05") {
     inherit fetchcvs stdenv ocaml postgresql fuse pcre
       builderDefs e2fsprogs pkgconfig;
     inherit (gnome) gnomevfs GConf;
@@ -3733,6 +3733,10 @@ rec {
     inherit builderDefs;
   });
 
+  dictDBCollector = import ../servers/dict/dictd-db-collector.nix {
+    inherit stdenv lib dict;
+  };
+
   dovecot = import ../servers/mail/dovecot {
     inherit fetchurl stdenv ;
   };