Merge pull request #60183 from etu/testssl-upgrades

testssl: 2.9.5-7 -> 3.0rc5
This commit is contained in:
Elis Hirwing 2019-05-01 20:07:51 +02:00 committed by GitHub
commit 175f25d0c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,17 +1,15 @@
{ stdenv, fetchFromGitHub, makeWrapper, lib { stdenv, fetchFromGitHub, makeWrapper, lib
, dnsutils, coreutils, openssl, nettools, utillinux, procps }: , dnsutils, coreutils, openssl, nettools, utillinux, procps }:
let stdenv.mkDerivation rec {
version = "2.9.5-7"; pname = "testssl.sh";
version = "3.0rc5";
in stdenv.mkDerivation rec {
name = "testssl.sh-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "drwetter"; owner = "drwetter";
repo = "testssl.sh"; repo = pname;
rev = "v${version}"; rev = version;
sha256 = "02xp0yi53xf6jw6v633zs2ws2iyyvq3mlkimg0cv3zvj7nw9x5wr"; sha256 = "14b9n0h4f2dsa292wi9gnan5ncgqblis6wyh5978lhjzi1d7gyds";
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
@ -27,16 +25,15 @@ in stdenv.mkDerivation rec {
postPatch = '' postPatch = ''
substituteInPlace testssl.sh \ substituteInPlace testssl.sh \
--replace /bin/pwd pwd \ --replace /bin/pwd pwd \
--replace TESTSSL_INSTALL_DIR:-\"\" TESTSSL_INSTALL_DIR:-\"$out\" --replace TESTSSL_INSTALL_DIR:-\"\" TESTSSL_INSTALL_DIR:-\"$out\" \
--replace PROG_NAME=\"\$\(basename\ \"\$0\"\)\" PROG_NAME=\"testssl.sh\"
''; '';
installPhase = '' installPhase = ''
install -Dt $out/bin testssl.sh install -D testssl.sh $out/bin/testssl.sh
wrapProgram $out/bin/testssl.sh \
--prefix PATH ':' ${lib.makeBinPath buildInputs}
cp -r etc $out cp -r etc $out
wrapProgram $out/bin/testssl.sh --prefix PATH ':' ${lib.makeBinPath buildInputs}
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {