Merge branch 'master.upstream' into staging.upstream

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

@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, autoreconfHook, gtk2, nssTools, pcsclite
 , pkgconfig }:
 
-let version = "4.1.2"; in
+let version = "4.1.4"; in
 stdenv.mkDerivation rec {
   name = "eid-mw-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "034ar1v2qamdyq71nklh1nvqbmw6ryz63jdwnnc873f639mf5w94";
+    sha256 = "0v0p0kdjscvf4bn14dyny399k1bfsz8v7n8v16lv0q0xs5nwqnky";
     rev = "v${version}";
     repo = "eid-mw";
     owner = "Fedict";
@@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ gtk2 pcsclite ];
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
+  postPatch = ''
+    sed 's@m4_esyscmd_s(.*,@[${version}],@' -i configure.ac
+  '';
+
   enableParallelBuilding = true;
 
   doCheck = true;
@@ -24,8 +28,8 @@ stdenv.mkDerivation rec {
     substituteInPlace $out/bin/eid-nssdb \
       --replace "modutil" "${nssTools}/bin/modutil"
 
-    # Only provides a useless "about-eid-mw.desktop" that doesn't even work:
-    rm -rf $out/share/applications
+    # Only provides a useless "about-eid-mw.desktop" that segfaults:
+    rm -rf $out/share/applications $out/bin/about-eid-mw
   '';
 
   meta = with stdenv.lib; {

pkgs/tools/security/tor/torbrowser.nix

@@ -20,13 +20,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "tor-browser-${version}";
-  version = "4.5.2";
+  version = "4.5.3";
 
   src = fetchurl {
     url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz";
     sha256 = if bits == "64" then
-      "139c85096ee85a65222753fbbee7c04e8cc494021f9afaf5c1a0f520dd7869b9" else
-      "960277aea38a3958f3ac573535302e61b3b0137169e5d7b9687cee648a5d5bec";
+      "24c517d2aeb15ba5eeda1eb87f483ed4fb0c22b07a95ca26af9f692e0d4d9b7c" else
+      "154d659583048e91870c40921561f0519babf6d3c9ac439f6fb74ed66824463f";
   };
 
   patchPhase = ''