Merge remote-tracking branch 'origin/master' into staging.

Conflicts: pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
parent 9253a95f6b b35770818d
commit 2d326e5032
1261 changed files with 4697 additions and 3318 deletions
@@ -15,7 +15,7 @@ stdenv.mkDerivation {

  meta = {
    description = "Gateway between FUSE and libarchive: allows mounting of cpio, .tar.gz, .tar.bz2 archives";
-    license = "GPL2";
+    license = stdenv.lib.licenses.gpl2;

    platforms = stdenv.lib.platforms.linux;
    maintainers = [ stdenv.lib.maintainers.simons ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
  meta = {
    description = "(Un)ChunkFS is a pair of FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa.";
    homepage = "http://chunkfs.florz.de/";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
    platforms = with stdenv.lib.platforms; linux;
  };
 }
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = http://www.brain-dump.org/projects/ciopfs/;
    description = "A case-insensitive filesystem layered on top of any other filesystem";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
  };
 }
@@ -25,6 +25,6 @@ stdenv.mkDerivation {
  meta = {
    homepage = http://fsfs.sourceforge.net/;
    description = "Secure distributed file system in user space";
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
  };
 }
@@ -4,10 +4,11 @@ let
  s = # Generated upstream information 
  rec {
    baseName="glusterfs";
-    version="3.5.0";
+    version="3.5.2";
    name="${baseName}-${version}";
-    url="http://download.gluster.org/pub/gluster/glusterfs/3.5/3.5.0/glusterfs-3.5.0.tar.gz";
-    sha256="0d9jlgxg19f2ajf5i4yw4f91n161rsi8fm95442ckci3xnz21zir";
+    hash="1hvns9islr5jcy0r1cw5890ra246y12pl5nlhl3bvmhglrkv8n7g";
+    url="http://download.gluster.org/pub/gluster/glusterfs/3.5/3.5.2/glusterfs-3.5.2.tar.gz";
+    sha256="1hvns9islr5jcy0r1cw5890ra246y12pl5nlhl3bvmhglrkv8n7g";
  };
  buildInputs = [
    fuse bison flex_2_5_35 openssl python ncurses readline
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
  meta = {
    description = "an open source (experimental) Linux client for Google Drive";
    homepage = https://github.com/Grive/grive;
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;

    platforms = stdenv.lib.platforms.all;
  };
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {

    homepage = http://httpfs.sourceforge.net/;

-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;

    platforms = stdenv.lib.platforms.linux;
    maintainers = [ ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation {

  meta = {
    description = "Tools for MTD filesystems";
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
    homepage = http://www.linux-mtd.infradead.org/;
    maintainers = with stdenv.lib.maintainers; [viric];
    platforms = with stdenv.lib.platforms; linux;
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = http://www.namesys.com/;
    description = "ReiserFS utilities";
-    license = "GPL-2";
+    license = stdenv.lib.licenses.gpl2;
  };
 }
@@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
  meta = {
    homepage = http://code.google.com/p/s3backer/;
    description = "FUSE-based single file backing store via Amazon S3";
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
  };
 }
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
  meta = {
    description = "SvnFs is a filesystem written using FUSE for accessing Subversion repositories";
    homepage = http://www.jmadden.eu/index.php/svnfs/;
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
    maintainers = [stdenv.lib.maintainers.marcweber];
    platforms = stdenv.lib.platforms.linux;
  };