Revert "gopass*: build with Go with CL417615"

This reverts commit 88415923b57851b292d8e74fc9a15d55f29e5a13.

With the fix being in go_1_18 itself, this gopass-specific override
doesn't need to be shipped anymore.

authored by Florian Klink and committed by zowoq 3ac326a9 4d1e04c0

+5 -34
+5 -34
pkgs/top-level/all-packages.nix
··· 2603 2603 2604 2604 go-audit = callPackage ../tools/system/go-audit { }; 2605 2605 2606 - gopass = callPackage ../tools/security/gopass { 2607 - buildGoModule = __buildGo118ModuleCL417615; 2608 - }; 2606 + gopass = callPackage ../tools/security/gopass { }; 2609 2607 2610 - gopass-hibp = callPackage ../tools/security/gopass/hibp.nix { 2611 - buildGoModule = __buildGo118ModuleCL417615; 2612 - }; 2608 + gopass-hibp = callPackage ../tools/security/gopass/hibp.nix { }; 2613 2609 2614 - gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { 2615 - buildGoModule = __buildGo118ModuleCL417615; 2616 - }; 2610 + gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { }; 2617 2611 2618 - git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { 2619 - buildGoModule = __buildGo118ModuleCL417615; 2620 - }; 2612 + git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { }; 2621 2613 2622 - gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { 2623 - buildGoModule = __buildGo118ModuleCL417615; 2624 - }; 2625 - 2626 - # custom override for go 1.18 including the revert of CL411617, CL417615. 2627 - # Can be dropped if/once go 1.18.5 is released with CL417615. 2628 - # or when staging go 1.18.4 includes the revert. 2629 - __buildGo118ModuleCL417615 = let 2630 - fetchBase64Patch = args: (fetchpatch args).overrideAttrs (o: { 2631 - postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch; 2632 - }); 2633 - in darwin.apple_sdk_11_0.callPackage ../development/go-modules/generic { 2634 - go = buildPackages.go_1_18.overrideAttrs (oldAttrs: rec { 2635 - patches = oldAttrs.patches or [] ++ [ 2636 - # https://go-review.googlesource.com/c/go/+/417615/ 2637 - (fetchBase64Patch { 2638 - url = "https://go-review.googlesource.com/changes/go~417615/revisions/3/patch"; 2639 - sha256 = "sha256-Gu5eZUwGGch7et75A/BNynbs4VlQUBClVUxjxPkdjOs="; 2640 - }) 2641 - ]; 2642 - }); 2643 - }; 2614 + gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { }; 2644 2615 2645 2616 gosh = callPackage ../tools/security/gosh { }; 2646 2617