diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2020-12-31 08:49:13 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2020-12-31 08:50:36 +0100 |
| commit | c2fca99f975c6656f7a7d1355ca098606380f2be (patch) | |
| tree | 0c8b30af0e0c5b5bda93cfe95490baa761a82617 /pkgs/tools/security/tor/default.nix | |
| parent | f19b7b03a03b7f1d5beb44471eb9298de4b9e186 (diff) | |
| download | nixpkgs-c2fca99f975c6656f7a7d1355ca098606380f2be.tar nixpkgs-c2fca99f975c6656f7a7d1355ca098606380f2be.tar.gz nixpkgs-c2fca99f975c6656f7a7d1355ca098606380f2be.tar.bz2 nixpkgs-c2fca99f975c6656f7a7d1355ca098606380f2be.tar.lz nixpkgs-c2fca99f975c6656f7a7d1355ca098606380f2be.tar.xz nixpkgs-c2fca99f975c6656f7a7d1355ca098606380f2be.tar.zst nixpkgs-c2fca99f975c6656f7a7d1355ca098606380f2be.zip | |
Revert "Merge branch 'master' into staging-next"
This reverts commit f19b7b03a03b7f1d5beb44471eb9298de4b9e186, reversing changes made to 572a864d024b0c91ac39133f35364362b2376c07. Sorry. I pushed the wrong staging-next (the one that had my master merged in). This was not intended.
Diffstat (limited to 'pkgs/tools/security/tor/default.nix')
| -rw-r--r-- | pkgs/tools/security/tor/default.nix | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index e46fd4790a3..04bf598d132 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchurl, pkgconfig, libevent, openssl, zlib, torsocks , libseccomp, systemd, libcap, lzma, zstd, scrypt, nixosTests -, writeShellScript # for update.nix , writeScript @@ -13,21 +12,7 @@ , gnused , nix }: -let - tor-client-auth-gen = writeShellScript "tor-client-auth-gen" '' - PATH="${stdenv.lib.makeBinPath [coreutils gnugrep openssl]}" - pem="$(openssl genpkey -algorithm x25519)" - - printf private_key=descriptor:x25519: - echo "$pem" | grep -v " PRIVATE KEY" | - base64 -d | tail --bytes=32 | base32 | tr -d = - - printf public_key=descriptor:x25519: - echo "$pem" | openssl pkey -in /dev/stdin -pubout | - grep -v " PUBLIC KEY" | - base64 -d | tail --bytes=32 | base32 | tr -d = - ''; -in + stdenv.mkDerivation rec { pname = "tor"; version = "0.4.4.6"; @@ -67,7 +52,6 @@ stdenv.mkDerivation rec { mkdir -p $geoip/share/tor mv $out/share/tor/geoip{,6} $geoip/share/tor rm -rf $out/share/tor - ln -s ${tor-client-auth-gen} $out/bin/tor-client-auth-gen ''; passthru = { |