From 7da40c8560c69de09e0bcb1e7d0b2a9aed7fbb1b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 17 Mar 2024 04:20:00 +0000 Subject: [PATCH] gopass-hibp: 1.15.11 -> 1.15.12 Diff: https://github.com/gopasspw/gopass-hibp/compare/v1.15.11...v1.15.12 Changelog: https://github.com/gopasspw/gopass-hibp/blob/v1.15.12/CHANGELOG.md --- pkgs/tools/security/gopass/hibp.nix | 15 ++++++++++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/gopass/hibp.nix b/pkgs/tools/security/gopass/hibp.nix index 11ee0a94dbf9..c9fca15f9058 100644 --- a/pkgs/tools/security/gopass/hibp.nix +++ b/pkgs/tools/security/gopass/hibp.nix @@ -2,21 +2,30 @@ , makeWrapper , buildGoModule , fetchFromGitHub +, fetchpatch , gopass }: buildGoModule rec { pname = "gopass-hibp"; - version = "1.15.11"; + version = "1.15.12"; src = fetchFromGitHub { owner = "gopasspw"; repo = "gopass-hibp"; rev = "v${version}"; - hash = "sha256-2XhvUIa8RxQ6CAKPGpL8/rBiJSX/WsSGtIpaHLIBM1E="; + hash = "sha256-5BnCaxF2XZ4f26KsTbapcZ2+Ii58nR/14pCj0c0QLKE="; }; - vendorHash = "sha256-i9PUqircNf+jz5gcr3rVIR4tD9/bkV2h6LiDFhjiLaw="; + patches = [ + # go mod tidy. Remove with next release + (fetchpatch { + url = "https://github.com/gopasspw/gopass-hibp/commit/cdfdbc6da154874c74d7c8fc83bb11a98dd8fd81.patch"; + hash = "sha256-jCzg3c8EizhoRYvWUZCys6/q2ChVWy/psPofNGIYdxs="; + }) + ]; + + vendorHash = "sha256-GLqtwUg3fa1okdPoQBkF+ygpm8GLmDyIyUiC7/TTTaE="; subPackages = [ "." ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 642f0713b195..90742b7c0581 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4030,7 +4030,9 @@ with pkgs; buildGoModule = buildGo122Module; }; - gopass-hibp = callPackage ../tools/security/gopass/hibp.nix { }; + gopass-hibp = callPackage ../tools/security/gopass/hibp.nix { + buildGoModule = buildGo122Module; + }; gopass-jsonapi = callPackage ../tools/security/gopass/jsonapi.nix { };