Merge branch 'master' into staging

7 files changed, 34 insertions, 92 deletions

diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index d60b47ca0116..e70efe6c4f11 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -1,38 +1,16 @@
 { stdenv, fetchurl, dpkg, gettext, gawk, perl, wget, coreutils, fakeroot }:
 
-let
 # USAGE like this: debootstrap sid /tmp/target-chroot-directory
 # There is also cdebootstrap now. Is that easier to maintain?
-  makedev = stdenv.mkDerivation {
-    name = "makedev-for-debootstrap";
-    src = fetchurl {
-            url = mirror://debian/pool/main/m/makedev/makedev_2.3.1.orig.tar.gz;
-            sha256 = "1yhxlj2mhn1nqkx1f0sn0bl898nf28arxxa4lgp7hdrb5cpp36c5";
-    };
-    patches = [
-      (fetchurl {
-       url = "mirror://debian/pool/main/m/makedev/makedev_2.3.1-93.diff.gz";
-       sha256 = "08328779mc0b20xkj76ilpf9c8bw6zkz5xiw5l2kwm690dxp9nvw";
-       })
-    ];
-    # TODO install man
-    installPhase = ''
-      mkdir -p $out/sbin
-      ls -l
-      t=$out/sbin/MAKEDEV
-      cp MAKEDEV $t
-      chmod +x $t
-    '';
-  };
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "debootstrap-${version}";
-  version = "1.0.80";
+  version = "1.0.87";
 
   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 = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz";
-    sha256 = "06gigscd2327wsvc7n7w2m8xmaixvp4kyqhayn00qrgd9i9w34x6";
+    sha256 = "1amk3wghx4f7zfp7d8r0hgqn5gvph50qa6nvh32q2j8aihdr7374";
   };
 
   buildInputs = [ dpkg gettext gawk perl ];
@@ -72,8 +50,6 @@ in stdenv.mkDerivation rec {
     d=$out/share/debootstrap
     mkdir -p $out/{share/debootstrap,bin}
 
-    ${fakeroot}/bin/fakeroot -- make devices.tar.gz MAKEDEV=${makedev}/sbin/MAKEDEV
-
     cp -r . $d
 
     cat >> $out/bin/debootstrap << EOF
@@ -90,10 +66,6 @@ in stdenv.mkDerivation rec {
     mv debootstrap.8 $out/man/man8
   '';
 
-  passthru = {
-    inherit makedev;
-  };
-
   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
diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix
index 7e9b82a6a3f9..fabefb810313 100644
--- a/pkgs/tools/misc/grub4dos/default.nix
+++ b/pkgs/tools/misc/grub4dos/default.nix
@@ -6,13 +6,13 @@ let arch =
   else abort "Unknown architecture";
 in stdenv.mkDerivation rec {
   name = "grub4dos-${version}";
-  version = "0.4.6a-2016-08-06";
+  version = "0.4.6a-2016-11-09";
 
   src = fetchFromGitHub {
     owner = "chenall";
     repo = "grub4dos";
-    rev = "99d6ddbe7611f942d2708d77a620d6aa94a284d1";
-    sha256 = "0gnllk0qkx6d0azf7v9cr0b23gp577avksz0f4dl3v3ldgi0dksq";
+    rev = "4cdcd3c1aa4907e7775aa8816ca9cf0175b78bcd";
+    sha256 = "17y5wsiqcb2qk1vr8n1wlhcsj668735hj8l759n8aiydw408bl55";
   };
 
   nativeBuildInputs = [ nasm ];
diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix
index 910b4963f012..9693556862bd 100644
--- a/pkgs/tools/misc/less/default.nix
+++ b/pkgs/tools/misc/less/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ncurses, lessSecure ? false }:
 
 stdenv.mkDerivation rec {
-  name = "less-483";
+  name = "less-481";
 
   src = fetchurl {
     url = "http://www.greenwoodsoftware.com/less/${name}.tar.gz";
-    sha256 = "07z43kwbmba2wh3q1gps09l72p8izfagygmqq1izi50s2h51mfvy";
+    sha256 = "19fxj0h10y5bhr3a1xa7kqvnwl44db3sdypz8jxl1q79yln8z8rz";
   };
 
   configureFlags = [ "--sysconfdir=/etc" ] # Look for ‘sysless’ in /etc.
diff --git a/pkgs/tools/misc/ltunify/default.nix b/pkgs/tools/misc/ltunify/default.nix
index cf28fa051326..8066cdd9bc5a 100644
--- a/pkgs/tools/misc/ltunify/default.nix
+++ b/pkgs/tools/misc/ltunify/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Tool for working with Logitech Unifying receivers and devices";
-    homepage = https://lekensteyn.nl/logitech-unifying.html;
+    homepage = "https://lekensteyn.nl/logitech-unifying.html";
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.abbradar ];
diff --git a/pkgs/tools/misc/magic-wormhole/default.nix b/pkgs/tools/misc/magic-wormhole/default.nix
deleted file mode 100644
index c35d3b666acb..000000000000
--- a/pkgs/tools/misc/magic-wormhole/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pythonPackages }:
-
-with stdenv.lib;
-
-pythonPackages.buildPythonApplication rec {
-  name = "magic-wormhole-${version}";
-  version = "0.8.1";
-
-  src = fetchurl {
-    url = "mirror://pypi/m/magic-wormhole/${name}.tar.gz";
-    sha256 = "1yh5nbhh9z1am2pqnb5qqyq1zjl1m7z6jnkmvry2q14qwspw9had";
-  };
-  checkPhase = ''
-    ${pythonPackages.python.interpreter} -m wormhole.test.run_trial wormhole
-  '';
-
-  propagatedBuildInputs = with pythonPackages; [ autobahn cffi click hkdf pynacl spake2 tqdm ];
-  meta = {
-    description = "Securely transfer data between computers";
-    homepage = "https://github.com/warner/magic-wormhole";
-    license = licenses.mit;
-    maintainers = with maintainers; [ asymmetric ];
-  };
-}
diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix
index 1e39ddf481bc..9a2f9b65e8c2 100644
--- a/pkgs/tools/misc/tlp/default.nix
+++ b/pkgs/tools/misc/tlp/default.nix
@@ -1,45 +1,54 @@
-{ stdenv, lib, fetchFromGitHub, perl, makeWrapper, systemd, iw, rfkill, hdparm, ethtool, inetutils
-, kmod, pciutils, smartmontools, x86_energy_perf_policy, gawk, gnugrep, coreutils
+{ stdenv, lib, fetchFromGitHub, perl, makeWrapper, file, systemd, iw, rfkill
+, hdparm, ethtool, inetutils , kmod, pciutils, smartmontools
+, x86_energy_perf_policy, gawk, gnugrep, coreutils, utillinux
 , enableRDW ? false, networkmanager
 }:
 
 let
   paths = lib.makeBinPath
           ([ iw rfkill hdparm ethtool inetutils systemd kmod pciutils smartmontools
-             x86_energy_perf_policy gawk gnugrep coreutils
+             x86_energy_perf_policy gawk gnugrep coreutils utillinux
            ]
            ++ lib.optional enableRDW networkmanager
           );
 
 in stdenv.mkDerivation rec {
   name = "tlp-${version}";
-  version = "0.8";
+  version = "0.9";
 
   src = fetchFromGitHub {
         owner = "linrunner";
         repo = "TLP";
         rev = "${version}";
-        sha256 = "19fvk0xz6i2ryf41akk4jg1c4sb4rcyxdl9fr0w4lja7g76d5zww";
+        sha256 = "1gwi0h9klhdvqfqvmn297l1vyhj4g9dqvf50lcbswry02mvnd2vn";
       };
 
   makeFlags = [ "DESTDIR=$(out)"
-                "TLP_LIBDIR=/lib"
-                "TLP_SBIN=/bin"
-                "TLP_BIN=/bin"
+                "TLP_SBIN=$(out)/bin"
+                "TLP_BIN=$(out)/bin"
+                "TLP_TLIB=$(out)/share/tlp-pm"
+                "TLP_PLIB=$(out)/lib/pm-utils"
+                "TLP_ULIB=$(out)/lib/udev"
+                "TLP_NMDSP=$(out)/etc/NetworkManager/dispatcher.d"
+                "TLP_SHCPL=$(out)/share/bash-completion/completions"
+                "TLP_MAN=$(out)/share/man"
+
                 "TLP_NO_INIT=1"
                 "TLP_NO_PMUTILS=1"
               ];
 
-  nativeBuildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper file ];
 
   buildInputs = [ perl ];
 
-  installTargets = [ "install-tlp" ] ++ stdenv.lib.optional enableRDW "install-rdw";
+  installTargets = [ "install-tlp" "install-man" ] ++ stdenv.lib.optional enableRDW "install-rdw";
 
   postInstall = ''
-    for i in $out/bin/* $out/lib/udev/tlp-*; do
-      sed -i "s,/usr/lib/,$out/lib/,g" "$i"
-      if [[ "$(basename "$i")" = tlp-*list ]]; then
+    cp -r $out/$out/* $out
+    rm -rf $out/$(echo "$NIX_STORE" | cut -d "/" -f2)
+
+    for i in $out/bin/* $out/lib/udev/tlp-* ${lib.optionalString enableRDW "$out/etc/NetworkManager/dispatcher.d/*"}; do
+      if file "$i" | grep -q Perl; then
         # Perl script; use wrapProgram
         wrapProgram "$i" \
           --prefix PATH : "${paths}"
@@ -48,21 +57,6 @@ in stdenv.mkDerivation rec {
         sed -i '2iexport PATH=${paths}:$PATH' "$i"
       fi
     done
-
-    for i in $out/lib/udev/rules.d/*; do
-      sed -i "s,RUN+=\",\\0$out,g; s,/usr/sbin,/bin,g" "$i"
-    done
-
-    for i in man/*; do
-      install -D $i $out/share/man/man''${i##*.}/$(basename $i)
-    done
-  '' + lib.optionalString enableRDW ''
-    for i in $out/etc/NetworkManager/dispatcher.d/*; do
-      sed -i \
-        -e "s,/usr/lib/,$out/lib/,g" \
-        -e '2iexport PATH=${paths}:$PATH' \
-        "$i"
-    done
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
index 9052c5ce6d53..95d1a7275d9b 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -3,10 +3,10 @@
 let
 
   bashCompletion = fetchFromGitHub {
-    owner = "przepompownia";
+    owner = "imomaliev";
     repo = "tmux-bash-completion";
-    rev = "678a27616b70c649c6701cae9cd8c92b58cc051b";
-    sha256 = "1d2myrh4xiay9brsxafb02pi922760sdkyyy5xjm4sfh4iimc4zf";
+    rev = "fcda450d452f07d36d2f9f27e7e863ba5241200d";
+    sha256 = "092jpkhggjqspmknw7h3icm0154rg21mkhbc71j5bxfmfjdxmya8";
   };
 
 in