Merge branch 'master.upstream' into staging.upstream

15 files changed, 140 insertions, 54 deletions

diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 0af0b427bf23..8c693d9145fb 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -44,7 +44,7 @@ let
   pluginsWithoutDeps = [
     "bench" "bpd" "bpm" "bucket" "convert" "cue" "duplicates" "embedart"
     "filefilter" "freedesktop" "fromfilename" "ftintitle" "fuzzy" "ihate"
-    "importadded" "importfeeds" "info" "inline" "keyfinder" "lyrics"
+    "importadded" "importfeeds" "info" "inline" "ipfs" "keyfinder" "lyrics"
     "mbcollection" "mbsync" "metasync" "missing" "permissions" "play"
     "plexupdate" "random" "rewrite" "scrub" "smartplaylist" "spotify" "the"
     "types" "zero"
@@ -60,14 +60,14 @@ let
 
 in buildPythonPackage rec {
   name = "beets-${version}";
-  version = "1.3.13";
+  version = "1.3.14";
   namePrefix = "";
 
   src = fetchFromGitHub {
     owner = "sampsyo";
     repo = "beets";
     rev = "v${version}";
-    sha256 = "05gnp0y3n1jl7fnyslx56x2lsp8f4mv3xwy7gbyghax0vs3ccfvl";
+    sha256 = "0bha101x1wdrl2hj31fhixm3hp7ahdm2064b9k5gg0ywm651128g";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix
index e2857eed7d86..f2ae4e83ad1a 100644
--- a/pkgs/tools/backup/tarsnap/default.nix
+++ b/pkgs/tools/backup/tarsnap/default.nix
@@ -1,11 +1,6 @@
 { stdenv, fetchurl, openssl, zlib, e2fsprogs }:
 
 let
-  bashCompletion = fetchurl {
-    url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.bash";
-    sha256 = "1cj7m0n3sw9vlaz2dfvf0bgaxkv1pcc0l31zb4h5rmm8z6d33405";
-  };
-
   zshCompletion = fetchurl {
     url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.zsh";
     sha256 = "0pawqwichzpz29rva7mh8lpx4zznnrh2rqyzzj6h7z98l0dxpair";
@@ -13,18 +8,25 @@ let
 in
 stdenv.mkDerivation rec {
   name = "tarsnap-${version}";
-  version = "1.0.35";
+  version = "1.0.36.1";
 
   src = fetchurl {
-    url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.35.tgz";
-    sha256 = "16lc14rwrq84fz95j1g10vv0qki0qw73lzighidj5g23pib6g7vc";
+    url = "https://www.tarsnap.com/download/tarsnap-autoconf-${version}.tgz";
+    sha256 = "1446l8g39bi5xxk4x1ijc1qjrj824729887gcffig0zrw80rx452";
   };
 
+  preConfigure = ''
+    configureFlags="--with-bash-completion-dir=$out/etc/bash_completion.d"
+  '';
+
+  patchPhase = ''
+    substituteInPlace Makefile.in \
+      --replace "command -p mv" "mv"
+  '';
+
   postInstall = ''
     # Install some handy-dandy shell completions
-    mkdir -p $out/etc/bash_completion.d $out/share/zsh/site-functions
-    cp ${bashCompletion} $out/etc/bash_completion.d/tarsnap.bash
-    cp ${zshCompletion}  $out/share/zsh/site-functions/_tarsnap
+    install -m 444 -D ${zshCompletion} $out/share/zsh/site-functions/_tarsnap
   '';
 
   buildInputs = [ openssl zlib e2fsprogs ];
diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix
index 77d0352f670d..c56145069011 100644
--- a/pkgs/tools/filesystems/ceph/git.nix
+++ b/pkgs/tools/filesystems/ceph/git.nix
@@ -1,12 +1,12 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2015-08-18";
+  version = "2015-08-29";
 
   src = fetchgit {
     url = "git://github.com/ceph/ceph.git";
-    rev = "cf8a360cd1e3937aa1ac74fbf39790b7fb43e71f";
-    sha256 = "0d8vlxap800x8gil16124nb4yvfqb5wa3pk09knrikmmwia49k9v";
+    rev = "54626351679fe312d5b96cc0304755ae5f1ece40";
+    sha256 = "12rdp1q7arxhg259y08pzix22yjlrjs5qmwv342qcl5xbfkg502r";
   };
 
   patches = [ ./fix-pythonpath.patch ];
diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix
new file mode 100644
index 000000000000..161425ad137b
--- /dev/null
+++ b/pkgs/tools/filesystems/fuseiso/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, fuse, zlib, glib }:
+
+stdenv.mkDerivation rec {
+  name = "fuseiso-20070708";
+
+  src = fetchurl {
+    url = "http://sourceforge.net/projects/fuseiso/files/fuseiso/20070708/fuseiso-20070708.tar.bz2";
+    sha1 = "fe142556ad35dd7e5dc31a16183232a6e2da7692";  
+  };
+
+  buildInputs = [ pkgconfig fuse zlib glib ];
+
+  meta = {
+    homepage = http://sourceforge.net/projects/fuseiso;
+    description = "FUSE module to mount ISO filesystem images";
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix
index f8925d26beac..b6158ab64454 100644
--- a/pkgs/tools/misc/debian-devscripts/default.nix
+++ b/pkgs/tools/misc/debian-devscripts/default.nix
@@ -1,30 +1,50 @@
 {stdenv, fetchurl, perl, CryptSSLeay, LWP, unzip, xz, dpkg, TimeDate, DBFile
 , FileDesktopEntry, libxslt, docbook_xsl, python3, setuptools, makeWrapper
-, perlPackages
+, perlPackages, curl, gnupg, diffutils
+, sendmailPath ? "/var/setuid-wrappers/sendmail"
 }:
+
 stdenv.mkDerivation rec {
-  version = "2.15.4";
+  version = "2.15.8";
   name = "debian-devscripts-${version}";
+
   src = fetchurl {
     url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz";
-    sha256 = "03ldbx07ga9df7z9yiq6grb6cms1dr8hlbis2hvbmfcs6gcr3q72";
+    sha256 = "1zw7phaigncblxb3jp4m8pk165hylk1f088k51nhj9d7z5iz6bbx";
   };
+
   buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile 
     FileDesktopEntry libxslt python3 setuptools makeWrapper
-    perlPackages.ParseDebControl ];
+    perlPackages.ParseDebControl perlPackages.LWPProtocolHttps
+    curl gnupg diffutils ];
+
   preConfigure = ''
     export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${dpkg}";
-    sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile
-    sed -e 's/ translated_manpages//; s/--install-layout=deb//; s@--root="[^ ]*"@--prefix="'"$out"'"@' -i Makefile */Makefile
     tgtpy="$out/lib/${python3.libPrefix}/site-packages"
     mkdir -p "$tgtpy"
     export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy"
-    sed -re "s@/usr( |$|/)@$out\\1@" -i Makefile* */Makefile*
-    sed -re "s@/etc( |$|/)@$out/etc\\1@" -i Makefile* */Makefile*
-
-    # Completion currently spams every shell startup with an error. Disable for now:
-    sed "/\/bash_completion\.d/d" -i scripts/Makefile
+    find po4a scripts -type f -exec sed -r \
+      -e "s@/usr/bin/gpg(2|)@${gnupg}/bin/gpg2@g" \
+      -e "s@/usr/(s|)bin/sendmail@${sendmailPath}@g" \
+      -e "s@/usr/bin/diff@${diffutils}/bin/diff@g" \
+      -e "s@/usr/bin/gpgv(2|)@${gnupg}/bin/gpgv2@g" \
+      -e "s@(command -v|/usr/bin/)curl@${curl}/bin/curl@g" \
+      -i {} +
+    sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile
+    sed -r \
+      -e "s@/usr( |$|/)@$out\\1@g" \
+      -e "s@/etc( |$|/)@$out/etc\\1@g" \
+      -e 's/ translated_manpages//; s/--install-layout=deb//; s@--root="[^ ]*"@--prefix="'"$out"'"@' \
+      -i Makefile* */Makefile*
   '';
+
+  makeFlags = [
+    "DESTDIR=$(out)"
+    "PREFIX="
+    "COMPL_DIR=/share/bash-completion/completions"
+    "PERLMOD_DIR=/share/devscripts"
+  ];
+
   postInstall = ''
     sed -re 's@(^|[ !`"])/bin/bash@\1${stdenv.shell}@g' -i "$out/bin"/*
     for i in "$out/bin"/*; do
@@ -34,9 +54,10 @@ stdenv.mkDerivation rec {
         --prefix PYTHONPATH : "$out/lib/python3.4/site-packages"
     done
   '';
-  meta = {
+
+  meta = with stdenv.lib; {
     description = ''Debian package maintenance scripts'';
-    license = "GPL (various)"; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO
-    maintainers = with stdenv.lib.maintainers; [raskin];
+    license = licenses.free; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only... TODO
+    maintainers = with maintainers; [raskin];
   };
 }
diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix
new file mode 100644
index 000000000000..589f7d9a94b7
--- /dev/null
+++ b/pkgs/tools/misc/urjtag/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, autoconf, automake, pkgconfig, gettext, intltool, libtool, bison
+, flex, fetchgit, makeWrapper
+, jedecSupport ? false
+, pythonBindings ? false
+, python3 ? null
+}:
+
+stdenv.mkDerivation rec {
+  version = "0.10";
+  name = "urjtag-${version}";
+
+  src = fetchgit {
+    url = "git://git.code.sf.net/p/urjtag/git";
+    rev = "7ba12da7845af7601e014a2a107670edc5d6997d";
+    sha256 = "834401d851728c48f1c055d24dc83b6173c701bf352d3a964ec7ff1aff3abf6a";
+  };
+
+  buildInputs = [ gettext pkgconfig autoconf automake libtool makeWrapper ]
+    ++ stdenv.lib.optional pythonBindings python3;
+
+  configureFlags = ''
+    --prefix=/
+    ${if jedecSupport then "--enable-jedec-exp" else "--disable-jedec-exp"}
+    ${if pythonBindings then "--enable-python" else "--disable-python"}
+  '';
+  preConfigure = "cd urjtag; ./autogen.sh";
+
+  makeFlags = [ "DESTDIR=$(out)" ];
+
+  meta = {
+    description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more";
+    homepage = "http://urjtag.org/";
+    license = with stdenv.lib.licenses; [ gpl2Plus lgpl21Plus ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    maintainers = with stdenv.lib.maintainers; [ lowfatcomputing ];
+  };
+}
+
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 51812ff95b75..cc914d6616c9 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-distro=exherbo"
     "--with-dhclient=${dhcp}/bin/dhclient"
+    "--with-dnsmasq=${dnsmasq}/bin/dnsmasq"
     # Upstream prefers dhclient, so don't add dhcpcd to the closure
     #"--with-dhcpcd=${dhcpcd}/sbin/dhcpcd"
     "--with-dhcpcd=no"
diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index b2bf65ff9eea..5b95dd159bff 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -3,11 +3,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "openvpn-2.3.8";
+  name = "openvpn-2.3.7";
 
   src = fetchurl {
     url = "http://swupdate.openvpn.net/community/releases/${name}.tar.gz";
-    sha256 = "0lbw22qv3m0axhs13razr6b4x1p7jcpvf9rzb15b850wyvpka92k";
+    sha256 = "0vhl0ddpxqfibc0ah0ci7ix9bs0cn5shhmhijg550qpbdb6s80hz";
   };
 
   patches = optional stdenv.isLinux ./systemd-notify.patch;
@@ -21,11 +21,6 @@ stdenv.mkDerivation rec {
     IPROUTE=${iproute}/sbin/ip
   '';
 
-  preConfigure = ''
-    substituteInPlace ./src/openvpn/console.c \
-      --replace /bin/systemd-ask-password /run/current-system/sw/bin/systemd-ask-password
-  '';
-
   postInstall = ''
     mkdir -p $out/share/doc/openvpn/examples
     cp -r sample/sample-config-files/ $out/share/doc/openvpn/examples
diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index 022b8dfc2ca4..2357ec77f122 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper }:
 
-let version = "1.18.1"; in
+let version = "1.18.2"; in
 
 stdenv.mkDerivation {
   name = "dpkg-${version}";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz";
-    sha256 = "1nlr0djn5zl9cmlcxxmd7dk3fx0zw9gi4qm7cfz0r5qwl9yaj9nb";
+    sha256 = "192pqjd0c7i91kiqzn3cq2sqp5vivf0079i0wybdc9yhfcm4yj0i";
   };
 
   postPatch = ''
@@ -20,10 +20,10 @@ stdenv.mkDerivation {
   configureFlags = "--disable-dselect --with-admindir=/var/lib/dpkg PERL_LIBDIR=$(out)/${perl.libPrefix}";
 
   preConfigure = ''
-    # Nice: dpkg has a circular dependency on itself.  Its configure
+    # Nice: dpkg has a circular dependency on itself. Its configure
     # script calls scripts/dpkg-architecture, which calls "dpkg" in
-    # $PATH.  It doesn't actually use its result, but fails if it
-    # isn't present.  So make a dummy available.
+    # $PATH. It doesn't actually use its result, but fails if it
+    # isn't present, so make a dummy available.
     touch $TMPDIR/dpkg
     chmod +x $TMPDIR/dpkg
     PATH=$TMPDIR:$PATH
diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix
index 7075b03bdfa4..c2842ae2e752 100644
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/pkgs/tools/package-management/packagekit/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, intltool, glib, pkgconfig, polkit, python, sqlite }:
 
-let version = "1.0.7"; in
+let version = "1.0.8"; in
 stdenv.mkDerivation {
   name = "packagekit-${version}";
 
   src = fetchurl {
-    sha256 = "0klwr0y3a72xpz6bwv4afbk3vvx5r1av5idhz3mx4p9ssnscb1mi";
+    sha256 = "1vaxn4kwdwx6p03n88k4pnbd2l6lb0cbxpcs88kjack1jml17c3l";
     url = "http://www.freedesktop.org/software/PackageKit/releases/PackageKit-${version}.tar.xz";
   };
 
diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix
index 75ad9382b9f3..92a0e46b79dc 100644
--- a/pkgs/tools/security/afl/default.nix
+++ b/pkgs/tools/security/afl/default.nix
@@ -9,11 +9,11 @@ let
 in
 stdenv.mkDerivation rec {
   name    = "afl-${version}";
-  version = "1.86b";
+  version = "1.88b";
 
   src = fetchurl {
     url    = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz";
-    sha256 = "1by9ncf6lgcyibzqwyla34jv64sd66mn8zhgjz2pcgsds51qwn0r";
+    sha256 = "10j0b4kzr4rmflcnxhb2r3klxc4sspx23bpgxjaqflp4z3zf5m1v";
   };
 
   # Note: libcgroup isn't needed for building, just for the afl-cgroup
diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix
index 57cc9c242483..faba4037d3dd 100644
--- a/pkgs/tools/security/nmap/default.nix
+++ b/pkgs/tools/security/nmap/default.nix
@@ -13,11 +13,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "nmap${optionalString graphicalSupport "-graphical"}-${version}";
-  version = "6.47";
+  version = "6.49BETA4";
 
   src = fetchurl {
     url = "http://nmap.org/dist/nmap-${version}.tar.bz2";
-    sha256 = "14d53aji4was68c01pf105n5ylha257wmdbx40ddiqiw42g1x8cg";
+    sha256 = "042fg73w7596b3h6ha9y62ckc0hd352zv1shwip3dx14v5igrsna";
   };
 
   patches = ./zenmap.patch;
diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix
index 668a76051153..893b7b319000 100644
--- a/pkgs/tools/security/scrypt/default.nix
+++ b/pkgs/tools/security/scrypt/default.nix
@@ -2,15 +2,24 @@
 
 stdenv.mkDerivation rec {
   name = "scrypt-${version}";
-  version = "1.1.6";
+  version = "1.2.0";
 
   src = fetchurl {
-    url = "https://www.tarsnap.com/scrypt/scrypt-1.1.6.tgz";
-    sha256 = "dfd0d1a544439265bbb9b58043ad3c8ce50a3987b44a61b1d39fd7a3ed5b7fb8";
+    url = "https://www.tarsnap.com/scrypt/${name}.tgz";
+    sha256 = "1m39hpfby0fdjam842773i5w7pa0qaj7f0r22jnchxsj824vqm0p";
   };
 
   buildInputs = [ openssl ];
 
+  patchPhase = ''
+    substituteInPlace Makefile \
+      --replace "command -p mv" "mv"
+    substituteInPlace Makefile.in \
+      --replace "command -p mv" "mv"
+    substituteInPlace autocrap/Makefile.am \
+      --replace "command -p mv" "mv"
+  '';
+
   meta = {
     description = "Encryption utility";
     homepage    = https://www.tarsnap.com/scrypt.html;
diff --git a/pkgs/tools/text/dos2unix/default.nix b/pkgs/tools/text/dos2unix/default.nix
index 30b546361f20..f215c635de5b 100644
--- a/pkgs/tools/text/dos2unix/default.nix
+++ b/pkgs/tools/text/dos2unix/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, perl, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "dos2unix-7.2.2";
+  name = "dos2unix-7.3";
   
   src = fetchurl {
     url = "http://waterlan.home.xs4all.nl/dos2unix/${name}.tar.gz";
-    sha256 = "04i6kkl6l1vp1b81i0wncixwyab2dzmh7vp1cvma8zr6jrr908ww";
+    sha256 = "1la496gpc7b1vka36bs54pf85jfbwa6fdplgj6lamvbj59azfxc1";
   };
 
   configurePhase = ''
diff --git a/pkgs/tools/typesetting/bibtex-tools/default.nix b/pkgs/tools/typesetting/bibtex-tools/default.nix
index c2c9a942845a..a822a181a653 100644
--- a/pkgs/tools/typesetting/bibtex-tools/default.nix
+++ b/pkgs/tools/typesetting/bibtex-tools/default.nix
@@ -13,4 +13,5 @@ stdenv.mkDerivation {
     --with-hevea=${hevea}
     --with-latex=${tetex}";
   buildInputs = [aterm sdf strategoxt hevea];
+  meta.broken = true;
 }