* Reiser4 stuff.

svn path=/nixpkgs/branches/stdenv-updates/; revision=10586

pkgs/development/libraries/libaal/default.nix

@@ -0,0 +1,19 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "libaal-1.0.5";
+
+  src = fetchurl {
+    url = http://chichkin_i.zelnet.ru/namesys/libaal-1.0.5.tar.gz;
+    sha256 = "109f464hxwms90mpczc7h7lmrdlcmlglabkzh86h25xrlxxdn6pz";
+  };
+
+  preInstall = ''
+    substituteInPlace Makefile --replace ./run-ldconfig true
+  '';
+
+  meta = {
+    homepage = http://www.namesys.com/;
+    description = "Support library for Reiser4";
+  };
+}

pkgs/os-specific/linux/reiser4progs/default.nix

@@ -0,0 +1,21 @@
+{stdenv, fetchurl, libaal}:
+
+stdenv.mkDerivation {
+  name = "reiser4progs-1.0.6";
+
+  src = fetchurl {
+    url = http://chichkin_i.zelnet.ru/namesys/reiser4progs-1.0.6.tar.gz;
+    sha256 = "0x6m6px19hz54r8q4wwpf437qmqh44c5ddw9846isr64zs2rpld0";
+  };
+
+  buildInputs = [libaal];
+
+  preInstall = ''
+    substituteInPlace Makefile --replace ./run-ldconfig true
+  '';
+
+  meta = {
+    homepage = http://www.namesys.com/;
+    description = "Reiser4 utilities";
+  };
+}

pkgs/os-specific/linux/reiserfsprogs/default.nix

@@ -2,15 +2,16 @@ args: with args;
 
 stdenv.mkDerivation {
   name = "reiserfsprogs-3.6.19";
+
   src = fetchurl {
-      url = ftp://ftp.namesys.com/pub/reiserfsprogs/reiserfsprogs-3.6.19.tar.gz;
-      sha256 = "1gv8gr0l5l2j52540y2wj9c9h7fn0r3vabykf95748ydmr9jr1n0";
-    };
+    url = http://chichkin_i.zelnet.ru/namesys/reiserfsprogs-3.6.19.tar.gz;
+    sha256 = "1gv8gr0l5l2j52540y2wj9c9h7fn0r3vabykf95748ydmr9jr1n0";
+  };
 
   patches = [./headers-fix.patch];
   meta = {
-  homepage=http://www.namesys.com/;
-  description="Reiserfs Utilities";
-  license="GPL-2";
+    homepage = http://www.namesys.com/;
+    description = "Reiserfs utilities";
+    license = "GPL-2";
   };
 }

pkgs/top-level/all-packages.nix

@@ -2142,6 +2142,10 @@ rec {
     inherit (xlibs) libXp libXau;
   };
 
+  libaal = import ../development/libraries/libaal {
+    inherit fetchurl stdenv;
+  };
+
   libarchive = import ../development/libraries/libarchive {
     inherit fetchurl stdenv zlib;
   };
@@ -3654,6 +3658,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  reiser4progs = import ../os-specific/linux/reiser4progs {
+    inherit fetchurl stdenv libaal;
+  };
+
   radeontools = import ../os-specific/linux/radeontools {
     inherit pciutils;
     inherit fetchurl stdenv;