mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 09:02:46 +00:00
Code Issues Wiki Activity

tor: disable parallel checking

Browse source
This commit is contained in:
Jan Malakhovski 2018-09-05 01:13:16 +00:00
parent 20106e1066
commit e48f2d0226
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/tools/security/tor/default.nix
View file

@ -23,8 +23,6 @@ stdenv.mkDerivation rec {
outputs = [ "out" "geoip" ]; outputs = [ "out" "geoip" ];
enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libevent openssl zlib ] ++ buildInputs = [ libevent openssl zlib ] ++
stdenv.lib.optionals stdenv.isLinux [ libseccomp systemd libcap ]; stdenv.lib.optionals stdenv.isLinux [ libseccomp systemd libcap ];
@ -37,14 +35,17 @@ stdenv.mkDerivation rec {
--replace 'exec torsocks' 'exec ${torsocks}/bin/torsocks' --replace 'exec torsocks' 'exec ${torsocks}/bin/torsocks'
''; '';
enableParallelBuilding = true;
enableParallelChecking = false; # 4 tests fail randomly
doCheck = true;
postInstall = '' postInstall = ''
mkdir -p $geoip/share/tor mkdir -p $geoip/share/tor
mv $out/share/tor/geoip{,6} $geoip/share/tor mv $out/share/tor/geoip{,6} $geoip/share/tor
rm -rf $out/share/tor rm -rf $out/share/tor
''; '';
doCheck = true;
passthru.updateScript = import ./update.nix { passthru.updateScript = import ./update.nix {
inherit (stdenv) lib; inherit (stdenv) lib;
inherit inherit