Merge remote-tracking branch 'origin/master' into systemd-219

pkgs/tools/misc/colord-gtk/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, colord, intltool, glib, gtk3, pkgconfig, lcms2 }:
 
 stdenv.mkDerivation rec {
-  name = "colord-gtk-0.1.25";
+  name = "colord-gtk-0.1.26";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz";
-    sha256 = "02hblw9rw24dhj0wqfw86pfq4y4icb6iaa92308a9jwa6k2923xx";
+    sha256 = "0i9y3bb5apj6a0f8cx36l6mjzs7xc0k7nf0magmf58vy2mzhpl18";
   };
 
   buildInputs = [ intltool colord glib gtk3 pkgconfig lcms2 ];

pkgs/tools/misc/fontforge/default.nix

@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "20141230"; # also tagged v2.1.0
+  version = "20150824"; # also tagged v2.1.0
 in
 
 stdenv.mkDerivation {
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/fontforge/fontforge/archive/${version}.tar.gz";
-    sha256 = "1xfi13knn1x7hd7pvr6090qz6qfa5znbs85rg1p5mfj377z2h8rb";
+    sha256 = "09zzg166lw5ldbzsa2j9x7hizn6y3ld1kf4abfkiy301rdqj9ar8";
   };
 
   patches = [(fetchpatch {

pkgs/tools/misc/goaccess/default.nix

@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, geoip, ncurses, glib }:
 
 let
-  version = "0.9";
+  version = "0.9.4";
   mainSrc = fetchurl {
     url = "http://tar.goaccess.io/goaccess-${version}.tar.gz";
-    sha256 = "1yi7bxrmhvd11ha405bqpz7q442l9bnnx317iy22xzxjl96frn29";
+    sha256 = "1kn5yvgzrzjlxd0zhr2d2gbjdin9j9vmfbk5gkrwqc4kd9zicvla";
   };
 in
 

pkgs/tools/misc/gparted/default.nix

@@ -1,19 +1,25 @@
-{ stdenv, fetchurl, parted, gtk, glib, intltool, gettext, libuuid
-, pkgconfig, gtkmm, libxml2, hicolor_icon_theme
+{ stdenv, fetchurl, intltool, gettext, makeWrapper
+, parted, gtk, glib, libuuid, pkgconfig, gtkmm, libxml2, hicolor_icon_theme
+, utillinux
 }:
 
 stdenv.mkDerivation rec {
-  name = "gparted-0.23.0";
+  name = "gparted-0.24.0";
 
   src = fetchurl {
-    sha256 = "0m57bni3nkbbqq920ydzvasy2qc5j6w6bdssyn12jk4157gxvlbz";
+    sha256 = "0q6d1s9f4qgdivj4vm9w87qmdfyq8s65jzkhv05rp9cl72rqlf82";
     url = "mirror://sourceforge/gparted/${name}.tar.bz2";
   };
 
   configureFlags = "--disable-doc";
 
   buildInputs = [ parted gtk glib libuuid gtkmm libxml2 hicolor_icon_theme ];
-  nativeBuildInputs = [ intltool gettext pkgconfig ];
+  nativeBuildInputs = [ intltool gettext makeWrapper pkgconfig ];
+
+  postInstall = ''
+    wrapProgram $out/sbin/gpartedbin \
+      --prefix PATH : "${utillinux}/bin"
+  '';
 
   meta = with stdenv.lib; {
     description = "Graphical disk partitioning tool";

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

@@ -20,7 +20,7 @@ let
   canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystems);
   inPCSystems = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) pcSystems);
 
-  version = "2.x-2015-07-27";
+  version = "2.x-2015-10-13";
 
   unifont_bdf = fetchurl {
     url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
@@ -43,8 +43,8 @@ stdenv.mkDerivation rec {
 
   src = fetchFromSavannah {
     repo = "grub";
-    rev = "72fc110d95129410443b898e931ff7a1db75312e";
-    sha256 = "0l2hws8h1jhww5s0m8pkwdggacpqb7fvz2jx83syg7ynczpgzbxs";
+    rev = "a3645c1240a0b89c3b51593bd3efc14fe66d67cf";
+    sha256 = "0vxc2hi4qgv3hm90q6m3s5a9xi3j40fkc0wqv09hfkw25rabqk60";
   };
 
   nativeBuildInputs = [ autogen flex bison python autoconf automake ];

pkgs/tools/misc/grub/trusted.nix

@@ -11,7 +11,7 @@ let
 
   inPCSystems = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) pcSystems);
 
-  version = "1.2.0";
+  version = "1.2.1";
 
   unifont_bdf = fetchurl {
     url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
@@ -32,8 +32,8 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "https://github.com/Sirrix-AG/TrustedGRUB2";
-    rev = "1ff54a5fbe02ea01df5a7de59b1e0201e08d4f76";
-    sha256 = "8c17bd7e14dd96ae9c4e98723f4e18ec6b21d45ac486ecf771447649829d0b34";
+    rev = "ab483d389bda3115ca0ae4202fd71f2e4a31ad41";
+    sha256 = "4b715837f8632278720d8b29aec06332f5302c6ba78183ced5f48d3c376d89c0";
   };
 
   nativeBuildInputs = [ autogen flex bison python autoconf automake ];

pkgs/tools/misc/grub4dos/default.nix

@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, unzip, nasm }:
+
+let arch =
+  if stdenv.isi686 then "i386"
+  else if stdenv.isx86_64 then "x86_64"
+  else abort "Unknown architecture";
+in stdenv.mkDerivation {
+  name = "grub4dos-0.4.6a";
+
+  src = fetchurl {
+    url = https://github.com/chenall/grub4dos/archive/e855b293432bd4d155e42d48356f9aa1974ec385.zip;
+    sha256 = "1vihzllsdshd5dyr7i7dp5ragyg77gg8r279pz954p7lkcda4kx7";
+  };
+
+  nativeBuildInputs = [ unzip nasm ];
+
+  configureFlags = [ "--host=${arch}-pc-linux-gnu" ];
+
+  postInstall = ''
+    mv $out/lib/grub/${arch}-pc/* $out/lib/grub
+    rmdir $out/lib/grub/${arch}-pc
+    chmod +x $out/lib/grub/bootlace.com
+  '';
+
+  dontStrip = true;
+  dontPatchELF = true;
+
+  meta = with stdenv.lib; {
+    homepage = http://grub4dos.chenall.net/;
+    description = "GRUB for DOS is the dos extension of GRUB";
+    maintainers = with maintainers; [ abbradar ];
+    platforms = platforms.all;
+    license = licenses.gpl2;
+  };
+}

pkgs/tools/misc/heatseeker/default.nix

@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, rustPlatform }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+  name = "heatseeker-${version}";
+  version = "1.3.0";
+
+  depsSha256 = "03jap7myf85xgx9270sws8x57nl04a1wx8szrk9qx24s9vnnjcnh";
+
+  src = fetchFromGitHub {
+    owner = "rschmitt";
+    repo = "heatseeker";
+    rev = "v${version}";
+    sha256 = "1xdvwgmh9lwv82hv1qg82bjv2iplnvva6lzbg7dyhbszhv7rhkbl";
+  };
+  
+  # some tests require a tty, this variable turns them off for Travis CI,
+  # which we can also make use of
+  TRAVIS= "true";
+
+  meta = with stdenv.lib; {
+    description = "A general-purpose fuzzy selector";
+    homepage = https://github.com/rschmitt/heatseeker;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ maintainers.michaelpj ];
+  };
+}

pkgs/tools/misc/less/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "less-475";
+  name = "less-481";
 
   src = fetchurl {
     url = "http://www.greenwoodsoftware.com/less/${name}.tar.gz";
-    sha256 = "16703m6g5l97af3jwpypgac7gpmh3yjkdpqygf5a2scfip0hxm2g";
+    sha256 = "19fxj0h10y5bhr3a1xa7kqvnwl44db3sdypz8jxl1q79yln8z8rz";
   };
 
   # Look for ‘sysless’ in /etc.

pkgs/tools/misc/mates/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, rustPlatform }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+  name = "mates-${version}";
+  version = "0.1.0";
+
+  depsSha256 = "03mqw9zs3hbsgz8m3qbrbbcg2q47nldfx280dyv0ivfksnlc7lyc";
+
+  src = fetchFromGitHub {
+    owner = "untitaker";
+    repo = "mates";
+    rev = "${version}";
+    sha256 = "00dpl7vh2byb4v94zxjbcqj7jnq65vcbrlpkxrrii0ip13dr69pw";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Very simple commandline addressbook";
+    homepage = https://github.com/untitaker/mates.rs;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ maintainers.DamienCassou ];
+  };
+}

pkgs/tools/misc/parallel/default.nix

@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl, makeWrapper, procps }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20150822";
+  name = "parallel-20150922";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "1ij7bjxhk2866mzh0v0v2m629b6d39r5ivwdzmh72s471m9hg45d";
+    sha256 = "05zf3jhjmswfr63lgxw8q26kysd72b8m0zy5jbc94r6appx8bd7j";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/tools/misc/picocom/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "picocom-${version}";
-  version = "2.0";
+  version = "2.1";
 
   src = fetchFromGitHub {
     owner = "npat-efault";
     repo = "picocom";
     rev = version;
-    sha256 = "0s990jiqlbcg3isvhr3bn4sb7b0k6qqbf1jdvs1fyy9h0iiwprjw";
+    sha256 = "1ac3xdfiw5bd24lw4l9hxc75rcagw0y182x7svhkqp2gwsvzkbjv";
   };
 
   buildInputs = [ makeWrapper ];

pkgs/tools/misc/screen/default.nix

@@ -13,6 +13,12 @@ stdenv.mkDerivation rec {
     sed -i -e "s|/usr/local|/non-existent|g" -e "s|/usr|/non-existent|g" configure Makefile.in */Makefile.in
   '';
 
+  # TODO: remove when updating the version of screen. Only a patch for 4.3.1
+  patches = stdenv.lib.optional stdenv.isDarwin (fetchurl {
+    url = "http://savannah.gnu.org/file/screen-utmp.patch\?file_id=34815";
+    sha256 = "192dsa8hm1zw8m638avzhwhnrddgizhyrwaxgwa96zr9vwai2nvc";
+  });
+
   buildInputs = [ ncurses ] ++ stdenv.lib.optional stdenv.isLinux pam;
 
   doCheck = true;

pkgs/tools/misc/sdl-jstest/default.nix

@@ -1,11 +1,11 @@
 { fetchgit, stdenv, cmake, pkgconfig, SDL, SDL2, ncurses, docbook_xsl }:
 
 stdenv.mkDerivation rec {
-  name = "sdl-jstest-20150625";
+  name = "sdl-jstest-20150806";
   src = fetchgit {
     url = "https://github.com/Grumbel/sdl-jstest";
-    rev = "3f54b86ebe0d2f95e9c1d034bc4ed02d6d2b6409";
-    sha256 = "d33e0a2c66b551ecf333590f1a6e1730093af31cee1be8757748624d42e14df1";
+    rev = "7b792376178c9656c851ddf106c7d57b2495e8b9";
+    sha256 = "3aa9a002de9c9999bd7c6248b94148f15dba6106489e418b2a1a410324f75eb8";
   };
 
   buildInputs = [ SDL SDL2 ncurses ];

pkgs/tools/misc/svtplay-dl/default.nix

@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "svtplay-dl-${version}";
-  version = "0.20.2015.09.13";
+  version = "0.20.2015.10.08";
 
   src = fetchFromGitHub {
     owner = "spaam";
     repo = "svtplay-dl";
     rev = version;
-    sha256 = "07wcjwc6kk0z8s7i3sc2n7zbbkbc2wwiclf3n0h5yk54marixql0";
+    sha256 = "0mf5w4js2q4ahhkv3k6vs88haf02krhyl217cy05nw7wgxlrr5fx";
   };
 
   pythonPaths = [ pycrypto requests2 ];

pkgs/tools/misc/tlp/default.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper, perl, systemd, iw, rfkill, hdparm, ethtool, inetutils, kmod
 , enableRDW ? true, networkmanager }:
 
-let version = "0.7";
+let version = "0.8";
 in stdenv.mkDerivation {
   inherit enableRDW;
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation {
         owner = "linrunner";
         repo = "TLP";
         rev = "${version}";
-        sha256 = "0vgx2jnk9gp41fw992l9dmv462jpcrnwqkzsa8z0lh0l77ax2jcg";
+        sha256 = "19fvk0xz6i2ryf41akk4jg1c4sb4rcyxdl9fr0w4lja7g76d5zww";
       };
 
   makeFlags = [ "DESTDIR=$(out)"

pkgs/tools/misc/tmate/default.nix

@@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
 
   preConfigure = "./autogen.sh";
 
+  postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace msgpack/bootstrap --replace glibtoolize libtoolize
+  '';
+
   meta = {
     homepage = http://tmate.io/;
     description = "Instant Terminal Sharing";

pkgs/tools/misc/tmux/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "tmux-${version}";
-  version = "2.0";
+  version = "2.1";
 
   src = fetchurl {
     url = "https://github.com/tmux/tmux/releases/download/${version}/${name}.tar.gz";
-    sha256 = "0qnkda8kb747vmbldjpb23ksv9pq3s65xhh1ja5rdsmh8r24npvr";
+    sha256 = "0xk1mylsb08sf0w597mdgj9s6hxxjvjvjd6bngpjvvxwyixlwmii";
   };
 
   nativeBuildInputs = [ pkgconfig ];

pkgs/tools/misc/units/default.nix

@@ -1,10 +1,11 @@
 {stdenv, fetchurl}:
-stdenv.mkDerivation {
-  name = "units-2.11";
+stdenv.mkDerivation rec {
+  name = "units-${version}";
+  version = "2.12";
 
   src = fetchurl {
-    url = mirror://gnu/units/units-2.11.tar.gz;
-    sha256 = "1gjs3wc212aaiq4r76hx9nl1h3fa39n0ljwl9420d6ixl3rdmdjk";
+    url = "mirror://gnu/units/${name}.tar.gz";
+    sha256 = "1jxvjknz2jhq773jrwx9gc1df3gfy73yqmkjkygqxzpi318yls3q";
   };
 
   meta = {

pkgs/tools/misc/vdirsyncer/default.nix

@@ -1,17 +1,17 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  version = "0.6.0";
+  version = "0.7.0";
   name = "vdirsyncer-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://pypi.python.org/packages/source/v/vdirsyncer/${name}.tar.gz";
-    sha256 = "1mb0pws5vsgnmyp5dp5m5jvgl6jcvdamxjz7wmgvxkw6n1vrcahd";
+    sha256 = "0ahpi62yk6l06zjkpbhw1gp75x3qi9gcvm3yx6xcg5sz105y5yfx";
   };
 
   propagatedBuildInputs = with pythonPackages; [
-    click
+    click click-log click-threading
     lxml
     setuptools
     setuptools_scm

pkgs/tools/misc/yank/default.nix

@@ -0,0 +1,35 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+
+  name = "yank-${meta.version}";
+
+  src = fetchFromGitHub {
+    owner = "mptre";
+    repo = "yank";
+    rev = "v${meta.version}";
+    sha256 = "066nsm8b5785r2zaajihf8g6x9hc4n8kpk3j2n1slp5alnhx93mx";
+    inherit name;
+  };
+
+  installPhase = ''
+    PREFIX=$out make install
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/mptre/yank";
+    description = "Yank terminal output to clipboard";
+    longDescription = ''
+      Read input from stdin and display a selection interface that allows a
+      field to be selected and copied to the clipboard. Fields are determined
+      by splitting the input on a delimiter sequence, optionally specified
+      using the -d option. New line, carriage return and tab characters are
+      always treated as delimiters.
+    '';
+    downloadPage = "https://github.com/mptre/yank/releases";
+    license = licenses.mit;
+    version = "0.4.1";
+    maintainers = [ maintainers.dochang ];
+  };
+
+}

pkgs/tools/misc/youtube-dl/default.nix

@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   name = "youtube-dl-${version}";
-  version = "2015.08.28";
+  version = "2015.10.06.2";
 
   src = fetchurl {
     url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "0iahbynd6fw097a4cc57w26szlbqsmhb8v5ny6qrcil0d4wdqqvp";
+    sha256 = "0pxj1z5ay97iqh086qz7rxlp197py71f2mdmshz8rrhcjd6vw1sr";
   };
 
   buildInputs = [ makeWrapper zip pandoc ];