diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-12 12:00:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-12 12:00:55 +0000 |
| commit | 1b3033ebfb1e92c3166b75c7f820d066f3dd3665 (patch) | |
| tree | 77dac8b89ea940a62046ea26db0bdaa3a14faad7 /pkgs/tools/security | |
| parent | 85abdfd32e1c46e46c47853297820de456628296 (diff) | |
| parent | 2709b7a1c6693cff8d5e44ccaf3f17385ed26d10 (diff) | |
| download | nixpkgs-1b3033ebfb1e92c3166b75c7f820d066f3dd3665.tar nixpkgs-1b3033ebfb1e92c3166b75c7f820d066f3dd3665.tar.gz nixpkgs-1b3033ebfb1e92c3166b75c7f820d066f3dd3665.tar.bz2 nixpkgs-1b3033ebfb1e92c3166b75c7f820d066f3dd3665.tar.lz nixpkgs-1b3033ebfb1e92c3166b75c7f820d066f3dd3665.tar.xz nixpkgs-1b3033ebfb1e92c3166b75c7f820d066f3dd3665.tar.zst nixpkgs-1b3033ebfb1e92c3166b75c7f820d066f3dd3665.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/tor/default.nix | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index a4c0fc51b64..34088e3afbc 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.8.7"; + version = "0.4.8.9"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-sg0rnHTbKKAMB/CQ7lsCQbK2hPOv3szMa4AIkxxVdJE="; + sha256 = "sha256-Wbt9iJD2ExtM5TRPPc6l3rIYK39PEP8MtOTYHxGyz2U="; }; outputs = [ "out" "geoip" ]; @@ -46,6 +46,11 @@ stdenv.mkDerivation rec { patches = [ ./disable-monotonic-timer-tests.patch ]; 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 lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--disable-tool-name-check" ] ++ @@ -113,7 +118,7 @@ stdenv.mkDerivation rec { the TCP protocol. ''; - license = licenses.bsd3; + license = with licenses; [ bsd3 gpl3Only ]; maintainers = with maintainers; [ thoughtpolice joachifm prusnak ]; |