Merge branch master into haskell-updates haskell-updates

Conflicts from #341407 resolved.

1 files changed, 4 insertions, 9 deletions

diff --git a/pkgs/tools/security/gotestwaf/default.nix b/pkgs/tools/security/gotestwaf/default.nix
index 28305ceb4e8ee..6cbe088d6871f 100644
--- a/pkgs/tools/security/gotestwaf/default.nix
+++ b/pkgs/tools/security/gotestwaf/default.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "gotestwaf";
-  version = "0.4.19";
+  version = "0.5.5";
 
   src = fetchFromGitHub {
     owner = "wallarm";
     repo = "gotestwaf";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ax2HPhdaqawpFe2AZg3SVsEJLG7gEgL7632iRADpaa8=";
+    hash = "sha256-stGjxv9cgYxxclQpyytN6dhFm2G1Gxbf9MdyKw6gEC4=";
   };
 
-  vendorHash = null;
+  vendorHash = "sha256-mPqCphweDF9RQibdjTaXXfXdO8NENHVMdIPxrJEw2g4=";
 
   # Some tests require networking as of v0.4.0
   doCheck = false;
@@ -28,11 +28,6 @@ buildGoModule rec {
     "-X=github.com/wallarm/gotestwaf/internal/version.Version=v${version}"
   ];
 
-  postFixup = ''
-    # Rename binary
-    mv $out/bin/cmd $out/bin/${pname}
-  '';
-
   passthru.tests.version = testers.testVersion {
     command = "gotestwaf --version";
     package = gotestwaf;
@@ -41,10 +36,10 @@ buildGoModule rec {
 
   meta = with lib; {
     description = "Tool for API and OWASP attack simulation";
-    mainProgram = "gotestwaf";
     homepage = "https://github.com/wallarm/gotestwaf";
     changelog = "https://github.com/wallarm/gotestwaf/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "gotestwaf";
   };
 }