diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2024-03-17 04:20:00 +0000 |
---|---|---|
committer | Mario Rodas <marsam@users.noreply.github.com> | 2024-03-17 04:20:00 +0000 |
commit | 28706e6b166b623ba8bea77b35adefb74ed4c1c3 (patch) | |
tree | 4302cc6fe8af4920e66d04dec017c1ddd71a3651 /pkgs | |
parent | 7da40c8560c69de09e0bcb1e7d0b2a9aed7fbb1b (diff) |
gopass-jsonapi: 1.15.11 -> 1.15.12
Diff: https://github.com/gopasspw/gopass-jsonapi/compare/v1.15.11...v1.15.12 Changelog: https://github.com/gopasspw/gopass-jsonapi/blob/v1.15.12/CHANGELOG.md
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/tools/security/gopass/jsonapi.nix | 15 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 15 insertions, 4 deletions
diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/tools/security/gopass/jsonapi.nix index 37ac46356c3a4..ca0ad5a96fd3e 100644 --- a/pkgs/tools/security/gopass/jsonapi.nix +++ b/pkgs/tools/security/gopass/jsonapi.nix @@ -2,22 +2,31 @@ , makeWrapper , buildGoModule , fetchFromGitHub +, fetchpatch , installShellFiles , gopass }: buildGoModule rec { pname = "gopass-jsonapi"; - version = "1.15.11"; + version = "1.15.12"; src = fetchFromGitHub { owner = "gopasspw"; repo = "gopass-jsonapi"; rev = "v${version}"; - hash = "sha256-wJlnm+sgFg55LW4RWGjcT538DgNhJtFjwgwgqwLWH50="; + hash = "sha256-sR+48MRBHj3XpKLp/AOGf2H4ltZD1fHlIA2HPYSHdp0="; }; - vendorHash = "sha256-qRmPO2WM9RD43twl5a47IT3xC1LGFwNF99ojIU2xg6A="; + patches = [ + # go mod tidy. Remove with next release + (fetchpatch { + url = "https://github.com/gopasspw/gopass-jsonapi/commit/cab33faab113d0c9702ebaa14cde13e5ccd465d2.patch"; + hash = "sha256-IoxU5r1k0Y6N+PKAZH8LEO/fXHjryx5y58RRFeHP7Bc="; + }) + ]; + + vendorHash = "sha256-2JADTyBgAK2j524G+ksKLJC255PmvMViFFCwmgtXZzA="; subPackages = [ "." ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90742b7c05815..905557e92792a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4034,7 +4034,9 @@ with pkgs; buildGoModule = buildGo122Module; }; - gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { }; + gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { + buildGoModule = buildGo122Module; + }; git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { }; |