Merge branch 'master' into staging

5 files changed, 93 insertions, 18 deletions

diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix
index 4c509444b74..c39f5cba775 100644
--- a/pkgs/tools/filesystems/s3fs/default.nix
+++ b/pkgs/tools/filesystems/s3fs/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, autoconf, automake, pkgconfig, curl, openssl, libxml2, fuse}:
 
 stdenv.mkDerivation {
-  name = "sshfs-fuse-1.78";
+  name = "s3fs-fuse-1.78";
   src = fetchurl {
     url = https://github.com/s3fs-fuse/s3fs-fuse/archive/v1.78.tar.gz;
     sha256 = "1xcp0bqa4a2ynjn5phb1pj70wm322czhqp4qcb27d5jd545b1h1n";
diff --git a/pkgs/tools/graphics/diagrams-builder/default.nix b/pkgs/tools/graphics/diagrams-builder/default.nix
new file mode 100644
index 00000000000..a12e5dbb8bb
--- /dev/null
+++ b/pkgs/tools/graphics/diagrams-builder/default.nix
@@ -0,0 +1,44 @@
+/*
+  If user need access to more haskell package for building his
+  diagrams, he simply has to pass these package through the
+  extra packages function as follow in `config.nix`:
+  
+  ~~~
+  diagrams-builder.override {
+    extraPackages = self : [myHaskellPackage];
+  }
+  ­~~~
+*/
+
+{ stdenv, ghcWithPackages, makeWrapper, diagrams-builder, extraPackages ? (self: []) }:
+
+let
+
+  # Used same technique as for the yiCustom package.
+  wrappedGhc = ghcWithPackages 
+    (self: [ diagrams-builder ] ++ extraPackages self);
+  ghcVersion = wrappedGhc.version;
+
+  exeWrapper = backend : ''
+    makeWrapper \
+    "${diagrams-builder}/bin/diagrams-builder-${backend}" "$out/bin/diagrams-builder-${backend}" \
+      --set NIX_GHC ${wrappedGhc}/bin/ghc \
+      --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${ghcVersion}
+  '';
+  
+  backends = ["svg" "cairo" "ps"];
+
+in
+
+stdenv.mkDerivation {
+  name = "diagrams-builder";
+
+  buildInputs = [ makeWrapper ];
+
+  buildCommand = with stdenv.lib; 
+    concatStrings (intersperse "\n" (map exeWrapper backends));
+
+  # Will be faster to build the wrapper locally then to fetch it from a binary cache.
+  preferLocalBuild = true;
+  meta = diagrams-builder.meta;
+}
\ No newline at end of file
diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix
index 7180665bd3d..f559c77712a 100644
--- a/pkgs/tools/misc/tmux/default.nix
+++ b/pkgs/tools/misc/tmux/default.nix
@@ -1,24 +1,26 @@
-{stdenv, fetchurl, ncurses, libevent, pkgconfig}:
+{ stdenv, fetchurl, ncurses, libevent, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  pname = "tmux";
-  version = "1.9a";
-  name = "${pname}-${version}";
+  name = "tmux-2.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${pname}/${name}.tar.gz";
-    sha256 = "1x9k4wfd4l5jg6fh7xkr3yyilizha6ka8m5b1nr0kw8wj0mv5qy5";
+    url = "mirror://sourceforge/tmux/${name}.tar.gz";
+    sha256 = "0qnkda8kb747vmbldjpb23ksv9pq3s65xhh1ja5rdsmh8r24npvr";
   };
 
   nativeBuildInputs = [ pkgconfig ];
 
   buildInputs = [ ncurses libevent ];
 
-  postInstall =
-    ''
-      mkdir -p $out/etc/bash_completion.d
-      cp -v examples/bash_completion_tmux.sh $out/etc/bash_completion.d/tmux
-    '';
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+  ];
+
+  postInstall = ''
+    mkdir -p $out/etc/bash_completion.d
+    cp -v examples/bash_completion_tmux.sh $out/etc/bash_completion.d/tmux
+  '';
 
   meta = {
     homepage = http://tmux.sourceforge.net/;
diff --git a/pkgs/tools/networking/tracebox/default.nix b/pkgs/tools/networking/tracebox/default.nix
new file mode 100644
index 00000000000..8c443282e5c
--- /dev/null
+++ b/pkgs/tools/networking/tracebox/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchzip, autoreconfHook, libcrafter, libpcap, lua }:
+
+stdenv.mkDerivation rec {
+  name = "tracebox-${version}";
+  version = "0.2";
+
+  src = fetchzip {
+    url = "https://github.com/tracebox/tracebox/archive/v${version}.zip";
+    sha256 = "0gxdapm6b5a41gymi1f0nr2kyz70vllnk10085yz3pq527gp9gns";
+  };
+
+  buildInputs = [ autoreconfHook libcrafter lua ];
+
+  configureFlags = [ "--with-lua=yes" ];
+
+  NIX_LDFLAGS = [ "${libpcap}/lib/libpcap.so" "${libcrafter}/lib/libcrafter.so" ];
+
+  preAutoreconf = ''
+    substituteInPlace Makefile.am --replace "noinst" ""
+    sed '/noinst/d' -i configure.ac
+    sed '/libcrafter/d' -i src/tracebox/Makefile.am
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.tracebox.org/;
+    description = "A middlebox detection tool";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ maintainers.lethalman ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index c0952c9cd8a..7277b2a1fe7 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, gettext, libidn, pkgconfig
 , perl, perlPackages, LWP, python3
-, libiconv, gnutls ? null }:
+, libiconv, libpsl, gnutls ? null }:
 
 stdenv.mkDerivation rec {
   name = "wget-1.16.3";
@@ -25,16 +25,14 @@ stdenv.mkDerivation rec {
        export LIBS="-liconv -lintl"
     '';
 
-  nativeBuildInputs = [ gettext ];
-  buildInputs = [ libidn libiconv pkgconfig ]
+  nativeBuildInputs = [ gettext pkgconfig ];
+  buildInputs = [ libidn libiconv libpsl ]
     ++ stdenv.lib.optionals doCheck [ perl perlPackages.IOSocketSSL LWP python3 ]
     ++ stdenv.lib.optional (gnutls != null) gnutls
     ++ stdenv.lib.optional stdenv.isDarwin perl;
 
   configureFlags =
-    if gnutls != null
-    then "--with-ssl=gnutls"
-    else "--without-ssl";
+    if gnutls != null then "--with-ssl=gnutls" else "--without-ssl";
 
   doCheck = (perl != null && python3 != null && !stdenv.isDarwin);