Merge remote-tracking branch 'upstream/master' into HEAD

pkgs/tools/misc/bibtex2html/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, ocaml }:
+
+stdenv.mkDerivation rec {
+  name = "bibtex2html-${version}";
+  version = "1.98";
+
+  src = fetchurl {
+    url = http://www.lri.fr/~filliatr/ftp/bibtex2html/bibtex2html-1.98.tar.gz;
+    sha256 = "1mh6hxmc9qv05hgjc11m2zh5mk9mk0kaqp59pny18ypqgfws09g9";
+  };
+
+  buildInputs = [ ocaml ];
+
+  meta = with stdenv.lib; {
+    description = "A collection of tools for translating from BibTeX to HTML";
+    homepage = https://www.lri.fr/~filliatr/bibtex2html/;
+    licence = licenses.gpl2;
+    platforms = ocaml.meta.platforms or [];
+    maintainers = [ maintainers.scolobb ];
+  };
+}

pkgs/tools/misc/ipxe/default.nix

@@ -27,8 +27,12 @@ stdenv.mkDerivation {
     ];
 
 
+  enabledOptions = [ "DOWNLOAD_PROTO_HTTPS" ];
+
   configurePhase = ''
-    echo "#define  DOWNLOAD_PROTO_HTTPS" >> src/config/general.h
+    runHook preConfigure
+    for opt in $enabledOptions; do echo "#define $opt" >> src/config/general.h; done
+    runHook postConfigure
   '';
 
   preBuild = "cd src";

pkgs/tools/misc/peruse/default.nix

@@ -0,0 +1,42 @@
+{
+  kdeDerivation, kdeWrapper, fetchFromGitHub, fetchurl, lib,
+  ecm, kdoctools,
+  baloo, kconfig, kfilemetadata, kinit, kirigami, plasma-framework
+}:
+
+let
+  pname = "peruse";
+  version = "1.1";
+  unarr = fetchFromGitHub {
+    owner  = "zeniko";
+    repo   = "unarr";
+    rev    = "d1be8c43a82a4320306c8e835a86fdb7b2574ca7";
+    sha256 = "03ds5da69zipa25rsp76l6xqivrh3wcgygwyqa5x2rgcz3rjnlpr";
+  };
+  unwrapped = kdeDerivation rec {
+    name = "${pname}-${version}";
+
+    src = fetchurl {
+      url = "mirror://kde/stable/${pname}/${name}.tar.xz";
+      sha256 = "1akk9hg12y6iis0rb5kdkznm3xk7hk04r9ccqyz8lr6y073n5f9j";
+    };
+
+    nativeBuildInputs = [ ecm kdoctools ];
+
+    propagatedBuildInputs = [ baloo kconfig kfilemetadata kinit kirigami plasma-framework ];
+
+    preConfigure = ''
+      rmdir src/qtquick/karchive-rar/external/unarr
+      ln -s ${unarr} src/qtquick/karchive-rar/external/unarr
+    '';
+
+    meta = with lib; {
+      license = licenses.gpl2;
+      maintainers = with maintainers; [ peterhoeg ];
+    };
+
+  };
+
+in kdeWrapper unwrapped {
+  targets = [ "bin/peruse" ];
+}

pkgs/tools/misc/screenfetch/default.nix

@@ -1,14 +1,15 @@
-{ stdenv, fetchgit, makeWrapper
-, coreutils, gawk, procps, gnused, findutils, xdpyinfo, xprop, gnugrep
+{ stdenv, fetchFromGitHub, makeWrapper, coreutils, gawk, procps, gnused
+, findutils, xdpyinfo, xprop, gnugrep, ncurses
 }:
 
 stdenv.mkDerivation {
-  name = "screenFetch-2016-01-13";
+  name = "screenFetch-2016-10-11";
 
-  src = fetchgit {
-    url = git://github.com/KittyKatt/screenFetch.git;
-    rev = "22e5bee7647453d45ec82f543f37b8a6a062835d";
-    sha256 = "0xdiz02bqg7ajj547j496qq9adysm1f6zymcy3yyfgw3prnzvdir";
+  src = fetchFromGitHub {
+    owner = "KittyKatt";
+    repo = "screenFetch";
+    rev = "89e51f24018c89b3647deb24406a9af3a78bbe99";
+    sha256 = "0i2k261jj2s4sfhav7vbsd362pa0gghw6qhwafhmicmf8hq2a18v";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -28,7 +29,8 @@ stdenv.mkDerivation {
       --prefix PATH : "${findutils}/bin" \
       --prefix PATH : "${xdpyinfo}/bin" \
       --prefix PATH : "${xprop}/bin" \
-      --prefix PATH : "${gnugrep}/bin"
+      --prefix PATH : "${gnugrep}/bin" \
+      --prefix PATH : "${ncurses}/bin"
   '';
 
   meta = {

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

@@ -5,13 +5,13 @@ let
   inherit (pythonPackages) python nose pycrypto requests2 mock;
 in stdenv.mkDerivation rec {
   name = "svtplay-dl-${version}";
-  version = "1.6";
+  version = "1.7";
 
   src = fetchFromGitHub {
     owner = "spaam";
     repo = "svtplay-dl";
     rev = version;
-    sha256 = "12r4yazsxk09sampiz9j1jqgzm3136h5fgbbdaiwg43b0y1sjg3d";
+    sha256 = "15vadnyah51pk4d0lx11bymxhfq47l5ijn72pjqr9yjx3pkgpd7w";
   };
 
   pythonPaths = [ pycrypto requests2 ];

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

@@ -14,11 +14,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2016.10.07";
+  version = "2016.10.19";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "56be6107275cbdc867e89caf9d20f351d184fdc4fb06d915945fef708086dbce";
+    sha256 = "ed8d4a247c4cfffe2a1171b4f9c20be19e84d96bcf3716f46988c8503b1b7713";
   };
 
   buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc;