diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-04-09 19:16:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-09 19:16:26 +0100 |
| commit | 43a3cfe0c2b94dc5c0bd936079eb8f90af3d103b (patch) | |
| tree | 2369cc822f85e6865b9710dfff31a331258b7f80 /pkgs/applications/networking | |
| parent | 849a68597082c2a5adf83d5e122c9689f81d1cee (diff) | |
| parent | 7b4ed22b540184bb9cf7a2d38f8a04ee361e3689 (diff) | |
| download | nixpkgs-43a3cfe0c2b94dc5c0bd936079eb8f90af3d103b.tar nixpkgs-43a3cfe0c2b94dc5c0bd936079eb8f90af3d103b.tar.gz nixpkgs-43a3cfe0c2b94dc5c0bd936079eb8f90af3d103b.tar.bz2 nixpkgs-43a3cfe0c2b94dc5c0bd936079eb8f90af3d103b.tar.lz nixpkgs-43a3cfe0c2b94dc5c0bd936079eb8f90af3d103b.tar.xz nixpkgs-43a3cfe0c2b94dc5c0bd936079eb8f90af3d103b.tar.zst nixpkgs-43a3cfe0c2b94dc5c0bd936079eb8f90af3d103b.zip | |
Merge pull request #38654 from etu/testssl-update
testssl: 2.9.5-3 -> 2.9.5-4
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/testssl/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/applications/networking/testssl/testssl.patch | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix index 24ffe61b5ab..97c05dfafdb 100644 --- a/pkgs/applications/networking/testssl/default.nix +++ b/pkgs/applications/networking/testssl/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgs }: let - version = "2.9.5-3"; + version = "2.9.5-4"; pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd"; opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl"; @@ -12,16 +12,16 @@ in stdenv.mkDerivation rec { owner = "drwetter"; repo = "testssl.sh"; rev = "v${version}"; - sha256 = "07vlmf3gn2xa4wam2sql6c1s1hvj5adzd6l1fl12lq066v0k7r7n"; + sha256 = "0pfp7r4jhvkh06vawqlvq7vp4imwp6dpq6jx8m0k3j85ywwp45pd"; }; patches = [ ./testssl.patch ]; postPatch = '' - sed -i -e "s|/bin/pwd|${pwdBinPath}|g" \ - -e "s|TESTSSL_INSTALL_DIR:-\"\"|TESTSSL_INSTALL_DIR:-\"$out\"|g" \ - -e "s|OPENSSL:-\"\"|OPENSSL:-\"${opensslBinPath}\"|g" \ - testssl.sh + substituteInPlace testssl.sh \ + --replace /bin/pwd ${pwdBinPath} \ + --replace TESTSSL_INSTALL_DIR:-\"\" TESTSSL_INSTALL_DIR:-\"$out\" \ + --replace @@openssl-path@@ ${opensslBinPath} ''; installPhase = '' diff --git a/pkgs/applications/networking/testssl/testssl.patch b/pkgs/applications/networking/testssl/testssl.patch index d5269c73708..ffc9e4b1c16 100644 --- a/pkgs/applications/networking/testssl/testssl.patch +++ b/pkgs/applications/networking/testssl/testssl.patch @@ -4,7 +4,7 @@ # following variables make use of $ENV, e.g. OPENSSL=<myprivate_path_to_openssl> ./testssl.sh <host> # 0 means (normally) true here. Some of the variables are also accessible with a command line switch, see --help declare -x OPENSSL OPENSSL_TIMEOUT -+OPENSSL=${OPENSSL:-""} ++OPENSSL=${OPENSSL:-"@@openssl-path@@"} FAST_SOCKET=${FAST_SOCKET:-false} # EXPERIMENTAL feature to accelerate sockets -- DO NOT USE it for production COLOR=${COLOR:-2} # 2: Full color, 1: b/w+positioning, 0: no ESC at all COLORBLIND=${COLORBLIND:-false} # if true, swap blue and green in the output |