From 91859c0504718d7734231e90cd8d605af9cde167 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 8 Jan 2019 21:00:22 -0600 Subject: [PATCH 1/3] tor: 0.3.4.9 -> 0.3.4.10 https://lists.torproject.org/pipermail/tor-announce/2019-January/000171.html FWIW, in the ChangeLog (in the source, sorry) it mentions: As a reminder, the Tor 0.3.4 series will be supported until 10 June 2019. Some time between now and then, users should switch to the Tor 0.3.5 series, which will receive long-term support until at least 1 Feb 2022. So we should consider moving to 0.3.5 "soon" :). --- pkgs/tools/security/tor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index d43b8598c18b..d78424355da0 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -14,11 +14,11 @@ }: stdenv.mkDerivation rec { - name = "tor-0.3.4.9"; + name = "tor-0.3.4.10"; src = fetchurl { url = "https://dist.torproject.org/${name}.tar.gz"; - sha256 = "0jhnvnp08hsfrzgsvg5xnfxyaw3nzgg9h24cwbwnz6iby20i05qs"; + sha256 = "12i51i6swkdpnbcpa6f1csc00q177sbjnw2x31j53glxshmwpv5d"; }; outputs = [ "out" "geoip" ]; From 5db46cf3f1a02ba833b16791346cbd7824a9477b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 8 Jan 2019 21:20:24 -0600 Subject: [PATCH 2/3] tor: lzma, zstd, scrypt deps --- pkgs/tools/security/tor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index d78424355da0..a4f573803074 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libevent, openssl, zlib, torsocks -, libseccomp, systemd, libcap +, libseccomp, systemd, libcap, lzma, zstd, scrypt # for update.nix , writeScript @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "geoip" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libevent openssl zlib ] ++ + buildInputs = [ libevent openssl zlib lzma zstd scrypt ] ++ stdenv.lib.optionals stdenv.isLinux [ libseccomp systemd libcap ]; NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s"; From 6b3943d07d49a3b2b5170a11cbe7500ea692d8f0 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 8 Jan 2019 21:24:56 -0600 Subject: [PATCH 3/3] tor: 0.3.4.10 -> 0.3.5.7 (thank you, update script!) --- pkgs/tools/security/tor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index a4f573803074..1bda80dab454 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -14,11 +14,11 @@ }: stdenv.mkDerivation rec { - name = "tor-0.3.4.10"; + name = "tor-0.3.5.7"; src = fetchurl { url = "https://dist.torproject.org/${name}.tar.gz"; - sha256 = "12i51i6swkdpnbcpa6f1csc00q177sbjnw2x31j53glxshmwpv5d"; + sha256 = "17l31p58rsd30w4b6r4d8pbr84z3y7awahvjxbpmnlxc47y8f20v"; }; outputs = [ "out" "geoip" ];