ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 22:03:54 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18017 from joachifm/tor-0_2_8_7

Browse Source 
tor: 0.2.7.6 -> 0.2.8.7
This commit is contained in:
Joachim F 2016-08-27 10:44:39 +02:00 committed by GitHub
commit 9003f9d9a1
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,29 +1,30 @@
{ stdenv, fetchurl, libevent, openssl, zlib, torsocks, libseccomp }:
{ stdenv, fetchurl, pkgconfig, libevent, openssl, zlib, torsocks
, libseccomp, systemd, libcap
}:
stdenv.mkDerivation rec {
name = "tor-0.2.7.6";
name = "tor-0.2.8.7";
src = fetchurl {
url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz";
sha256 = "0p8hjlfi8dwghlyjif5s0q98cmpgz9kn9jja25430l04z5wqcfj9";
sha256 = "1iigfi8ljl88s8b5y1g4ak8im57simazscl467zvfbg8k6vf4i5f";
};
# Note: torsocks is specified as a dependency, as the distributed
# 'torify' wrapper attempts to use it; although there is no
# ./configure time check for any of this.
buildInputs = [ libevent openssl zlib torsocks ] ++
stdenv.lib.optional stdenv.isLinux libseccomp;
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libevent openssl zlib ] ++
stdenv.lib.optionals stdenv.isLinux [ libseccomp systemd libcap ];
NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s";
# Patch 'torify' to point directly to torsocks.
patchPhase = ''
postPatch = ''
substituteInPlace contrib/client-tools/torify \
--replace 'pathfind torsocks' true \
--replace 'exec torsocks' 'exec ${torsocks}/bin/torsocks'
'';
doCheck = true;
# Fails in a sandboxed environment; at some point we want to disable
# just the tests that require networking.
doCheck = false;
meta = with stdenv.lib; {
homepage = https://www.torproject.org/;