testssl: 2.9.5-3 -> 2.9.5-4
Changelog: https://github.com/drwetter/testssl.sh/releases/tag/v2.9.5-4 Also improved the expression to be more readable.
This commit is contained in:
parent
a05f246bdd
commit
7b4ed22b54
|
@ -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 = ''
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue