ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-13 09:17:07 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #266934 from vidister/tor-0.4.8.9

Browse Source 
tor: 0.4.8.7 -> 0.4.8.9
This commit is contained in:
Pavol Rusnak 2023-11-12 11:31:40 +01:00 committed by GitHub
commit 62a5ba7bde
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/tools/security/tor/default.nix
View File

@ -30,11 +30,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tor"; pname = "tor";
version = "0.4.8.7"; version = "0.4.8.9";
src = fetchurl { src = fetchurl {
url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; url = "https://dist.torproject.org/${pname}-${version}.tar.gz";
sha256 = "sha256-sg0rnHTbKKAMB/CQ7lsCQbK2hPOv3szMa4AIkxxVdJE="; sha256 = "sha256-Wbt9iJD2ExtM5TRPPc6l3rIYK39PEP8MtOTYHxGyz2U=";
}; };
outputs = [ "out" "geoip" ]; outputs = [ "out" "geoip" ];
@ -46,6 +46,11 @@ stdenv.mkDerivation rec {
patches = [ ./disable-monotonic-timer-tests.patch ]; patches = [ ./disable-monotonic-timer-tests.patch ];
configureFlags = configureFlags =
# allow inclusion of GPL-licensed code (needed for Proof of Work defense for onion services)
# for more details see
# https://gitlab.torproject.org/tpo/onion-services/onion-support/-/wikis/Documentation/PoW-FAQ#compiling-c-tor-with-the-pow-defense
[ "--enable-gpl" ]
++
# cross compiles correctly but needs the following # cross compiles correctly but needs the following
lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--disable-tool-name-check" ] lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--disable-tool-name-check" ]
++ ++
@ -113,7 +118,7 @@ stdenv.mkDerivation rec {
the TCP protocol. the TCP protocol.
''; '';
license = licenses.bsd3; license = with licenses; [ bsd3 gpl3Only ];
maintainers = with maintainers; maintainers = with maintainers;
[ thoughtpolice joachifm prusnak ]; [ thoughtpolice joachifm prusnak ];