Merge master into #2129

Conflicts (easy, just UID shifted):
	nixos/modules/misc/ids.nix
	nixos/modules/module-list.nix

pkgs/tools/X11/autocutsel/default.nix

@@ -1,14 +1,12 @@
 {stdenv, fetchurl, libX11, libXaw}:
 
-let
-  name = "autocutsel-0.9.0";
-in
-stdenv.mkDerivation {
-  inherit name;
+stdenv.mkDerivation rec {
+  version = "0.10.0";
+  name = "autocutsel-${version}";
  
   src = fetchurl {
-    url = "mirror://savannah/autocutsel/${name}.tar.gz";
-    sha256 = "0hp335qq57l0kp58pfwb0bk930zx5497frq8y0lzr4icvk1fpw5y";
+    url = "https://github.com/sigmike/autocutsel/releases/download/${version}/${name}.tar.gz";
+    sha256 = "0gsys2dzh4az51ndcsabhlbbrjn2nm75lnjr45kg6r8sm8q66dx2";
   };
  
   buildInputs = [ libX11 libXaw ];
@@ -18,9 +16,11 @@ stdenv.mkDerivation {
   '';
 
   meta = {
+    inherit version;
     homepage = "http://www.nongnu.org/autocutsel/";
     description = "Tracks changes in the server's cutbuffer and CLIPBOARD selection";
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
     platforms = with stdenv.lib.platforms; all;
+    updateWalker = true;
   };
 }

pkgs/tools/X11/bgs/default.nix

@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "bgs-${version}";
-  version = "0.5";
+  version = "0.6";
 
   src = fetchurl {
     url = "https://github.com/Gottox/bgs/archive/${version}.tar.gz";
-    sha256 = "67fe16e3483f30f940005856fbb3246e1f99cf58371470e0d6668a27acbaefb9";
+    sha256 = "19xwslh74686qln0ylaql28z3ng45c7srrb3cxxvfp35lz7hjpf0";
   };
 
   buildInputs = [ libX11 libXinerama imlib2 ];
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
       description = "Extremely fast and small background setter for X";
-      license = "MIT";
+      license = stdenv.lib.licenses.mit;
       hydraPlatforms = stdenv.lib.platforms.linux;
       maintainers = with stdenv.lib.maintainers; [pSub];
   };

pkgs/tools/X11/hsetroot/default.nix

@@ -14,6 +14,6 @@ stdenv.mkDerivation {
   meta = {
     description = "hsetroot allows you to compose wallpapers ('root pixmaps') for X";
     homepage = http://thegraveyard.org/hsetroot.html;
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
   };
 }

pkgs/tools/X11/nitrogen/default.nix

@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, pkgconfig, glib, gtk2, gtkmm }:
+
+let version = "1.5.2";
+in
+stdenv.mkDerivation rec {
+  name = "nitrogen-${version}";
+
+  src = fetchurl {
+    url = "http://projects.l3ib.org/nitrogen/files/nitrogen-${version}.tar.gz";
+    sha256 = "60a2437ce6a6c0ba44505fc8066c1973140d4bb48e1e5649f525c7b0b8bf9fd2";
+  };
+
+  buildInputs = [ glib gtk2 gtkmm pkgconfig ];
+
+  NIX_LDFLAGS = "-lX11";
+
+  patchPhase = "patchShebangs data/icon-theme-installer";
+
+  meta = {
+    description = "A wallpaper browser and setter for X11";
+    longDescription = ''
+      nitrogen is a lightweight utility that can set the root background on X11.
+      It operates independently of any desktop environment, and supports
+      multi-head with Xinerama. Wallpapers are browsable with a convenient GUI,
+      and settings are stored in a human-readable config file.
+    '';
+    homepage = http://projects.l3ib.org/nitrogen/;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.auntie ];
+  };
+}

pkgs/tools/X11/winswitch/default.nix

@@ -37,7 +37,7 @@ let
 
     doCheck = false;
 
-    meta.platforms = stdenv.lib.platforms.mesaPlatforms;
+    meta.platforms = stdenv.lib.platforms.linux;
   };
 in stdenv.lib.overrideDerivation base (b: {
   postFixup = b.postFixup + ''

pkgs/tools/X11/wmctrl/64-bit-data.patch

@@ -0,0 +1,32 @@
+Description: Correct 64 Architecture implementation of 32 bit data
+Author: Chris Donoghue <cdonoghu@gmail.com>
+Bug-Debian: http://bugs.debian.org/362068
+
+--- wmctrl-1.07.orig/main.c
++++ wmctrl-1.07/main.c
+@@ -1425,6 +1425,16 @@ static gchar *get_property (Display *dis
+      *
+      * long_length = Specifies the length in 32-bit multiples of the
+      *               data to be retrieved.
++     *
++     * NOTE:  see 
++     * http://mail.gnome.org/archives/wm-spec-list/2003-March/msg00067.html
++     * In particular:
++     *
++     * 	When the X window system was ported to 64-bit architectures, a
++     * rather peculiar design decision was made. 32-bit quantities such
++     * as Window IDs, atoms, etc, were kept as longs in the client side
++     * APIs, even when long was changed to 64 bits.
++     *
+      */
+     if (XGetWindowProperty(disp, win, xa_prop_name, 0, MAX_PROPERTY_VALUE_LEN / 4, False,
+             xa_prop_type, &xa_ret_type, &ret_format,     
+@@ -1441,6 +1451,8 @@ static gchar *get_property (Display *dis
+ 
+     /* null terminate the result to make string handling easier */
+     tmp_size = (ret_format / 8) * ret_nitems;
++    /* Correct 64 Architecture implementation of 32 bit data */
++    if(ret_format==32) tmp_size *= sizeof(long)/4;
+     ret = g_malloc(tmp_size + 1);
+     memcpy(ret, ret_prop, tmp_size);
+     ret[tmp_size] = '\0';

pkgs/tools/X11/wmctrl/default.nix

@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
  
   buildInputs = [ libX11 libXmu glib pkgconfig ];
 
+  patches = [ ./64-bit-data.patch ];
+
   meta = {
     homepage = http://tomas.styblo.name/wmctrl/;
     description = "wmctrl is a UNIX/Linux command line tool to interact with an EWMH/NetWM compatible X Window Manager";

pkgs/tools/X11/xbindkeys/default.nix

@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.nongnu.org/xbindkeys/xbindkeys.html;
     description = "Launch shell commands with your keyboard or your mouse under X Window";
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
   };

pkgs/tools/X11/xchainkeys/default.nix

@@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://code.google.com/p/xchainkeys/";
     description = "A standalone X11 program to create chained key bindings";
-    license = "GPLv3";
+    license = stdenv.lib.licenses.gpl3;
   };
 }

pkgs/tools/X11/xdg-user-dirs/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxslt, docbook_xsl }:
+{ stdenv, fetchurl, libxslt, docbook_xsl, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "xdg-user-dirs-0.15";
@@ -8,7 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "20b4a751f41d0554bce3e0ce5e8d934be98cc62d48f0b90a894c3e1916552786";
   };
 
-  buildInputs = [ libxslt docbook_xsl ];
+  buildInputs = [ libxslt docbook_xsl makeWrapper ];
+
+  preFixup = ''
+    wrapProgram "$out/bin/xdg-user-dirs-update" \
+      --prefix XDG_CONFIG_DIRS : "$out/etc/xdg"
+  '';
 
   meta = with stdenv.lib; {
     homepage = http://freedesktop.org/wiki/Software/xdg-user-dirs;

pkgs/tools/X11/xnee/default.nix

@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
          "macros", retype a file.
       '';
 
-    license = "GPLv3+";
+    license = stdenv.lib.licenses.gpl3Plus;
 
     homepage = http://www.gnu.org/software/xnee/;
 

pkgs/tools/X11/xpra/default.nix

@@ -4,12 +4,12 @@
 , ffmpeg, x264, libvpx, pil, libwebp }:
 
 buildPythonPackage rec {
-  name = "xpra-0.9.5";
+  name = "xpra-0.11.6";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://xpra.org/src/${name}.tar.bz2";
-    sha256 = "1qr9gxmfnkays9hrw2qki1jdkyxhbbkjx71gy23x423cfsxsjmiw";
+    sha256 = "0n3lr8nrfmrll83lgi1nzalng902wv0dcmcyx4awnman848dxij0";
   };
 
   buildInputs = [
@@ -47,6 +47,6 @@ buildPythonPackage rec {
   meta = {
     homepage = http://xpra.org/;
     description = "Persistent remote applications for X";
-    platforms = stdenv.lib.platforms.mesaPlatforms;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/tools/X11/xtrace/default.nix

@@ -1,14 +1,19 @@
-{ stdenv, fetchurl, libX11, xauth, makeWrapper }:
+{ stdenv, autoreconfHook, fetchgit, libX11, xauth, makeWrapper }:
 
-let version = "1.0.2"; in
+let version = "1.3.1"; in
 stdenv.mkDerivation {
   name = "xtrace-${version}";
-  src = fetchurl {
-    url = "https://alioth.debian.org/frs/download.php/3201/xtrace_${version}.orig.tar.gz";
-    sha256 = "0czywk2iwj9vifml0qjlbz8n9jnqjsm4zz22haii82bf4l5w3y04";
+  src = fetchgit {
+    url = "git://git.debian.org/xtrace/xtrace.git";
+    rev = "refs/tags/xtrace-1.3.1";
+    sha256 = "0csjw88ynzzcmx1jlb65c74r2sp9dzxn00airsxxfsipb74049d0";
   };
 
-  buildInputs = [ libX11 makeWrapper ];
+  buildInputs = [ libX11 makeWrapper autoreconfHook ];
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
 
   postInstall =
     '' wrapProgram "$out/bin/xtrace" \
@@ -18,7 +23,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://xtrace.alioth.debian.org/;
     description = "xtrace, a tool to trace X11 protocol connections";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
   };

pkgs/tools/admin/analog/default.nix

@@ -29,7 +29,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "http://www.analog.cx/";
-    license = "GPL";
+    license = stdenv.lib.licenses.gpl2;
     description = "Powerful tool to generate web server statistics";
     maintainers = [ stdenv.lib.maintainers.simons ];
     platforms = stdenv.lib.platforms.linux;

pkgs/tools/admin/gtk-vnc/default.nix

@@ -1,8 +1,8 @@
 { stdenv, fetchurl, gobjectIntrospection
 , python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1
-, libffi, cyrus_sasl, intltool, perl, perlPackages, firefoxPkgs, pulseaudio
+, libffi, cyrus_sasl, intltool, perl, perlPackages, pulseaudio
 , kbproto, libX11, libXext, xextproto, pygobject, libgcrypt, gtk3, vala
-, pygobject3, enableGTK3 ? false }:
+, pygobject3, libogg, enableGTK3 ? false }:
 
 stdenv.mkDerivation rec {
   name = "gtk-vnc-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     python gnutls cairo libtool pkgconfig glib libffi libgcrypt
     intltool cyrus_sasl pulseaudio perl perlPackages.TextCSV
-    gobjectIntrospection
+    gobjectIntrospection libogg
   ] ++ (if enableGTK3 then [ gtk3 vala pygobject3 ] else [ gtk pygtk pygobject ]);
 
   NIX_CFLAGS_COMPILE = "-fstack-protector-all";

pkgs/tools/admin/sec/default.nix

@@ -0,0 +1,30 @@
+{ fetchurl, perl, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "sec-2.7.6";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/simple-evcorr/${name}.tar.gz";
+    sha256 = "1lrssln55p3bmn3d2hl8c5l5ix32bn8065w1cgycwsf7r6fww51p";
+  };
+
+  buildInputs = [ perl ];
+
+  configurePhase = ":";
+  buildPhase = ":";
+  installPhase = ''
+    mkdir -p $out/bin $out/share/man/man1
+    cp sec $out/bin
+    cp sec.man $out/share/man/man1/sec.1
+  '';
+  doCheck = false;
+
+  meta = {
+    homepage = "http://simple-evcorr.sourceforge.net/";
+    license = "GPLv2";
+    description = "Simple Event Correlator";
+    maintainers = [ stdenv.lib.maintainers.tv ];
+    platforms = stdenv.lib.platforms.all;
+  };
+
+}

pkgs/tools/admin/tigervnc/default.nix

@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.tigervnc.org/;
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
     description = "Fork of tightVNC, made in cooperation with VirtualGL";
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;

pkgs/tools/admin/tightvnc/default.nix

@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   meta = {
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
     homepage = "http://vnc-tight.sourceforge.net/";
     description = "TightVNC is an improved version of VNC";
 

pkgs/tools/archivers/dar/default.nix

@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0psahvnrkljqg9507dk0vq05w8vilpm98igjrcjkqdirqcfd2py1";
   };
 
-  buildInputs = [ zlib bzip2 openssl attr lzo libgcrypt e2fsprogs ];
+  buildInputs = [ zlib bzip2 openssl lzo libgcrypt ]
+    ++ stdenv.lib.optional stdenv.isLinux [ attr e2fsprogs ];
 
   configureFlags = "--disable-dar-static";
 
@@ -16,6 +17,6 @@ stdenv.mkDerivation rec {
     homepage = http://dar.linux.free.fr/;
     description = "Disk ARchiver, allows backing up files into indexed archives";
     maintainers = [ stdenv.lib.maintainers.viric ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

pkgs/tools/archivers/gnutar/default.nix

@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       archives).
     '';
 
-    license = "GPLv3+";
+    license = stdenv.lib.licenses.gpl3Plus;
 
     maintainers = [ ];
     platforms = stdenv.lib.platforms.all;

pkgs/tools/archivers/p7zip/default.nix

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://p7zip.sourceforge.net/;
     description = "A port of the 7-zip archiver";
-    # license = "LGPLv2.1+"; + "unRAR restriction"
+    # license = stdenv.lib.licenses.lgpl21Plus; + "unRAR restriction"
     platforms = stdenv.lib.platforms.unix;
   };
 }

pkgs/tools/archivers/sharutils/default.nix

@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/sharutils/;
 
-    license = "GPLv3+";
+    license = stdenv.lib.licenses.gpl3Plus;
 
     maintainers = [ ];
     platforms = stdenv.lib.platforms.all;

pkgs/tools/archivers/unrar/default.nix

@@ -1,14 +1,14 @@
 {stdenv, fetchurl}:
 
 let
-  version = "5.1.2";
+  version = "5.1.5";
 in
 stdenv.mkDerivation {
   name = "unrar-${version}";
 
   src = fetchurl {
     url = "http://www.rarlab.com/rar/unrarsrc-${version}.tar.gz";
-    sha256 = "0344cn4w3lw2111m3g431khiyndx9ibbp952bli1inx2fixps9cq";
+    sha256 = "1jrla255911rbl953br2xbgvyw15kpi11r4lpqm3jlw553ccw912";
   };
 
   patchPhase = ''

pkgs/tools/archivers/zip/default.nix

@@ -22,8 +22,9 @@ stdenv.mkDerivation {
   buildInputs = if enableNLS then [ libnatspec ] else [];
 
   meta = {
+    description = "Compressor/archiver for creating and modifying zipfiles";
     homepage = http://www.info-zip.org;
     platforms = stdenv.lib.platforms.all;
-    maintainer = [ stdenv.lib.maintainers.urkud ];
+    maintainers = [ stdenv.lib.maintainers.urkud ];
   };
 }

pkgs/tools/archivers/zpaq/default.nix

@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="zpaq";
-    version="649";
+    version="655";
     name="${baseName}-${version}";
-    hash="0rspkd8vdp06hyjlrhgqjrv37bwvnzvqw0smlcy5fjbny502s5nn";
-    url="http://mattmahoney.net/dc/zpaq649.zip";
-    sha256="0rspkd8vdp06hyjlrhgqjrv37bwvnzvqw0smlcy5fjbny502s5nn";
+    hash="09wjss6vbziwvfmcngb64xd2yih79z1ypgrn4ni7ag8cifx9257c";
+    url="http://mattmahoney.net/dc/zpaq655.zip";
+    sha256="09wjss6vbziwvfmcngb64xd2yih79z1ypgrn4ni7ag8cifx9257c";
   };
   buildInputs = [
     unzip

pkgs/tools/audio/gvolicon/default.nix

@@ -22,6 +22,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/Unia/gvolicon";
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.gpl3Plus;
-    maintainer = stdenv.lib.maintainers.bennofs;
+    maintainers = stdenv.lib.maintainers.bennofs;
   };
 }

pkgs/tools/audio/mpdcron/default.nix

@@ -0,0 +1,31 @@
+{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, glib, libdaemon
+, mpd_clientlib, curl, sqlite, ruby, rubyLibs, libnotify }:
+
+stdenv.mkDerivation rec {
+  version = "20130809";
+  name    = "mpdcron-${version}";
+
+  src = fetchgit {
+    url    = https://github.com/alip/mpdcron.git;
+    rev    = "1dd16181c32f33e7754bbe21841c8e70b28f8ecd";
+    sha256 = "1h3n433jn9yg74i218pkxzrngsjpnf0z02lakfldl6j1s9di2pn3";
+  };
+
+  meta = {
+    description = "A cron like daemon for mpd.";
+    homepage    = http://alip.github.io/mpdcron/;
+    license     = stdenv.lib.licenses.gpl2;
+    platforms   = with stdenv.lib.platforms; unix;
+    maintainers = [ stdenv.lib.maintainers.lovek323 ];
+  };
+
+  buildInputs =
+    [ autoconf automake libtool pkgconfig glib libdaemon
+      mpd_clientlib curl sqlite ruby rubyLibs.nokogiri libnotify ];
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+  configureFlags = [ "--enable-gmodule" "--with-standard-modules=all" ];
+}

pkgs/tools/backup/btar/default.nix

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Tar-compatible block-based archiver";
-    license = "GPLv3+";
+    license = stdenv.lib.licenses.gpl3Plus;
     homepage = http://viric.name/cgi-bin/btar;
     platforms = with stdenv.lib.platforms; all;
     maintainers = with stdenv.lib.maintainers; [viric];

pkgs/tools/backup/chunksync/default.nix

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Space-efficient incremental backups of large files or block devices";
     homepage = "http://chunksync.florz.de/";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
     platforms = with stdenv.lib.platforms; linux;
   };
 }

pkgs/tools/backup/duplicity/default.nix

@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Encrypted bandwidth-efficient backup using the rsync algorithm";
     homepage = "http://www.nongnu.org/duplicity";
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
     maintainers = with stdenv.lib.maintainers; [viric simons];
     platforms = with stdenv.lib.platforms; linux;
   };

pkgs/tools/backup/httrack/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, zlib, openssl }:
 
 stdenv.mkDerivation rec {
-  version = "3.48.3";
+  version = "3.48.17";
   name = "httrack-${version}";
 
   src = fetchurl {
     url = "http://mirror.httrack.com/httrack-${version}.tar.gz";
-    sha256 = "1lg5rrql01q3z7fwcij5p64r22x4vbswcky80gajx5f62kxlxn0r";
+    sha256 = "03q8sk7qihw9x4bfgfhv6523khgj13nilqps28qy7ndpzpggw9vn";
   };
 
   buildInputs = [ zlib openssl ];
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "http://www.httrack.com";
     description = "Easy-to-use offline browser utility";
-    license = "GPL";
+    license = stdenv.lib.licenses.gpl3;
   };
 }

pkgs/tools/backup/obnam/default.nix

@@ -2,13 +2,13 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "obnam-${version}";
-  version = "1.6.1";
+  version = "1.8";
 
   namePrefix = "";
 
   src = fetchurl rec {
     url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.gz";
-    sha256 = "0415njniqpy3xhvibpm82i9alrp2fw3lsnm15h7vqkkvgp8s5g39";
+    sha256 = "0190yz65hfdq69xws4h1izxz59by0b437d7z1l4cf5ixkv16j17p";
   };
 
   buildInputs = [ pythonPackages.sphinx attr ];

pkgs/tools/backup/ori/default.nix

@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, boost, pkgconfig, scons, utillinux, fuse, libevent, openssl, zlib }:
+
+stdenv.mkDerivation rec {
+  version = "0.8.1";
+  name = "ori-${version}";
+
+  src = fetchurl {
+    url = "https://bitbucket.org/orifs/ori/downloads/ori-0.8.1.tar.xz";
+    sha256 = "8ce1a3dfbb6d1538885e993616bdfe71be44711d48f7f6798ff6bc0a39b3deca";
+  };
+
+  buildInputs = [ 
+    boost pkgconfig scons utillinux fuse libevent openssl zlib
+  ];
+
+  buildPhase = ''
+    scons PREFIX=$out WITH_ORILOCAL=1 install
+  '';
+
+  installPhase = ":";
+
+  meta = with stdenv.lib; {
+    description = "A secure distributed file system";
+    homepage = http://ori.scs.stanford.edu/;
+    license = licenses.mit;
+    platforms = platforms.unix;
+  };
+}

pkgs/tools/backup/rdiff-backup/default.nix

@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   meta = {
     description = "backup system trying to combine best a mirror and an incremental backup system";
     homepage = http://rdiff-backup.nongnu.org/;
-    license = "GPL-2";
+    license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ the-kenny ];
   };
 }

pkgs/tools/backup/rsnapshot/default.nix

@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A filesystem snapshot utility for making backups of local and remote systems";
     homepage = http://rsnapshot.org/;
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
   };
 }

pkgs/tools/backup/store-backup/default.nix

@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   };
 
   installPhase = ''
-    ensureDir $out/scripts
+    mkdir -p $out/scripts
     mv * $out
     mv $out/_ATTENTION_ $out/doc
     mv $out/{correct.sh,cron-storebackup} $out/scripts

pkgs/tools/backup/wal-e/default.nix

@@ -26,7 +26,7 @@ pythonPackages.buildPythonPackage rec {
     description = "A Postgres WAL-shipping disaster recovery and replication toolkit";
     homepage = https://github.com/wal-e/wal-e;
     maintainers = [ stdenv.lib.maintainers.rickynils ];
-    licenses = stdenv.lib.licenses.bsd3;
+    license = stdenv.lib.licenses.bsd3;
     platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/tools/bluetooth/bluedevil/default.nix

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Bluetooth manager for KDE";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
     inherit (kdelibs.meta) platforms;
     maintainers = [ maintainers.phreedom ];
   };

pkgs/tools/cd-dvd/cdrkit/default.nix

@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
     '';
     
     homepage = http://cdrkit.org/;
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
   };
 }

pkgs/tools/cd-dvd/unetbootin/default.nix

@@ -1,13 +1,13 @@
 { stdenv, fetchurl, makeWrapper, qt4, utillinux, coreutils, which, p7zip, mtools, syslinux }:
 
-let version = "585"; in
+let version = "603"; in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "unetbootin-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/unetbootin/UNetbootin/${version}/unetbootin-source-${version}.tar.gz";
-    sha256 = "1jwwmh4bfrsy4clmnmk9y7h5cd9nh2z3bbm6qwd5p5aw0ich9vk3";
+    sha256 = "03nhy1w9q0ycpcni6w61ps1mji859nvmvr1bhnlzi04z0s5ldbwx";
   };
 
   sourceRoot = ".";
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://unetbootin.sourceforge.net/;
     description = "A tool to create bootable live USB drives from ISO images";
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/tools/cd-dvd/vobcopy/default.nix

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Copies DVD .vob files to harddisk, decrypting them on the way";
     homepage = http://vobcopy.org/projects/c/c.shtml;
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
 
     maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
     platforms = stdenv.lib.platforms.all;

pkgs/tools/cd-dvd/xorriso/default.nix

@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
          filesystems.
       '';
 
-    license = "GPLv3+";
+    license = stdenv.lib.licenses.gpl3Plus;
 
     homepage = http://www.gnu.org/software/xorriso/;
 

pkgs/tools/compression/gzip/default.nix

@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
         is just a bonus.
       '';
 
-    license = "GPLv3+";
+    license = stdenv.lib.licenses.gpl3Plus;
   };
 }

pkgs/tools/compression/lrzip/default.nix

@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://ck.kolivas.org/apps/lrzip/;
     description = "The CK LRZIP compression program (LZMA + RZIP)";
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
     inherit version;
   };
 }

pkgs/tools/compression/rzip/default.nix

@@ -11,6 +11,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://rzip.samba.org/;
     description = "The RZIP compression program";
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
   };
 }

pkgs/tools/compression/upx/default.nix

@@ -29,6 +29,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://upx.sourceforge.net/;
     description = "The Ultimate Packer for eXecutables";
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
   };
 }

pkgs/tools/filesystems/archivemount/default.nix

@@ -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 ];

pkgs/tools/filesystems/bcache-tools/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "bcache-tools-${version}";
-  version = "1.0.5";
+  version = "1.0.7";
 
   src = fetchurl {
     url = "https://github.com/g2p/bcache-tools/archive/v${version}.tar.gz";
-    sha256 = "1abf86xcnj601lddig3kmn26jrf8q8xhcyszf5pxrcs5ym72jj8l";
+    sha256 = "1gbsh2qw0a7kgck6w0apydiy37nnz5xvdgipa0yqrfmghl86vmv4";
   };
 
   buildInputs = [ pkgconfig utillinux ];

pkgs/tools/filesystems/bindfs/default.nix

@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, fuse, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  version = "1.12.6";
+  name    = "bindfs-${version}";
+
+  src = fetchurl {
+    url    = "http://bindfs.org/downloads/${name}.tar.gz";
+    sha256 = "0s90n1n4rvpcg51ixr5wx8ixml1xnc7w28xlbnms34v19pzghm59";
+  };
+
+  dontStrip = true;
+
+  buildInputs = [ fuse pkgconfig ];
+
+  meta = {
+    description = "A FUSE filesystem for mounting a directory to another location";
+    homepage    = http://bindfs.org;
+    license     = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ lovek323 ];
+    platforms   = stdenv.lib.platforms.unix;
+  };
+}

pkgs/tools/filesystems/btrfsprogs/default.nix

@@ -1,16 +1,20 @@
-{ stdenv, fetchurl, attr, acl, zlib, libuuid, e2fsprogs, lzo }:
+{ stdenv, fetchurl, attr, acl, zlib, libuuid, e2fsprogs, lzo
+, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }:
 
-let version = "3.14"; in
+let version = "3.14.2"; in
 
 stdenv.mkDerivation rec {
   name = "btrfs-progs-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/mason/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "1qjy4bc96nfzkdjp6hwb85aasqs87nkmgi8pl6qa6cpvml3627cq";
+    sha256 = "14vpj6f2v076v9zabgrz8l4dp6n1ar2mvk3lvii51ykvi35d1qbh";
   };
 
-  buildInputs = [ attr acl zlib libuuid e2fsprogs lzo ];
+  buildInputs = [
+    attr acl zlib libuuid e2fsprogs lzo
+    asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt
+  ];
 
   # for btrfs to get the rpath to libgcc_s, needed for pthread_cancel to work
   NIX_CFLAGS_LINK = "-lgcc_s";

pkgs/tools/filesystems/ceph/default.nix

@@ -0,0 +1,37 @@
+{stdenv, fetchgit, libatomic_ops, autoconf, automake, boost, btrfsProgs, cryptopp, curl, expat,
+ fcgi, fuse, gperftools, keyutils, leveldb, libaio, libedit, libtool,
+ libuuid, linuxHeaders, openssl, pkgconfig, python, snappy, which, xfsprogs, xz}:
+
+stdenv.mkDerivation rec {
+  baseName="ceph";
+  version="0.79";
+  name="${baseName}-${version}";
+  buildInputs = [
+    fuse linuxHeaders pkgconfig libatomic_ops autoconf automake boost btrfsProgs cryptopp expat
+    fcgi fuse gperftools keyutils leveldb libaio libedit libtool libuuid openssl pkgconfig
+    python snappy which xfsprogs.lib xz
+  ];
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+  installFlags = "DESTDIR=\${out}";
+
+  enableParallelBuilding = true;
+  src = fetchgit {
+    url = "https://github.com/ceph/ceph";
+    rev = "4c2d73a5095f527c3a2168deb5fa54b3c8991a6e";
+    sha256 = "0850m817wqqmw2qdnwm5jvbdgifzlc7kcd05jv526pdvmq1x92rf";
+  };
+
+  meta = {
+    inherit version;
+    description = "Distributed storage system";
+    maintainers = [
+      stdenv.lib.maintainers.ak
+    ];
+    platforms = with stdenv.lib.platforms; 
+      linux;
+  };
+}

pkgs/tools/filesystems/chunkfs/default.nix

@@ -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;
   };
 }

pkgs/tools/filesystems/ciopfs/default.nix

@@ -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;
   };
 }

pkgs/tools/filesystems/fsfs/default.nix

@@ -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;
   };
 }

pkgs/tools/filesystems/glusterfs/default.nix

@@ -1,25 +1,37 @@
-{stdenv, fetchurl, fuse, bison, flex, openssl, python, ncurses, readline}:
+{stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python, ncurses, readline,
+ autoconf, automake, libtool, pkgconfig, zlib, libaio}:
 let 
   s = # Generated upstream information 
   rec {
     baseName="glusterfs";
-    version="3.4.2";
+    version="3.5.2";
     name="${baseName}-${version}";
-    hash="1vzdihsy4da11jsa46n1n2xk6d40g7v0zrlqvs3pb9k07fql5kag";
-    url="http://download.gluster.org/pub/gluster/glusterfs/3.4/3.4.2/glusterfs-3.4.2.tar.gz";
-    sha256="1vzdihsy4da11jsa46n1n2xk6d40g7v0zrlqvs3pb9k07fql5kag";
+    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 openssl python ncurses readline
+    fuse bison flex_2_5_35 openssl python ncurses readline
+    autoconf automake libtool pkgconfig zlib libaio
   ];
 in
 stdenv.mkDerivation
 rec {
   inherit (s) name version;
   inherit buildInputs;
+  preConfigure = ''
+    ./autogen.sh
+    '';
   configureFlags = [
     ''--with-mountutildir="$out/sbin"''
     ];
+  preInstall = ''
+    substituteInPlace api/examples/Makefile --replace '$(DESTDIR)' $out
+    substituteInPlace geo-replication/syncdaemon/Makefile --replace '$(DESTDIR)' $out
+    substituteInPlace geo-replication/syncdaemon/Makefile --replace '$(DESTDIR)' $out
+    substituteInPlace xlators/features/glupy/examples/Makefile --replace '$(DESTDIR)' $out
+    substituteInPlace xlators/features/glupy/src/Makefile --replace '$(DESTDIR)' $out
+    '';
   src = fetchurl {
     inherit (s) url sha256;
   };

pkgs/tools/filesystems/grive/default.nix

@@ -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;
   };

pkgs/tools/filesystems/httpfs/default.nix

@@ -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 = [ ];

pkgs/tools/filesystems/jmtpfs/default.nix

@@ -0,0 +1,23 @@
+{ stdenv, fetchurl
+, autoconf, automake
+, unzip, pkgconfig
+, file, fuse, libmtp }:
+
+stdenv.mkDerivation rec {
+  version = "0.5";
+  name = "jmtpfs-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/JasonFerrara/jmtpfs/archive/v0.5.zip";
+    sha256 = "09fw4g350mjz1mnga7ws5nvnsnfzs8s7cscl300mas1m9s6vmhz6";
+  };
+
+  buildInputs = [ autoconf automake file fuse libmtp pkgconfig unzip ];
+
+  meta = {
+    description = "A FUSE filesystem for MTP devices like Android phones.";
+    homepage = https://github.com/JasonFerrara/jmtpfs;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.coconnor ];
+  };
+}

pkgs/tools/filesystems/mtdutils/default.nix

@@ -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;

pkgs/tools/filesystems/reiserfsprogs/default.nix

@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.namesys.com/;
     description = "ReiserFS utilities";
-    license = "GPL-2";
+    license = stdenv.lib.licenses.gpl2;
   };
 }

pkgs/tools/filesystems/relfs/default.nix

@@ -48,7 +48,6 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs ["build" "doMakeInstall" "doForceShare" "doPropagate"]);
 	meta = {
 		description = "A relational filesystem on top of FUSE";
-		inherit src;
     		maintainers = [stdenv.lib.maintainers.raskin];
 		platforms = stdenv.lib.platforms.linux;
 	};

pkgs/tools/filesystems/s3backer/default.nix

@@ -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;
   };
 }

pkgs/tools/filesystems/svnfs/default.nix

@@ -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;
   };

pkgs/tools/filesystems/unionfs-fuse/default.nix

@@ -8,6 +8,14 @@ stdenv.mkDerivation rec {
     sha256 = "0qpnr4czgc62vsfnmv933w62nq3xwcbnvqch72qakfgca75rsp4d";
   };
 
+  patches =
+    [ # Prevent the unionfs daemon from being killed during
+      # shutdown. See
+      # http://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/
+      # for details.
+      ./prevent-kill-on-shutdown.patch
+    ];
+
   buildInputs = [ cmake fuse ];
 
   # Put the unionfs mount helper in place as mount.unionfs-fuse. This makes it
@@ -17,7 +25,7 @@ stdenv.mkDerivation rec {
   # This must be done in preConfigure because the build process removes
   # helper from the source directory during the build.
   preConfigure = ''
-    ensureDir $out/sbin
+    mkdir -p $out/sbin
     cp -a mount.unionfs $out/sbin/mount.unionfs-fuse
     substituteInPlace $out/sbin/mount.unionfs-fuse --replace mount.fuse ${fuse}/sbin/mount.fuse
     substituteInPlace $out/sbin/mount.unionfs-fuse --replace unionfs $out/bin/unionfs

pkgs/tools/filesystems/unionfs-fuse/prevent-kill-on-shutdown.patch

@@ -0,0 +1,14 @@
+diff -ru -x '*~' unionfs-fuse-0.26-orig/src/unionfs.c unionfs-fuse-0.26/src/unionfs.c
+--- unionfs-fuse-0.26-orig/src/unionfs.c	2012-09-11 00:06:32.000000000 +0200
++++ unionfs-fuse-0.26/src/unionfs.c	2014-05-21 14:22:03.597861805 +0200
+@@ -831,6 +831,10 @@
+ 	}
+ #endif
+ 
++	/* Prevent systemd's shutdown from killing us. */
++	if (access("/etc/initrd-release", F_OK) >= 0)
++		argv[0][0] = '@';
++
+ 	umask(0);
+ 	int res = fuse_main(args.argc, args.argv, &unionfs_oper, NULL);
+ 	RETURN(uopt.doexit ? uopt.retval : res);

pkgs/tools/filesystems/xfsprogs/default.nix

@@ -12,11 +12,26 @@ stdenv.mkDerivation rec {
     sed -i s,/bin/bash,`type -P bash`, install-sh
   '';
 
+  outputs = ["out" "lib"];
+
+  postInstall = ''
+    (cd include; make install-dev)
+    # The make install-dev target is broken when --disable-shared
+    mkdir -p $lib/lib $lib/include
+    cp ./libhandle/.libs/libhandle.a \
+       ./libxcmd/.libs/libxcmd.a \
+       ./libxlog/.libs/libxlog.a \
+       ./libxfs/.libs/libxfs.a $lib/lib
+    mv $out/include/* $lib/include
+  '';
+
+  enableParallelBuilding = true;
+
   buildInputs = [ libtool gettext libuuid ];
 
   configureFlags = "MAKE=make MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ZIP=gzip AWK=gawk --disable-shared";
   preConfigure = ''
-    configureFlags="$configureFlags root_sbindir=$out/sbin root_libdir=$out/lib"
+    configureFlags="$configureFlags root_sbindir=$out/sbin root_libdir=$lib/lib"
   '';
   disableStatic = false;
 

pkgs/tools/graphics/asymptote/default.nix

@@ -11,11 +11,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="asymptote";
-    version="2.24";
-    name="asymptote-2.24";
-    hash="0iypv3n89h8mx46b0c3msl0ldmg7fxf8v9fl4zy4sxfszazrvivl";
-    url="mirror://sourceforge/project/asymptote/2.24/asymptote-2.24.src.tgz";
-    sha256="0iypv3n89h8mx46b0c3msl0ldmg7fxf8v9fl4zy4sxfszazrvivl";
+    version="2.32";
+    name="${baseName}-${version}";
+    hash="19cgn5158p42igjbp8lf6xdbh3yjhlkdm22m5lqrhibp09g06d90";
+    url="mirror://sourceforge/project/asymptote/2.32/asymptote-2.32.src.tgz";
+    sha256="19cgn5158p42igjbp8lf6xdbh3yjhlkdm22m5lqrhibp09g06d90";
   };
   buildInputs = with a; [
     freeglut ghostscriptX imagemagick fftw boehmgc

pkgs/tools/graphics/barcode/default.nix

@@ -34,8 +34,7 @@ rec {
     [
       raskin
     ];
-    platforms = with a.lib.platforms;
-      all;
+    platforms = with a.lib.platforms; allBut darwin;
   };
   passthru = {
     updateInfo = {

pkgs/tools/graphics/dcraw/default.nix

@@ -1,14 +1,14 @@
-{stdenv, fetchurl, libjpeg, lcms, gettext, jasper }:
+{stdenv, fetchurl, libjpeg, lcms2, gettext, jasper }:
 
 stdenv.mkDerivation rec {
-  name = "dcraw-9.19";
+  name = "dcraw-9.22";
 
   src = fetchurl {
     url = "http://www.cybercom.net/~dcoffin/dcraw/archive/${name}.tar.gz";
-    sha256 = "0x2qjavfp97vadw29d384sb887wgpfki4sl00p5lximf0a7fa0dv";
+    sha256 = "00dz85fr5r9k3nlwdbdi30fpqr8wihamzpyair7l7zk0vkrax402";
   };
 
-  buildInputs = [ libjpeg lcms gettext jasper ];
+  buildInputs = [ libjpeg lcms2 gettext jasper ];
 
   patchPhase = ''
     sed -i -e s@/usr/local@$out@ install
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.cybercom.net/~dcoffin/dcraw/;
     description = "Decoder for many camera raw picture formats";
     license = "free";
-    platforms = stdenv.lib.platforms.allBut "i686-cygwin";
+    platforms = with stdenv.lib.platforms; allBut cygwin;
     maintainers = [ stdenv.lib.maintainers.urkud ];
   };
 }

pkgs/tools/graphics/enblend-enfuse/default.nix

@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://enblend.sourceforge.net/;
     description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
   };
 }

pkgs/tools/graphics/gifsicle/default.nix

@@ -17,6 +17,6 @@ stdenv.mkDerivation {
   meta = { 
     description = "Command-line tool for creating, editing, and getting information about GIF images and animations";
     homepage = http://www.lcdf.org/gifsicle/;
-    license = "GPL2";
+    license = stdenv.lib.licenses.gpl2;
   };
 }

pkgs/tools/graphics/gnuplot/default.nix

@@ -1,45 +1,48 @@
-{ stdenv, fetchurl, zlib, gd, texinfo, makeWrapper, readline
-, texLive ? null
-, lua ? null
+{ lib, stdenv, fetchurl, zlib, gd, texinfo4, makeWrapper, readline
+, withTeXLive ? false, texLive
+, withLua ? false, lua
 , emacs ? null
 , libX11 ? null
 , libXt ? null
 , libXpm ? null
 , libXaw ? null
 , aquaterm ? false
-, wxGTK ? null
+, withWxGTK ? false, wxGTK ? null
 , pango ? null
 , cairo ? null
 , pkgconfig ? null
 , fontconfig ? null
 , gnused ? null
-, coreutils ? null }:
+, coreutils ? null
+, withQt ? false, qt4 }:
 
 assert libX11 != null -> (fontconfig != null && gnused != null && coreutils != null);
 let
-  withX = libX11 != null && !aquaterm;
+  withX = libX11 != null && !aquaterm && !stdenv.isDarwin;
 in
 stdenv.mkDerivation rec {
-  name = "gnuplot-4.6.3";
+  name = "gnuplot-4.6.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/gnuplot/${name}.tar.gz";
-    sha256 = "1xd7gqdhlk7k1p9yyqf9vkk811nadc7m4si0q3nb6cpv4pxglpyz";
+    sha256 = "0bcsa5b33msddjs6mj0rhi81cs19h9p3ykixkkl70ifhqwqg0l75";
   };
 
   buildInputs =
-    [ zlib gd texinfo readline emacs lua texLive
-      pango cairo pkgconfig makeWrapper ]
-    ++ stdenv.lib.optionals withX              [ libX11 libXpm libXt libXaw ]
+    [ zlib gd texinfo4 readline pango cairo pkgconfig makeWrapper ]
+    ++ lib.optional withTeXLive texLive
+    ++ lib.optional withLua lua
+    ++ lib.optionals withX [ libX11 libXpm libXt libXaw ]
+    ++ lib.optional withQt [ qt4 ]
     # compiling with wxGTK causes a malloc (double free) error on darwin
-    ++ stdenv.lib.optional (!stdenv.isDarwin) wxGTK;
+    ++ lib.optional (withWxGTK && !stdenv.isDarwin) wxGTK;
 
   configureFlags =
     (if withX then ["--with-x"] else ["--without-x"])
-    ++ (if aquaterm then ["--with-aquaterm"] else ["--without-aquaterm"])
-    ;
+    ++ (if withQt then ["--enable-qt"] else ["--disable-qt"])
+    ++ (if aquaterm then ["--with-aquaterm"] else ["--without-aquaterm"]);
 
-  postInstall = stdenv.lib.optionalString withX ''
+  postInstall = lib.optionalString withX ''
     wrapProgram $out/bin/gnuplot \
        --prefix PATH : '${gnused}/bin' \
        --prefix PATH : '${coreutils}/bin' \
@@ -47,8 +50,8 @@ stdenv.mkDerivation rec {
        --run '. ${./set-gdfontpath-from-fontconfig.sh}'
   '';
 
-  meta = with stdenv.lib; {
-    homepage    = http://www.gnuplot.info;
+  meta = with lib; {
+    homepage = http://www.gnuplot.info/;
     description = "A portable command-line driven graphing utility for many platforms";
     hydraPlatforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ lovek323 ];

pkgs/tools/graphics/icoutils/default.nix

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.nongnu.org/icoutils/;
     description = "Set of  programs to deal with Microsoft Windows(R) icon and cursor files";
-    license = "GPLv3+";
+    license = stdenv.lib.licenses.gpl3Plus;
     platforms = with stdenv.lib.platforms; linux;
   };
 }

pkgs/tools/graphics/mscgen/default.nix

@@ -21,7 +21,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.mcternan.me.uk/mscgen/;
     description = "Convert Message Sequence Chart descriptions into PNG, SVG, or EPS images";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
 
     longDescription = ''
       Mscgen is a small program that parses Message Sequence Chart

pkgs/tools/graphics/nifskope/default.nix

@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, qt4 }:
+
+stdenv.mkDerivation rec {
+  name = "nifskope-1.1.3";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/niftools/${name}.tar.bz2";
+    sha256 = "0fcvrcjyvivww10sjhxamcip797b9ykbf5p3rm2k24xhkwdaqp72";
+  };
+
+  buildInputs = [ qt4 ];
+
+  configurePhase =
+    ''
+      for i in *.cpp gl/*.cpp widgets/*.cpp; do
+        substituteInPlace $i --replace /usr/share/nifskope $out/share/nifskope
+      done
+
+      qmake -after TARGET=nifskope
+    ''; # */
+
+  enableParallelBuilding = true;
+
+  # Inspired by linux-install/nifskope.spec.in.
+  installPhase =
+    ''
+      d=$out/share/nifskope
+      mkdir -p $out/bin $out/share/applications $out/share/pixmaps $d/{shaders,doc,lang}
+      cp release/nifskope $out/bin/
+      cp nifskope.png $out/share/pixmaps/
+      cp nif.xml kfm.xml style.qss $d/
+      cp shaders/*.frag shaders/*.prog shaders/*.vert $d/shaders/
+      cp doc/*.html doc/docsys.css doc/favicon.ico $d/doc/
+      cp lang/*.ts lang/*.tm $d/lang/
+
+      substituteInPlace nifskope.desktop \
+        --replace 'Exec=nifskope' "Exec=$out/bin/nifskope" \
+        --replace 'Icon=nifskope' "Icon=$out/share/pixmaps/nifskope.png"
+      cp nifskope.desktop $out/share/applications/
+
+      find $out/share -type f -exec chmod -x {} \;
+    ''; # */
+
+  meta = {
+    homepage = http://niftools.sourceforge.net/;
+    description = "A tool for analyzing and editing NetImmerse/Gamebryo '*.nif' files";
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.bsd3;
+  };
+}

pkgs/tools/graphics/panomatic/default.nix

@@ -13,6 +13,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://aorlinsk2.free.fr/panomatic/;
     description = "Tool that automates the creation of control points in Hugin";
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
   };
 }

pkgs/tools/graphics/ploticus/default.nix

@@ -23,7 +23,7 @@ stdenv.mkDerivation {
       statistical capabilities.  It allows significant user control
       over colors, styles, options and details.'';
 
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
     homepage = http://ploticus.sourceforge.net/;
   };
 }

pkgs/tools/graphics/plotutils/default.nix

@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gnu.org/software/plotutils/;
 
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
     maintainers = [
       stdenv.lib.maintainers.marcweber
       stdenv.lib.maintainers.ludo

pkgs/tools/graphics/pngcrush/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libpng }:
 
 stdenv.mkDerivation rec {
-  name = "pngcrush-1.7.71";
+  name = "pngcrush-1.7.76";
 
   src = fetchurl {
     url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz";
-    sha256 = "095al1l86h55aiig3y1aqlwkxcwwf215lq3f29z1hdgz4a0sbcyd";
+    sha256 = "0jbv3ijc0nfhy6pkhv4dwbk2v488rwixd8rv1c7lfs59wblb44hv";
   };
 
   configurePhase = ''

pkgs/tools/graphics/pngquant/default.nix

@@ -22,5 +22,6 @@ stdenv.mkDerivation rec {
     description = "pngquant converts 24/32-bit RGBA PNGs to 8-bit palette with alpha channel preserved";
     platforms = platforms.all;
     license = licenses.bsd2; # Not exactly bsd2, but alike
+    broken = true;
   };
 }

pkgs/tools/graphics/pngtoico/default.nix

@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.kernel.org/pub/software/graphics/pngtoico/;
     description = "Small utility to convert a set of PNG images to Microsoft ICO format";
-    license = "GPLv2+";
+    license = stdenv.lib.licenses.gpl2Plus;
     platforms = with stdenv.lib.platforms; linux;
   };
 }

pkgs/tools/graphics/povray/default.nix

@@ -1,21 +1,39 @@
-{stdenv, fetchurl}:
+{stdenv, fetchgit, autoconf, automake, boost149, zlib, libpng, libjpeg, libtiff}:
 
+let boost = boost149; in
 stdenv.mkDerivation {
-  name = "povray-3.6";
+  name = "povray-3.7";
 
-  src = fetchurl {
-    url = http://www.povray.org/redirect/www.povray.org/ftp/pub/povray/Official/Unix/povray-3.6.tar.bz2;
-    sha256 = "0wvsfgkybx28mj2p76nnsq9rdq50192g5qb7d0xk81s8skn7z2jf";
+  src = fetchgit {
+    url = "https://github.com/POV-Ray/povray.git";
+    rev = "39ce8a24e50651904010dda15872d63be15d7c37";
+    sha256 = "0d56631d9daacb8967ed359025f56acf0bd505d1d9e752859e8ff8656ae72d20";
   };
 
+
+  buildInputs = [ autoconf automake boost zlib libpng libjpeg libtiff ];
+
   # the installPhase wants to put files into $HOME. I let it put the files
   # to $TMPDIR, so they don't get into the $out
-  patchPhase = ''
-    sed -i -e 's/^povconfuser.*/povconfuser=$(TMPDIR)\/povray/' Makefile.{am,in};
+  postPatch = '' cd unix
+                 ./prebuild.sh
+                 cd ..
+                 sed -i -e 's/^povconfuser.*/povconfuser=$(TMPDIR)\/povray/' Makefile.{am,in}
+                 sed -i -e 's/^povuser.*/povuser=$(TMPDIR)\/.povray/' Makefile.{am,in}
+                 sed -i -e 's/^povowner.*/povowner=nobody/' Makefile.{am,in}
+                 sed -i -e 's/^povgroup.*/povgroup=nogroup/' Makefile.{am,in}
+               '';
+
+  configureFlags = "COMPILED_BY='nix' --with-boost-libdir=${boost}/lib --with-boost-includedir=${boost}/include";
+
+  preInstall = ''
+    mkdir "$TMP/bin"
+    for i in chown chgrp; do
+      echo '#!/bin/sh' >> "$TMP/bin/$i"
+      chmod +x "$TMP/bin/$i"
+      PATH="$TMP/bin:$PATH"
+    done
   '';
-  # I didn't use configureFlags because I couldn't pass the quotes properly
-  # for the COMPILED_BY.
-  configurePhase = "./configure --prefix=$out COMPILED_BY=\"nix\"";
   
   meta = {
     homepage = http://www.povray.org/;

pkgs/tools/graphics/pstoedit/default.nix

@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   meta = { 
     description = "translates PostScript and PDF graphics into other vector formats";
     homepage = http://www.helga-glunz.homepage.t-online.de/pstoedit;
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
   };

pkgs/tools/graphics/zbar/default.nix

@@ -34,7 +34,14 @@ rec {
   configureFlags = ["--disable-video"];
       
   meta = {
-    description = "Bar code toolset";
+    description = "Bar code reader";
+    longDescription = ''
+      ZBar is an open source software suite for reading bar codes from various
+      sources, such as video streams, image files and raw intensity sensors. It
+      supports many popular symbologies (types of bar codes) including
+      EAN-13/UPC-A, UPC-E, EAN-8, Code 128, Code 39, Interleaved 2 of 5 and QR
+      Code.
+    '';
     maintainers = with a.lib.maintainers;
     [
       raskin

pkgs/tools/inputmethods/fcitx/default.nix

@@ -1,24 +1,33 @@
 { stdenv, fetchurl, pkgconfig, cmake, intltool, gettext
 , libxml2, enchant, isocodes, icu, libpthreadstubs
 , pango, cairo, libxkbfile, libXau, libXdmcp
+, dbus, gtk2, gtk3, qt4
 }:
 
 stdenv.mkDerivation rec {
   name = "fcitx-4.2.8.3";
+
   src = fetchurl {
     url = "http://download.fcitx-im.org/fcitx/${name}_dict.tar.xz";
     sha256 = "05dw6cbjh2jyjrkr4qx2bcq6nyhhrs0akf6fcjk5a72bgphhwqnb";
   };
 
-  buildInputs = [
+  patchPhase = ''
+    substituteInPlace src/frontend/qt/CMakeLists.txt \
+      --replace $\{QT_PLUGINS_DIR} $out/lib/qt4/plugins
+  '';
+
+  buildInputs = with stdenv.lib; [
     cmake enchant pango gettext libxml2 isocodes pkgconfig libxkbfile
     intltool cairo icu libpthreadstubs libXau libXdmcp
+    dbus gtk2 gtk3 qt4
   ];
 
   cmakeFlags = ''
-    -DENABLE_DBUS=OFF
-    -DENABLE_QT=OFF
-    -DENABLE_QT_IM_MODULE=OFF
+    -DENABLE_QT_IM_MODULE=ON
+    -DENABLE_GTK2_IM_MODULE=ON
+    -DENABLE_GTK3_IM_MODULE=ON
+    -DENABLE_GIR=OFF
     -DENABLE_OPENCC=OFF
     -DENABLE_PRESAGE=OFF
     -DENABLE_XDGAUTOSTART=OFF
@@ -27,7 +36,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://code.google.com/p/fcitx/";
     description = "A Flexible Input Method Framework";
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [iyzsong];
   };

pkgs/tools/misc/appdata-tools/default.nix

@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, pkgconfig, autoconf, automake, m4
+, intltool, glib, libsoup, gdk_pixbuf }:
+
+stdenv.mkDerivation rec {
+  version = "0_1_7";
+  name = "appdata_tools-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/hughsie/appdata-tools/archive/appdata_tools_${version}.tar.gz";
+    sha256 = "1bzqg4gy8gqhbk2qjizsm0b78li9mv84fb3d8qwfpxh7c7p360x8";
+  };
+
+  buildInputs = [ pkgconfig autoconf automake m4 intltool glib
+                  libsoup gdk_pixbuf ];
+
+  configureScript = "./autogen.sh";
+
+  meta = with stdenv.lib; {
+    homepage = "http://people.freedesktop.org/~hughsient/appdata";
+    description = "CLI designed to validate AppData descriptions for standards compliance and to the style guide";
+    platforms = platforms.linux;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ lethalman ];
+  };
+}

pkgs/tools/misc/autorandr/default.nix

@@ -36,6 +36,6 @@ in
     meta = {
       description = "Automatic display configuration selector based on connected devices";
       homepage = https://github.com/wertarbyte/autorandr;
-      maintainer = [ stdenv.lib.maintainers.coroa ];
+      maintainers = [ stdenv.lib.maintainers.coroa ];
     };
   }

pkgs/tools/misc/aws-mturk-clt/default.nix

@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = https://requester.mturk.com/developer;
     description = "Command line tools for interacting with the Amazon Mechanical Turk";
-    license = "unfree-redistributable";
+    license = "unfree-redistributable"; # Amazon http://aws.amazon.com/asl/
 
     longDescription =
       ''

pkgs/tools/misc/bfr/default.nix

@@ -13,6 +13,6 @@ stdenv.mkDerivation {
   meta = {
     description = "general-purpose command-line pipe buffer";
     homepage = http://www.glines.org/wiki/bfr;
-    license = "GPL2";
+    license = stdenv.lib.licenses.gpl2;
   };
 }

pkgs/tools/misc/bogofilter/default.nix

@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
       classifications and corrections.  It is based on a Bayesian
       filter.
     '';
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
   };
 }

pkgs/tools/misc/convmv/default.nix

@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ perl ];
 
   meta = with stdenv.lib; {
+    description = "Converts filenames from one encoding to another";
     platforms = platforms.linux ++ platforms.freebsd ++ platforms.cygwin;
     maintainers = [ maintainers.urkud ];
   };

pkgs/tools/misc/coreutils/default.nix

@@ -75,7 +75,7 @@ let
         operating system.
       '';
 
-      license = "GPLv3+";
+      license = stdenv.lib.licenses.gpl3Plus;
 
       maintainers = [ ];
     };

pkgs/tools/misc/cpuminer/default.nix

@@ -2,15 +2,17 @@
 
 stdenv.mkDerivation rec {
   name = "cpuminer-${version}";
-  version = "2.3.2";
+  version = "2.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/cpuminer/pooler-${name}.tar.gz";
-    sha256 = "10xnb58w90kq8xgnkk0z99c0b9p9pxhkhkcs9dml5pgxfrlakckg";
+    sha256 = "0yl3ca31ck732f4551svxw6lx1lrjr7rhld5v09v0bgm3z07nnrx";
   };
 
   buildInputs = [ curl jansson ];
 
+  configureFlags = [ "CFLAGS=-O3" ];
+
   meta = {
     homepage = https://github.com/pooler/cpuminer;
     description = "CPU miner for Litecoin and Bitcoin";

pkgs/tools/misc/cunit/default.nix

@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
 
     homepage = http://cunit.sourceforge.net/;
 
-    license = "lgpl";
+    license = stdenv.lib.licenses.lgpl2;
   };
 }
-

pkgs/tools/misc/cv/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "cv-2014-07-20";
+
+  src = fetchFromGitHub {
+    owner = "Xfennec";
+    repo = "cv";
+    rev = "7441de974cc13f3b07903bb86c41be4e45c8e81b";
+    sha256 = "19ky88b52a8zcv7lx802y4zi3sp0cdhya08cnax0yvlwwq43w6x9";
+  };
+
+  buildInputs = [ ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/Xfennec/cv;
+    description = "Tool that shows the progress of coreutils programs";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ pSub ];
+  };
+}

pkgs/tools/misc/debian-devscripts/default.nix

@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   '';
   meta = {
     description = ''Debian package maintenance scripts'';
-    license = "GPL (various)"; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only...
+    license = "GPL (various)"; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO
     maintainers = with stdenv.lib.maintainers; [raskin];
   };
 }

pkgs/tools/misc/debootstrap/default.nix

@@ -20,7 +20,7 @@ let
     ];
     # TODO install man
     installPhase = ''
-      ensureDir $out/sbin
+      mkdir -p $out/sbin
       ls -l
       t=$out/sbin/MAKEDEV
       cp MAKEDEV $t
@@ -32,13 +32,13 @@ in
 
 stdenv.mkDerivation {
 
-  name = "debootstrap-1.0.42";
+  name = "debootstrap-1.0.60";
 
   src = fetchurl {
     # git clone git://git.debian.org/d-i/debootstrap.git
     # I'd like to use the source. However it's lacking the lanny script ? (still true?)
-    url = http://ftp.de.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.42.tar.gz;
-    sha256 = "0a5azl22wz1q92b2c91zlpz6krd7wqyi63yk87vyczp363ml0nz0";
+    url = http://ftp.de.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.60.tar.xz;
+    sha256 = "0jyxfmx466fsqak00m4n6b04zsdqym81ybah7yx2l081d0518sw8";
   };
 
   buildInputs = [ dpkg gettext gawk perl ];
@@ -78,7 +78,7 @@ stdenv.mkDerivation {
       functions
 
     d=$out/share/debootstrap
-    ensureDir $out/{share/debootstrap,bin}
+    mkdir -p $out/{share/debootstrap,bin}
 
     ${fakeroot}/bin/fakeroot -- make devices.tar.gz MAKEDEV=${makedev}/sbin/MAKEDEV
 
@@ -94,7 +94,7 @@ stdenv.mkDerivation {
     EOF
     chmod +x $out/bin/debootstrap
 
-    ensureDir $out/man/man8
+    mkdir -p $out/man/man8
     mv debootstrap.8 $out/man/man8
   '';
 
@@ -105,7 +105,7 @@ stdenv.mkDerivation {
   meta = { 
     description = "Tool to create a Debian system in a chroot";
     homepage = http://packages.debian.org/de/lenny/debootstrap; # http://code.erisian.com.au/Wiki/debootstrap
-    license = "GPL-2"; # gentoo says so.. ?
+    license = stdenv.lib.licenses.gpl2; # gentoo says so.. ?
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
   };

pkgs/tools/misc/detox/default.nix

@@ -19,6 +19,6 @@ stdenv.mkDerivation {
       (or CP-1252) characters in them.
     '';
     homepage = "http://detox.sourceforge.net/";
-    license = "bsd";
+    license = stdenv.lib.licenses.bsd3;
   };
 }

pkgs/tools/misc/direnv/default.nix

@@ -1,14 +1,14 @@
 { fetchurl, stdenv, go }:
 
 let
-  version = "2.2.1";
+  version = "2.4.0";
 in
 stdenv.mkDerivation {
   name = "direnv-${version}";
   src = fetchurl {
     url = "http://github.com/zimbatm/direnv/archive/v${version}.tar.gz";
     name = "direnv-${version}.tar.gz";
-    sha256 = "6d55cb96189e20609a08133fe9392c50209cd435b4f77e3baaa0f423d82ae59a";
+    sha256 = "aab8028cc1d68461dd1f6c3c9d000eef10273c52399fe5d1dd917f2f4a1a349a";
   };
 
   buildInputs = [ go ];
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
     '';
     homepage = http://direnv.net;
     license = stdenv.lib.licenses.mit;
-    hydraPlatforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.zimbatm ];
+    platforms = go.meta.platforms;
   };
 }

pkgs/tools/misc/dvtm/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "dvtm-0.10";
+  name = "dvtm-0.12";
 
   meta = {
     description = "Dynamic virtual terminal manager";
-    homepage = "http://www.brain-dump.org/projects/dvtm";
+    homepage = http://www.brain-dump.org/projects/dvtm;
     license = stdenv.lib.licenses.mit;
     platfroms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ iyzsong ];
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/${name}.tar.gz";
-    sha256 = "0lb6p06jfaz1z07k0v2gipzx67swf7rijz17g5ndhng2g0jqfl3p";
+    sha256 = "0qcwsxhg738rq3bh4yid15nz2rrjc9k7ay6c1qv15c3gkw86zc3f";
   };
 
   buildInputs = [ ncurses ];