stdenv-updates: merge updates from 'master' branch

pkgs/tools/misc/desktop-file-utils/default.nix

@@ -13,5 +13,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.freedesktop.org/wiki/Software/desktop-file-utils;
     description = "Command line utilities for working with .desktop files";
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/tools/misc/gnokii/src-for-default.nix

@@ -2,7 +2,7 @@ rec {
    version="0.6.30";
    name="gnokii-0.6.30";
    hash="0k14dymifk7dx3z58cqrc4mgxrm17s4jk12chwdfjhjarz390x8p";
-   url="http://www.gnokii.org/download/gnokii/gnokii-${version}.tar.gz";
+   url="http://www.gnokii.org/download/gnokii/0.6.x/gnokii-${version}.tar.gz";
    advertisedUrl="http://www.gnokii.org/download/gnokii/gnokii-0.6.30.tar.gz";
   
   

pkgs/tools/misc/grub/2.0x.nix

@@ -1,13 +1,17 @@
 { fetchurl, stdenv, flex, bison, gettext, ncurses, libusb, freetype, qemu
-, EFIsupport ? false }:
+, devicemapper, EFIsupport ? false }:
 
 let
-    prefix = "grub${if EFIsupport then "-efi" else ""}";
-    version = "1.99";
-    unifont_bdf = fetchurl {
-      url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
-      sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx";
-    };
+
+  prefix = "grub${if EFIsupport then "-efi" else ""}";
+  
+  version = "2.00";
+  
+  unifont_bdf = fetchurl {
+    url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
+    sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx";
+  };
+  
 in
 
 stdenv.mkDerivation rec {
@@ -15,11 +19,11 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnu/grub/grub-${version}.tar.xz";
-    sha256 = "06q2a7bg1mbsms604a89fkdnwrc1jg9hr2mmfdmg3il39j6i827k";
+    sha256 = "0n64hpmsccvicagvr0c6v0kgp2yw0kgnd3jvsyd26cnwgs7c6kkq";
   };
 
   buildNativeInputs = [ flex bison ];
-  buildInputs = [ ncurses libusb freetype gettext ]
+  buildInputs = [ ncurses libusb freetype gettext devicemapper ]
     ++ stdenv.lib.optional doCheck qemu;
 
   preConfigure =

pkgs/tools/misc/lockfile-progs/default.nix

@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, liblockfile }:
+
+stdenv.mkDerivation rec {
+  _name   = "lockfile-progs";
+  version = "0.1.16";
+  name    = "${_name}-${version}";
+
+  src = fetchurl {
+    url = "mirror://debian/pool/main/l/${_name}/${_name}_${version}.tar.gz";
+    sha256 = "0sca19mg0lk68ms6idy4vfp8dyjpcbq9f143v9qzjyk86bb34lgr";
+  };
+
+  buildInputs = [ liblockfile ];
+
+  installPhase = ''
+    mkdir -p $out/bin $out/man/man1
+    install -s bin/* $out/bin
+    install man/*.1 $out/man/man1
+  '';
+
+  meta = {
+    description = "Programs for locking and unlocking files and mailboxes";
+    homepage = http://packages.debian.org/sid/lockfile-progs;
+    license = "GPLv2";
+
+    maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}

pkgs/tools/misc/logstash/default.nix

@@ -0,0 +1,11 @@
+{ fetchurl }:
+
+let version = "1.1.0"; in
+
+fetchurl {
+  url = "http://semicomplete.com/files/logstash/logstash-${version}-monolithic.jar";
+
+  name = "logstash-${version}.jar";
+
+  sha256 = "03s9g2appsmdg973212dl37ldws36fgsvxi9w1lxbvmmclc4k7vc";
+}

pkgs/tools/misc/mmv/default.nix

@@ -0,0 +1,46 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "mmv-${version}";
+  version = "1.01b";
+
+  src = fetchurl {
+    url = "http://ftp.debian.org/debian/pool/main/m/mmv/mmv_${version}.orig.tar.gz";
+    sha256 = "0399c027ea1e51fd607266c1e33573866d4db89f64a74be8b4a1d2d1ff1fdeef";
+  };
+
+  patches = [
+    # Use Debian patched version, as upstream is no longer maintained and it
+    # contains a _lot_ of fixes.
+    (fetchurl {
+      url = "http://ftp.debian.org/debian/pool/main/m/mmv/mmv_${version}-15.diff.gz";
+      sha256 = "9ad3e3d47510f816b4a18bae04ea75913588eec92248182f85dd09bc5ad2df13";
+    })
+  ];
+
+  postPatch = ''
+    sed -i \
+      -e 's/^\s*LDFLAGS\s*=\s*-s\s*-N/LDFLAGS = -s/' \
+      -e "s|/usr/bin|$out/bin|" \
+      -e "s|/usr/man|$out/share/man|" \
+      Makefile
+  '';
+
+  preInstall = ''
+    mkdir -p "$out/bin" "$out/share/man/man1"
+  '';
+
+  postInstall = ''
+    for variant in mcp mad mln
+    do
+      ln -s mmv "$out/bin/$variant"
+      ln -s mmv.1 "$out/share/man/man1/$variant.1"
+    done
+  '';
+
+  meta = {
+    homepage = "http://linux.maruhn.com/sec/mmv.html";
+    description = "Utility for wildcard renaming, copying, etc";
+    license = stdenv.lib.licenses.gpl2;
+  };
+}

pkgs/tools/misc/ncdu/default.nix

@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "ncdu-${version}";
+  version = "1.8";
+
+  src = fetchurl {
+    url = "http://dev.yorhel.nl/download/${name}.tar.gz";
+    sha256 = "42aaf0418c05e725b39b220166a9c604a9c54c0fbf7692c9c119b36d0ed5d099";
+  };
+
+  buildInputs = [ ncurses ];
+
+  meta = {
+    description = "An ncurses disk usage analyzer.";
+    homepage = http://dev.yorhel.nl/ncdu;
+    license = stdenv.lib.licenses.mit;
+  };
+}

pkgs/tools/misc/plowshare/default.nix

@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, makeWrapper, curl }:
+
+let
+
+  v  = "20120807";
+
+in stdenv.mkDerivation {
+
+  name = "plowshare-git${v}";
+
+  src = fetchurl {
+    url = "http://plowshare.googlecode.com/files/plowshare-snapshot-git${v}.tar.gz";
+    sha256 = "0clryfssaa4rjvsy760p51ppq1275lwvhm9jh3g4mi973xv4n8si";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+
+  installPhase = ''
+    make PREFIX="$out" install
+
+    for fn in plow{del,down,list,up}; do
+      wrapProgram "$out/bin/$fn" --prefix PATH : "${curl}/bin"
+    done
+  '';
+
+  meta = {
+    description = ''
+      A command-line download/upload tool for popular file sharing websites
+    '';
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.aforemny ];
+  };
+}

pkgs/tools/misc/pv/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl } :
 
 stdenv.mkDerivation rec {
-  name = "pv-1.3.1";
+  name = "pv-1.3.4";
 
   src = fetchurl {
     url = "http://www.ivarch.com/programs/sources/${name}.tar.bz2";
-    sha256 = "1fwvdj663g3jf3rcxi788pv1l7s86sxna78xi2nl5qimng05y8jl";
+    sha256 = "114b730pghgg4gv9d798817n3am88p2b0xgdavch1vhklzh33c16";
   };
 
   meta = {

pkgs/tools/misc/xclip/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, x11, libXmu }:
 
-stdenv.mkDerivation {
-  name = "xclip-0.11";
+stdenv.mkDerivation rec {
+  name = "xclip-0.12";
 
   src = fetchurl {
-    url = "mirror://sourceforge/xclip/xclip-0.11.tar.gz";
-    sha256 = "0ipwxkfqz66fz6jlln1v46sd2kr6bkqzq6j5hkzn6pb3grmzsacg";
+    url = "mirror://sourceforge/xclip/${name}.tar.gz";
+    sha256 = "0ibcf46rldnv0r424qcnai1fa5iq3lm5q5rdd7snsi5sb78gmixp";
   };
 
   buildInputs = [ x11 libXmu ];

pkgs/tools/misc/xvfb-run/default.nix

@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, makeWrapper, xkbcomp, xorgserver, getopt, xkeyboard_config, xauth, utillinux, which, fontsConf}:
+let
+  xvfb_run = fetchurl {
+    url = https://projects.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server;
+    sha256 = "1f9mrhqy0l72i3674n98bqlq9a10h0rh9qfjiwvivz3hjhq5c0gz";
+  };
+in
+stdenv.mkDerivation {
+  name = "xvfb-run";
+  buildInputs = [makeWrapper];
+  buildCommand = ''
+    mkdir -p $out/bin
+    cp ${xvfb_run} $out/bin/xvfb-run
+    sed -i 's|XVFBARGS="|XVFBARGS="-xkbdir ${xkeyboard_config}/etc/X11/xkb |' $out/bin/xvfb-run
+
+    chmod a+x $out/bin/xvfb-run
+    wrapProgram $out/bin/xvfb-run \
+      --set XKB_BINDIR "${xkbcomp}/bin" \
+      --set FONTCONFIG_FILE "${fontsConf}" \
+      --prefix PATH : ${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin
+  '';
+}