nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-18 19:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "gopass*: build with Go with CL417615"

Browse Source 
This reverts commit 88415923b5.

With the fix being in go_1_18 itself, this gopass-specific override
doesn't need to be shipped anymore.
This commit is contained in:
Florian Klink 2022-07-25 22:33:00 +07:00 committed by zowoq
parent 4d1e04c00f
commit 3ac326a93b
1 changed files with 5 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pkgs/top-level/all-packages.nix
View File

@ -2603,44 +2603,15 @@ with pkgs;
go-audit = callPackage ../tools/system/go-audit { };
gopass = callPackage ../tools/security/gopass {
buildGoModule = __buildGo118ModuleCL417615;
};
gopass = callPackage ../tools/security/gopass { };
gopass-hibp = callPackage ../tools/security/gopass/hibp.nix {
buildGoModule = __buildGo118ModuleCL417615;
};
gopass-hibp = callPackage ../tools/security/gopass/hibp.nix { };
gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix {
buildGoModule = __buildGo118ModuleCL417615;
};
gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { };
git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix {
buildGoModule = __buildGo118ModuleCL417615;
};
git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { };
gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix {
buildGoModule = __buildGo118ModuleCL417615;
};
# custom override for go 1.18 including the revert of CL411617, CL417615.
# Can be dropped if/once go 1.18.5 is released with CL417615.
# or when staging go 1.18.4 includes the revert.
__buildGo118ModuleCL417615 = let
fetchBase64Patch = args: (fetchpatch args).overrideAttrs (o: {
postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch;
});
in darwin.apple_sdk_11_0.callPackage ../development/go-modules/generic {
go = buildPackages.go_1_18.overrideAttrs (oldAttrs: rec {
patches = oldAttrs.patches or [] ++ [
# https://go-review.googlesource.com/c/go/+/417615/
(fetchBase64Patch {
url = "https://go-review.googlesource.com/changes/go~417615/revisions/3/patch";
sha256 = "sha256-Gu5eZUwGGch7et75A/BNynbs4VlQUBClVUxjxPkdjOs=";
})
];
});
};
gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { };
gosh = callPackage ../tools/security/gosh { };