Unverified Commit 62a5ba7b authored by Pavol Rusnak's avatar Pavol Rusnak Committed by GitHub
Browse files

Merge pull request #266934 from vidister/tor-0.4.8.9 

tor: 0.4.8.7 -> 0.4.8.9
parents a6c91afc 5aa01c8f

pkgs/tools/security/tor/default.nix

+8 −3
Original line number Diff line number Diff line
@@ -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 ];