Merge commit '0f5ce2fac0c726036ca69a5524c59a49e2973dd4'

1 files changed, 6 insertions, 10 deletions

diff --git a/nixpkgs/pkgs/development/tools/asmfmt/default.nix b/nixpkgs/pkgs/development/tools/asmfmt/default.nix
index 9794180eec1..c93b864b70f 100644
--- a/nixpkgs/pkgs/development/tools/asmfmt/default.nix
+++ b/nixpkgs/pkgs/development/tools/asmfmt/default.nix
@@ -6,7 +6,7 @@
 
 buildGoPackage rec {
   pname = "asmfmt";
-  version = "1.1";
+  version = "1.2.1";
 
   goPackagePath = "github.com/klauspost/asmfmt";
 
@@ -14,19 +14,15 @@ buildGoPackage rec {
     owner = "klauspost";
     repo = "asmfmt";
     rev = "v${version}";
-    sha256 = "08mybfizcvck460axakycz9ndzcgwqilp5mmgm4bl8hfrn36mskw";
+    sha256 = "0qwxb4yx12yl817vgbhs7acaj98lgk27dh50mb8sm9ccw1f43h9i";
   };
 
-  patches = [
-    (fetchpatch {
-      excludes = ["README.md"];
-      url = "https://github.com/klauspost/asmfmt/commit/39a37c8aed8095e0fdfb07f78fc8acbd465d9627.patch";
-      sha256 = "18bc77l87mf0yvqc3adlakxz6wflyqfsc2wrmh9q0nlqghlmnw5k";
-    })
-  ];
-
   goDeps = ./deps.nix;
 
+  # This package comes with its own version of goimports, gofmt and goreturns
+  # but these binaries are outdated and are offered by other packages.
+  subPackages = [ "cmd/asmfmt" ];
+
   meta = with lib; {
     description = "Go Assembler Formatter";
     homepage = "https://github.com/klauspost/asmfmt";