From 4fbde5bb370ce76312110a5d8238a300f0971f41 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Wed, 24 Apr 2019 22:39:26 +0200
Subject: [PATCH 1/3] testssl: 2.9.5-7 -> 2.9.5-8

Changelog: https://github.com/drwetter/testssl.sh/releases/tag/v2.9.5-8
---
 .../networking/testssl/default.nix             | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix
index 4a1f71f4b4f..70a6f64e880 100644
--- a/pkgs/applications/networking/testssl/default.nix
+++ b/pkgs/applications/networking/testssl/default.nix
@@ -1,17 +1,15 @@
 { stdenv, fetchFromGitHub, makeWrapper, lib
 , dnsutils, coreutils, openssl, nettools, utillinux, procps }:
 
-let
-  version = "2.9.5-7";
-
-in stdenv.mkDerivation rec {
-  name = "testssl.sh-${version}";
+stdenv.mkDerivation rec {
+  pname = "testssl.sh";
+  version = "2.9.5-8";
 
   src = fetchFromGitHub {
     owner = "drwetter";
     repo = "testssl.sh";
     rev = "v${version}";
-    sha256 = "02xp0yi53xf6jw6v633zs2ws2iyyvq3mlkimg0cv3zvj7nw9x5wr";
+    sha256 = "1fpakzm2gsv8yva58s23lhlgxkkvi3pixil2mjrlkmr0qk66rc32";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -31,12 +29,10 @@ in stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    install -Dt $out/bin testssl.sh
-
-    wrapProgram $out/bin/testssl.sh                                            \
-      --prefix PATH ':' ${lib.makeBinPath buildInputs}
-
+    install -D testssl.sh $out/bin/testssl.sh
     cp -r etc $out
+
+    wrapProgram $out/bin/testssl.sh --prefix PATH ':' ${lib.makeBinPath buildInputs}
   '';
 
   meta = with stdenv.lib; {

From cc05b7328612e53cc67ecf3bc1bdb52d260005c3 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Wed, 24 Apr 2019 22:42:40 +0200
Subject: [PATCH 2/3] testssl: 2.9.5-8 -> 3.0rc4

Changelog: https://github.com/drwetter/testssl.sh/releases/tag/3.0rc4
---
 pkgs/applications/networking/testssl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix
index 70a6f64e880..c2008378020 100644
--- a/pkgs/applications/networking/testssl/default.nix
+++ b/pkgs/applications/networking/testssl/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "testssl.sh";
-  version = "2.9.5-8";
+  version = "3.0rc4";
 
   src = fetchFromGitHub {
     owner = "drwetter";
     repo = "testssl.sh";
-    rev = "v${version}";
-    sha256 = "1fpakzm2gsv8yva58s23lhlgxkkvi3pixil2mjrlkmr0qk66rc32";
+    rev = version;
+    sha256 = "1qmsi3f4977ig8s14my5z2w9gydddanrij78f7jhyr2c8kkip7q7";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 329b31515e726fe2cdb8a1e76671a063a2cb059e Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Thu, 25 Apr 2019 13:54:49 +0200
Subject: [PATCH 3/3] testssl: 3.0rc4 -> 3.0rc5

Changelog: https://github.com/drwetter/testssl.sh/releases/tag/3.0rc4
---
 pkgs/applications/networking/testssl/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix
index c2008378020..0c30a3def33 100644
--- a/pkgs/applications/networking/testssl/default.nix
+++ b/pkgs/applications/networking/testssl/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "testssl.sh";
-  version = "3.0rc4";
+  version = "3.0rc5";
 
   src = fetchFromGitHub {
     owner = "drwetter";
-    repo = "testssl.sh";
+    repo = pname;
     rev = version;
-    sha256 = "1qmsi3f4977ig8s14my5z2w9gydddanrij78f7jhyr2c8kkip7q7";
+    sha256 = "14b9n0h4f2dsa292wi9gnan5ncgqblis6wyh5978lhjzi1d7gyds";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -25,7 +25,8 @@ stdenv.mkDerivation rec {
   postPatch = ''
     substituteInPlace testssl.sh                                               \
       --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 = ''