Merge branch 'master' into staging

pkgs/tools/X11/ffcast/default.nix

@@ -1,22 +1,20 @@
-{ stdenv, fetchgit, autoconf, automake, perl, libX11 }:
+{ stdenv, fetchFromGitHub, autoreconfHook, perl, libX11 }:
 
 stdenv.mkDerivation rec {
   name = "ffcast-${version}";
   version = "2.5.0";
-  rev = "7c3bf681e7ca9b242e55dbf0c07856ed994d94e9";
 
-  src = fetchgit {
-    url = https://github.com/lolilolicon/FFcast;
-    sha256 = "1s1y6rqjq126jvdzc75wz20szisbz8h8fkphlwxcxzl9xll17akj";
+  src = fetchFromGitHub {
+    owner = "lolilolicon";
+    repo = "FFcast";
+    rev = "${version}";
+    sha256 = "047y32bixhc8ksr98vwpgd0k1xxgsv2vs0n3kc2xdac4krc9454h";
   };
 
-  buildInputs = [ autoconf automake perl libX11 ];
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ perl libX11 ];
 
-  preConfigure = ''
-    ./bootstrap
-  '';
-
-  configureFlags = [ "--enable-xrectsel" ];
+  configureFlags = [ "--disable-xrectsel" ];
 
   postBuild = ''
     make DESTDIR="$out" install

pkgs/tools/X11/xrectsel/default.nix

@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, libX11 }:
+
+stdenv.mkDerivation rec {
+  name = "xrectsel-${version}";
+  version = "0.3.2";
+
+  src = fetchFromGitHub {
+    owner = "lolilolicon";
+    repo = "xrectsel";
+    rev = "${version}";
+    sha256 = "0prl4ky3xzch6xcb673mcixk998d40ngim5dqc5374b1ls2r6n7l";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ libX11 ];
+
+  postBuild = ''
+    make DESTDIR="$out" install
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Print the geometry of a rectangular screen region";
+    homepage = https://github.com/lolilolicon/xrectsel;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.guyonvarch ];
+    platforms = platforms.linux;
+  };
+}

pkgs/tools/filesystems/disorderfs/default.nix

@@ -2,13 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "disorderfs-${version}";
-  version = "0.4.2";
+  version = "0.5.1";
 
   src = fetchurl {
     url = "http://http.debian.net/debian/pool/main/d/disorderfs/disorderfs_${version}.orig.tar.gz";
-    sha256 = "1qr52lzynd5b5ancrn0g1ah95w7iikxgqsmixlacn2vlh8n9jym5";
+    sha256 = "0nnxk0qqww16ra52mi5giw50zpssvan62nkig5dcxvgcvv51akik";
   };
 
+  sourceRoot = ".";
+
   nativeBuildInputs = [ pkgconfig asciidoc ];
 
   buildInputs = [ fuse attr ];

pkgs/tools/misc/clipster/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation  rec {
   name = "clipster-unstable-${version}";
-  version = "2016-09-12";
+  version = "2016-12-08";
 
   src = fetchFromGitHub {
     owner = "mrichar1";
     repo = "clipster";
-    rev = "6526a849a0af4c392f4e8e5b18aacdda9c1a8e80";
-    sha256 = "0illdajp5z50h7lvglv0p72cpv4c592xmpamrg8kkjpg693bp873";
+    rev = "7a3511d89dbbb4157118eec15f1e9e6fd0ad1a6b";
+    sha256 = "005akgk1wn3z5vxfjii202zzwz85zydimfgm69ml68imj5vbhkg1";
   };
 
   pythonEnv = python.withPackages(ps: with ps; [ dbus-python pygtk pygobject3 ]);

pkgs/tools/misc/debianutils/default.nix

@@ -0,0 +1,28 @@
+{ stdenv, fetchurl }:
+
+let
+  checksums = {
+    "4.8.1" = "09phylg8ih1crgxjadkdb8idbpj9ap62a7cbh8qdx2gyvh5mqf9c";
+  };
+in stdenv.mkDerivation rec {
+  version = "4.8.1";
+  name = "debianutils-${version}";
+
+  src = fetchurl {
+    url = "mirror://debian/pool/main/d/debianutils/debianutils_${version}.tar.xz";
+    sha256 = checksums."${version}";
+  };
+
+  meta = {
+    description = "Miscellaneous utilities specific to Debian";
+    longDescription = ''
+       This package provides a number of small utilities which are used primarily by the installation scripts of Debian packages, although you may use them directly.
+
+       The specific utilities included are: add-shell installkernel ischroot remove-shell run-parts savelog tempfile which 
+    '';
+    downloadPage = https://packages.debian.org/sid/debianutils;
+    license = with stdenv.lib.licenses; [ gpl2Plus publicDomain smail ];
+    maintainers = [];
+    platforms = stdenv.lib.platforms.all;
+  };
+}

pkgs/tools/misc/entr/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "entr-${version}";
-  version = "3.5";
+  version = "3.6";
 
   src = fetchurl {
     url = "http://entrproject.org/code/${name}.tar.gz";
-    sha256 = "05k4jyjna0pr2dalwc1l1dhrcyk6pw7hbss7jl4ykwfadcs5br73";
+    sha256 = "1sy81np6kgmq04kfn2ckf4fp7jcf5d1963shgmapx3al3kc4c9x4";
   };
 
   postPatch = ''

pkgs/tools/misc/peruse/default.nix

@@ -1,12 +1,12 @@
 {
   kdeDerivation, kdeWrapper, fetchFromGitHub, fetchurl, lib,
   ecm, kdoctools,
-  baloo, kconfig, kfilemetadata, kinit, kirigami, plasma-framework
+  baloo, kconfig, kfilemetadata, kinit, kirigami, knewstuff, plasma-framework
 }:
 
 let
   pname = "peruse";
-  version = "1.1";
+  version = "1.2";
   unarr = fetchFromGitHub {
     owner  = "zeniko";
     repo   = "unarr";
@@ -18,15 +18,17 @@ let
 
     src = fetchurl {
       url = "mirror://kde/stable/${pname}/${name}.tar.xz";
-      sha256 = "1akk9hg12y6iis0rb5kdkznm3xk7hk04r9ccqyz8lr6y073n5f9j";
+      sha256 = "1ik2627xynkichsq9x28rkczqn3l3p06q6vw5jdafdh3hisccmjq";
     };
 
     nativeBuildInputs = [ ecm kdoctools ];
 
-    propagatedBuildInputs = [ baloo kconfig kfilemetadata kinit kirigami plasma-framework ];
+    propagatedBuildInputs = [ baloo kconfig kfilemetadata kinit kirigami knewstuff plasma-framework ];
+
+    pathsToLink = [ "/etc/xdg/peruse.knsrc"];
 
     preConfigure = ''
-      rmdir src/qtquick/karchive-rar/external/unarr
+      rm -rf src/qtquick/karchive-rar/external/unarr
       ln -s ${unarr} src/qtquick/karchive-rar/external/unarr
     '';
 
@@ -39,5 +41,5 @@ let
 
 in kdeWrapper {
   inherit unwrapped;
-  targets = [ "bin/peruse" ];
+  targets = [ "bin/peruse" "bin/perusecreator" ];
 }

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

@@ -15,11 +15,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2017.01.02";
+  version = "2017.01.08";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "140de01ea879cdc50bc34240802d5c10231baf448d7a664e6efeb9d5efb74d5b";
+    sha256 = "ac2942d001003575858ff044dd1c1c264ab08527efa1af7036f773ea82b25fd6";
   };
 
   buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;

pkgs/tools/networking/axel/default.nix

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "axel-${version}";
-  version = "2.11";
+  version = "2.12";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/a/axel/axel_${version}.orig.tar.gz";
-    sha256 = "05askz9pi8kvjyn66rszjfg9arwdzl72jwd38q9h9n5s37vqslky";
+    sha256 = "12sa5whd5mjn1idd83hbhm0rmsh5bvhhgvv03fk5cgxynwkbprr8";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

pkgs/tools/networking/ferm/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, perl, ebtables, ipset, iptables }:
 
 stdenv.mkDerivation rec {
-  version = "2.3";
+  version = "2.3.1";
   name = "ferm-${version}";
 
   src = fetchurl {
-    url = "http://ferm.foo-projects.org/download/${version}/ferm-${version}.tar.gz";
-    sha256 = "0jx63fhjw5y1ahgdbn4hgd7sq6clxl80dr8a2hkryibfbwz3vs4x";
+    url = "http://ferm.foo-projects.org/download/2.3/ferm-${version}.tar.gz";
+    sha256 = "1scdnd2jk4787jyr6fxav2598g0x7hjic5b8bj77j8s0hki48m4a";
   };
 
   buildInputs = [ perl ipset ebtables iptables makeWrapper ];

pkgs/tools/typesetting/pdf2djvu/default.nix

@@ -1,15 +1,21 @@
 { stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.4";
+  version = "0.9.5";
   name = "pdf2djvu-${version}";
 
   src = fetchurl {
-    url = "https://bitbucket.org/jwilk/pdf2djvu/downloads/${name}.tar.xz";
-    sha256 = "1a1gwr6yzbiximbpgg4rc69dq8g3jmxwcbcwqk0fhfbgzj1j4w65";
+    url = "https://github.com/jwilk/pdf2djvu/releases/download/${version}/${name}.tar.xz";
+    sha256 = "0fr8b44rsqll2m6qnh9id1lfc980k7rj3aq975mwba4y57rwnlnc";
   };
 
-  buildInputs = [ pkgconfig djvulibre poppler fontconfig libjpeg ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ djvulibre poppler fontconfig libjpeg ];
+
+  preConfigure = ''
+    sed -i 's#\$djvulibre_bin_path#${djvulibre.bin}/bin#g' configure
+  '';
 
   meta = with stdenv.lib; {
     description = "Creates djvu files from PDF files";

pkgs/tools/typesetting/rubber/default.nix

@@ -1,23 +1,30 @@
 { fetchurl, stdenv, python2Packages, texinfo }:
 
-stdenv.mkDerivation rec {
-  name = "rubber-1.3";
+python2Packages.buildPythonApplication rec {
+  name = "rubber-${version}";
+  version = "1.4";
 
   src = fetchurl {
-    url = "https://launchpad.net/rubber/trunk/1.3/+download/rubber-1.3.tar.gz";
-    sha256 = "09715apfd6a0haz1mqsxgm8sj4rwzi38gcz2kz020zxk5rh0dksh";
+    url = "https://launchpad.net/rubber/trunk/${version}/+download/${name}.tar.gz";
+    sha256 = "1d7hq19vpb3l31grldbxg8lx1qdd18f5f3gqw96q0lhf58agcjl2";
   };
 
-  buildInputs = [ python2Packages.python texinfo ];
-  nativeBuildInputs = [ python2Packages.wrapPython ];
+  propagatedBuildInputs = [ texinfo ];
 
-  patchPhase = ''
-    substituteInPlace configure --replace which "type -P"
+  # I couldn't figure out how to pass the proper parameter to disable pdf generation, so we
+  # use sed to change the default
+  preBuild = ''
+    sed -i -r 's/pdf\s+= True/pdf = False/g' setup.py
   '';
 
-  postInstall = "wrapPythonPrograms";
+  # the check scripts forces python2. If we need to use python3 at some point, we should use
+  # the correct python
+  checkPhase = ''
+    sed -i 's|python=python2|python=${python2Packages.python.interpreter}|' tests/run.sh
+    cd tests && ${stdenv.shell} run.sh
+  '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Wrapper for LaTeX and friends";
     longDescription = ''
       Rubber is a program whose purpose is to handle all tasks related
@@ -28,9 +35,9 @@ stdenv.mkDerivation rec {
       produce PostScript documents is also included, as well as usage
       of pdfLaTeX to produce PDF documents.
     '';
-    license = stdenv.lib.licenses.gpl2Plus;
-    homepage = http://www.pps.jussieu.fr/~beffara/soft/rubber/;
-    maintainers = [ stdenv.lib.maintainers.ttuegel ];
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.gpl2Plus;
+    homepage = https://launchpad.net/rubber;
+    maintainers = with maintainers; [ ttuegel peterhoeg ];
+    platforms = platforms.unix;
   };
 }