diff options
| author | John Ericson <mail@JohnEricson.me> | 2018-09-05 11:32:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-05 11:32:27 -0400 |
| commit | 2dda26c9d42b9bc18599c691905020272738608f (patch) | |
| tree | f214e3c9a37006c2a7986dd78f92c59b9b0cc4f9 /pkgs/tools/security | |
| parent | 6abd75067ab70a33bb49f2ea6f141967af79a61d (diff) | |
| parent | e48f2d02268fe926ef16cbd8b2a87391bea739c4 (diff) | |
| download | nixlib-2dda26c9d42b9bc18599c691905020272738608f.tar nixlib-2dda26c9d42b9bc18599c691905020272738608f.tar.gz nixlib-2dda26c9d42b9bc18599c691905020272738608f.tar.bz2 nixlib-2dda26c9d42b9bc18599c691905020272738608f.tar.lz nixlib-2dda26c9d42b9bc18599c691905020272738608f.tar.xz nixlib-2dda26c9d42b9bc18599c691905020272738608f.tar.zst nixlib-2dda26c9d42b9bc18599c691905020272738608f.zip | |
Merge pull request #46079 from oxij/docheck/in-parallel
stdenv: implement enableParallelChecking option
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/tor/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index bb49e478910d..b03c753b0a32 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "geoip" ]; - enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libevent openssl zlib ] ++ stdenv.lib.optionals stdenv.isLinux [ libseccomp systemd libcap ]; @@ -37,14 +35,17 @@ stdenv.mkDerivation rec { --replace 'exec torsocks' 'exec ${torsocks}/bin/torsocks' ''; + enableParallelBuilding = true; + enableParallelChecking = false; # 4 tests fail randomly + + doCheck = true; + postInstall = '' mkdir -p $geoip/share/tor mv $out/share/tor/geoip{,6} $geoip/share/tor rm -rf $out/share/tor ''; - doCheck = true; - passthru.updateScript = import ./update.nix { inherit (stdenv) lib; inherit |