Merge remote-tracking branch 'eelco/master' into stdenv-updates

Conflicts: pkgs/development/compilers/gcc/4.7/default.nix Trivial solution.
2012-12-28 23:28:16 +01:00
parent 88b11196c1 fde74242bf
commit b58780c43d
135 changed files with 1945 additions and 727 deletions
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, cmake, fuse }:
+
+stdenv.mkDerivation rec {
+  name = "unionfs-fuse-0.26";
+
+  src = fetchurl {
+    url = "http://podgorny.cz/unionfs-fuse/releases/${name}.tar.xz";
+
+    sha256 = "0qpnr4czgc62vsfnmv933w62nq3xwcbnvqch72qakfgca75rsp4d";
+  };
+
+  buildInputs = [ cmake fuse ];
+
+  meta = {
+    description = "FUSE UnionFS implementation";
+    homepage = http://podgorny.cz/moin/UnionFsFuse;
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+  };
+}