From 8dd296f5dbbd5da8b4db2cab2f3410a2d814f0b5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 6 Dec 2007 00:32:21 +0000
Subject: [PATCH] Added Relational FS

svn path=/nixpkgs/trunk/; revision=9865
---
 pkgs/tools/misc/relfs/cvs.2007.12.01.nix | 48 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  8 ++--
 pkgs/top-level/builder-defs.nix          |  1 +
 3 files changed, 54 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/tools/misc/relfs/cvs.2007.12.01.nix

diff --git a/pkgs/tools/misc/relfs/cvs.2007.12.01.nix b/pkgs/tools/misc/relfs/cvs.2007.12.01.nix
new file mode 100644
index 00000000000..146d55e90c6
--- /dev/null
+++ b/pkgs/tools/misc/relfs/cvs.2007.12.01.nix
@@ -0,0 +1,48 @@
+args : with args;
+	with builderDefs {
+	src = /* put a fetchurl here */
+	fetchcvs {
+		url = ":pserver:anonymous@relfs.cvs.sourceforge.net:/cvsroot/relfs";
+		module = "relfs";
+		date = "2007-12-01";
+		sha256 = "ef8e2ebfda6e43240051a7af9417092b2af50ece8b5c6c3fbd908ba91c4fe068";
+	};
+		
+		buildInputs = [ocaml fuse postgresql pcre
+			e2fsprogs gnomevfs pkgconfig GConf];
+		configureFlags = [];
+	} null; /* null is a terminator for sumArgs */
+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 '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 [build doMakeInstall doForceShare doPropagate]);
+	meta = {
+		description = "
+	Relational FS over FUSE.
+";
+	};
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5bac1fc4510..07352fde50d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -674,13 +674,15 @@ rec {
     zlibSupport = !stdenv ? isDietLibC;
   };
 
-  /*relfsFun = lib.sumArgs (selectVersion ../tools/misc/relfs) {
-    inherit fetchcvs stdenv ocaml postgresql fuse builderDefs;
+  relfsFun = lib.sumArgs (selectVersion ../tools/misc/relfs) {
+    inherit fetchcvs stdenv ocaml postgresql fuse pcre
+      builderDefs e2fsprogs pkgconfig;
+    inherit (gnome) gnomevfs GConf;
   };
 
   relfs = relfsFun {
     version = "cvs.2007.12.01";
-  } null;*/
+  } null;
 
   replace = import ../tools/text/replace {
     inherit fetchurl stdenv;
diff --git a/pkgs/top-level/builder-defs.nix b/pkgs/top-level/builder-defs.nix
index 4e6a84a25eb..df7df3e71a0 100644
--- a/pkgs/top-level/builder-defs.nix
+++ b/pkgs/top-level/builder-defs.nix
@@ -179,6 +179,7 @@ args: with args; with stringsWithDeps; with lib;
 	" else if (archiveType s) == "cvs-dir" then "
 		cp -r '${s}' .
 		cd \$(basename ${s})
+		chmod u+rwX -R .
 	" else (abort "unknown archive type : ${s}"))+
 		(if args ? goSrcDir then args.goSrcDir else "")
 	) [minInit];