diff options
| author | Pavol Rusnak <pavol@rusnak.io> | 2022-05-04 17:00:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-04 17:00:33 +0200 |
| commit | c763181101095b2576f6231ee430d85b13eccd8f (patch) | |
| tree | 9c5a72d392e3a5b3410bc5c62171bbe6db5c8908 /pkgs/tools/security | |
| parent | 3167af9d78f47c10b1389a23ee46a13085da2771 (diff) | |
| parent | 113ca3c22cf9a5afb0577948b85fc523c717ba37 (diff) | |
Merge pull request #170682 from prusnak/tor
tor: 0.4.6.10 -> 0.4.7.7
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/tor/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 14e0be73f01ea..90485ae817ed3 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.6.10"; + version = "0.4.7.7"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "lMzWDgTlWPM75zAyvITqJBZg+S9Yz7iHib2miTc54xw="; + sha256 = "sha256-PhMRWLUrlDXX5D0cR+8oi5bQBTQsxEuMlQu0A4UaW0Q="; }; outputs = [ "out" "geoip" ]; @@ -45,9 +45,13 @@ stdenv.mkDerivation rec { patches = [ ./disable-monotonic-timer-tests.patch ]; - # cross compiles correctly but needs the following - configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) - "--disable-tool-name-check"; + configureFlags = + # cross compiles correctly but needs the following + lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--disable-tool-name-check" ] + ++ + # sandbox is broken on aarch64-linux https://gitlab.torproject.org/tpo/core/tor/-/issues/40599 + lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ "--disable-seccomp" ] + ; NIX_CFLAGS_LINK = lib.optionalString stdenv.cc.isGNU "-lgcc_s"; |