Merge staging-next into staging

pkgs/tools/security/1password-gui/default.nix

@@ -13,11 +13,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "1password";
-  version = "0.8.7";
+  version = "0.8.8-1";
 
   src = fetchurl {
     url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage";
-    sha256 = "1101q5yavzl8imf8gqa3h929gcyy6lh7dy2dw0zs52qdcrb4z49j";
+    sha256 = "0afx0sr2nrdayaxjhr0x2mx5mi92s781a6r2r9rpva9q4cdrf6w7";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/tools/security/chipsec/default.nix

@@ -11,6 +11,8 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "1rxr9i08a22m15slvlkrhnki30jixi2ds096kmmc2nqzfr9yibmb";
   };
 
+  disabled = !stdenv.isLinux;
+
   nativeBuildInputs = [
     nasm libelf
   ];

pkgs/tools/security/eid-mw/default.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub
 , autoreconfHook, pkgconfig
 , gtk3, nssTools, pcsclite
-, libxml2, libproxy 
+, libxml2, libproxy
 , openssl, curl
 , makeWrapper
 , substituteAll }:
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
       --replace "modutil" "${nssTools}/bin/modutil"
 
     rm $out/bin/about-eid-mw
-    wrapProgram $out/bin/eid-viewer --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/$name" 
+    wrapProgram $out/bin/eid-viewer --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/$name"
   '';
 
   enableParallelBuilding = true;
@@ -58,11 +58,11 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Belgian electronic identity card (eID) middleware";
-    homepage = "http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/";
+    homepage = "https://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/";
     license = licenses.lgpl3;
     longDescription = ''
       Allows user authentication and digital signatures with Belgian ID cards.
-      Also requires a running pcscd service and compatible card reader. 
+      Also requires a running pcscd service and compatible card reader.
 
       eid-viewer is also installed.
 

pkgs/tools/security/nmap/default.nix

@@ -12,11 +12,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "nmap${optionalString graphicalSupport "-graphical"}-${version}";
-  version = "7.80";
+  version = "7.90";
 
   src = fetchurl {
     url = "https://nmap.org/dist/nmap-${version}.tar.bz2";
-    sha256 = "1aizfys6l9f9grm82bk878w56mg0zpkfns3spzj157h98875mypw";
+    sha256 = "1s20i84m9bci70lrl0p2j7h3kpbi9snmvyhc3lzc9s3mh92w6msm";
   };
 
   patches = [ ./zenmap.patch ]

pkgs/tools/security/pcsc-scm-scl011/default.nix

@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "SCM Microsystems SCL011 chipcard reader user space driver";
-    homepage = "http://www.scm-pc-card.de/index.php?lang=en&page=product&function=show_product&product_id=630";
+    homepage = "https://www.scm-pc-card.de/index.php?lang=en&page=product&function=show_product&product_id=630";
     downloadPage = "https://support.identiv.com/scl010-scl011/";
     license = licenses.unfreeRedistributable;
     maintainers = with maintainers; [ sephalon ];

pkgs/tools/security/phrasendrescher/default.nix

@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "A modular and multi processing pass phrase cracking tool";
-    homepage = "http://leidecker.info/projects/phrasendrescher/index.shtml";
+    homepage = "https://leidecker.info/projects/phrasendrescher/index.shtml";
     license = licenses.gpl2Plus;
     platforms = platforms.all;
     maintainers = with maintainers; [ bjornfor ];

pkgs/tools/security/pinentry/default.nix

@@ -2,7 +2,7 @@
 , libgpgerror, libassuan, qtbase, wrapQtAppsHook
 , ncurses, gtk2, gcr
 , libcap ? null, libsecret ? null
-, enabledFlavors ? [ "curses" "tty" "gtk2" "qt" "gnome3" "emacs" ]
+, enabledFlavors ? [ "curses" "tty" "gtk2" "qt" "emacs" ] ++ lib.optionals stdenv.isLinux [ "gnome3" ]
 }:
 
 with stdenv.lib;

pkgs/tools/security/rbw/default.nix

@@ -1,11 +1,12 @@
 { lib
+, stdenv
 , rustPlatform
 , fetchCrate
 , pinentry
 , openssl
 , pkgconfig
 , makeWrapper
-, cargo
+, Security
 
 # rbw-fzf
 , withFzf ? false, fzf, perl
@@ -34,9 +35,11 @@ rustPlatform.buildRustPackage rec {
     makeWrapper
   ];
 
+  buildInputs = lib.optionals stdenv.isDarwin [ Security ];
+
   postPatch = ''
     substituteInPlace src/pinentry.rs \
-        --replace "Command::new(\"pinentry\")" "Command::new(\"${pinentry}/bin/pinentry\")"
+      --replace 'Command::new("pinentry")' 'Command::new("${pinentry}/${pinentry.binaryPath or "bin/pinentry"}")'
   '' + lib.optionalString withFzf ''
     patchShebangs bin/rbw-fzf
     substituteInPlace bin/rbw-fzf \

pkgs/tools/security/tor/default.nix

@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation rec {
   pname = "tor";
-  version = "0.4.3.6";
+  version = "0.4.4.5";
 
   src = fetchurl {
     url = "https://dist.torproject.org/${pname}-${version}.tar.gz";
-    sha256 = "0qmcrkjip0ywq77232m73pjwqiaj0q2klwklqlpbw575shvhcbba";
+    sha256 = "09lr6l98qmc69pzsi8r02z86v969dbfwjrwphfm3npknzq5a0p54";
   };
 
   outputs = [ "out" "geoip" ];