From 65f85b6efbe03cd02ff7771707d6b3eb6889e7e2 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Thu, 30 Apr 2020 21:18:07 -0700
Subject: [PATCH 1/2] asmfmt: do not include gofmt/goimports/goreturns

---
 pkgs/development/tools/asmfmt/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/tools/asmfmt/default.nix b/pkgs/development/tools/asmfmt/default.nix
index 9794180eec19..db628e6b9024 100644
--- a/pkgs/development/tools/asmfmt/default.nix
+++ b/pkgs/development/tools/asmfmt/default.nix
@@ -27,6 +27,10 @@ buildGoPackage rec {
 
   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";

From cb91e0c667b67390aa307c6e157a3f33bfb7a886 Mon Sep 17 00:00:00 2001
From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com>
Date: Thu, 30 Apr 2020 21:24:02 -0700
Subject: [PATCH 2/2] asmfmt: 1.1 -> 1.2.1

---
 pkgs/development/tools/asmfmt/default.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/asmfmt/default.nix b/pkgs/development/tools/asmfmt/default.nix
index db628e6b9024..c93b864b70f8 100644
--- a/pkgs/development/tools/asmfmt/default.nix
+++ b/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,17 +14,9 @@ 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