Merge: staging with systemd

4 files changed, 49 insertions, 5 deletions

diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix
index 573c4b58d60d..8860fbc5dbcd 100644
--- a/pkgs/tools/backup/httrack/default.nix
+++ b/pkgs/tools/backup/httrack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, openssl }:
+{ stdenv, fetchurl, zlib, openssl, libiconv }:
 
 stdenv.mkDerivation rec {
   version = "3.48.21";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "10p4gf8y9h7mxkqlbs3hqgvmvbgvcbax8jp1whbw4yidwahn06w7";
   };
 
-  buildInputs = [ zlib openssl ];
+  buildInputs = [ zlib openssl ] ++ stdenv.lib.optional stdenv.isDarwin libiconv;
 
   meta = {
     homepage = "http://www.httrack.com";
diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index 7d991a415568..749bf59fde96 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "file-5.24";
+  name = "file-5.25";
 
   buildInputs = [ zlib ];
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
       "ftp://ftp.astron.com/pub/file/${name}.tar.gz"
       "http://distfiles.macports.org/file/${name}.tar.gz"
     ];
-    sha256 = "1kjhqwmi1sjw8jcf6li725c59wm00zajrdfwgkwqxs295vgb6b40";
+    sha256 = "1jhfi5mivdnqvry5la5q919l503ahwdwbf3hjhiv97znccakhd9p";
   };
 
   meta = {
diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 69b9dc406386..07671ffe81f1 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, pkgconfig, autoreconfHook
 , openssl, c-ares, libxml2, sqlite, zlib, libssh2
+, Security
 }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +13,8 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ];
+  buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ] ++
+    stdenv.lib.optional stdenv.isDarwin Security;
 
   configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" ];
 
diff --git a/pkgs/tools/security/mpw/default.nix b/pkgs/tools/security/mpw/default.nix
new file mode 100644
index 000000000000..15937a6792e6
--- /dev/null
+++ b/pkgs/tools/security/mpw/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, autoconf, automake, openssl, libxml2 }:
+
+let
+  scrypt_src = fetchurl {
+    url = "http://masterpasswordapp.com/libscrypt-b12b554.tar.gz";
+    sha256 = "02vz4i66v1acd15xjgki4ilmmp28m6a5603gi4hf8id3d3ndl9n7";
+  };
+
+in stdenv.mkDerivation {
+  name = "mpw-2.1-cli4";
+
+  srcs = [
+    (fetchurl {
+      url = "https://ssl.masterpasswordapp.com/mpw-2.1-cli4-0-gf6b2287.tar.gz";
+      sha256 = "141bzb3nj18rbnbpdvsri8cdwwwxz4d6akyhfa834542xf96b9vf";
+    })
+    scrypt_src
+  ];
+
+  sourceRoot = ".";
+
+  postUnpack = ''
+    cp -R libscrypt-b12b554/* lib/scrypt
+  '';
+
+  prePatch = ''
+    patchShebangs .
+  '';
+
+  NIX_CFLAGS_COMPILE = "-I${libxml2}/include/libxml2";
+
+  buildInputs = [ autoconf automake openssl libxml2 ];
+
+  buildPhase = ''
+    targets="mpw mpw-tests" ./build
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mv mpw $out/bin/mpw
+  '';
+}