git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #170682 from prusnak/tor

tor: 0.4.6.10 -> 0.4.7.7

commitc763181101095b2576f6231ee430d85b13eccd8f authorPavol Rusnak <pavol@rusnak.io> dateWed 4 May 2022, 17:00 (5 years ago) parent3167af9113ca3c
1 file changed+9−5
pkgs/tools/security/tor/default.nix+9−5
pkgs/tools/security/tor/default.nix+9−5
@@ -30,11 +30,11 @@ let
3030in
3131stdenv.mkDerivation rec {
3232 pname = "tor";
33− version = "0.4.6.10";
33+ version = "0.4.7.7";
3434
3535 src = fetchurl {
3636 url = "https://dist.torproject.org/${pname}-${version}.tar.gz";
37− sha256 = "lMzWDgTlWPM75zAyvITqJBZg+S9Yz7iHib2miTc54xw=";
37+ sha256 = "sha256-PhMRWLUrlDXX5D0cR+8oi5bQBTQsxEuMlQu0A4UaW0Q=";
3838 };
3939
4040 outputs = [ "out" "geoip" ];
@@ -45,9 +45,13 @@ stdenv.mkDerivation rec {
4545
4646 patches = [ ./disable-monotonic-timer-tests.patch ];
4747
48− # cross compiles correctly but needs the following
49− configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
50− "--disable-tool-name-check";
48+ configureFlags =
49+ # cross compiles correctly but needs the following
50+ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--disable-tool-name-check" ]
51+ ++
52+ # sandbox is broken on aarch64-linux https://gitlab.torproject.org/tpo/core/tor/-/issues/40599
53+ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ "--disable-seccomp" ]
54+ ;
5155
5256 NIX_CFLAGS_LINK = lib.optionalString stdenv.cc.isGNU "-lgcc_s";
5357