From a83164315e05b6437a117cd736aa2a603f304d2b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 17 Mar 2024 04:20:00 +0000 Subject: [PATCH 1/5] gopass: 1.15.11 -> 1.15.12 Diff: https://github.com/gopasspw/gopass/compare/v1.15.11...v1.15.12 Changelog: https://github.com/gopasspw/gopass/blob/v1.15.12/CHANGELOG.md --- pkgs/tools/security/gopass/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 6573c511474a..2b17f935d511 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.15.11"; + version = "1.15.12"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = "gopass"; rev = "v${version}"; - hash = "sha256-wgrZkRRMEWA9Lk9eW+iGi+dZNYfDVhRu1phimZC079c="; + hash = "sha256-sg3I/h0mkkWmK4GD1yoX14gM2oqwRjMXpX3KULHFJsg="; }; - vendorHash = "sha256-TvohrwSFVv5ylVRd6jPdRDyRRhqqWa0xey9KN9vtyY8="; + vendorHash = "sha256-jbwtxOfBL/5aXdWcsXZ5HQi83Oy00SSnLcvuWeCPBug="; subPackages = [ "." ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c73738fe4573..642f0713b195 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4026,7 +4026,9 @@ with pkgs; go-audit = callPackage ../tools/system/go-audit { }; - gopass = callPackage ../tools/security/gopass { }; + gopass = callPackage ../tools/security/gopass { + buildGoModule = buildGo122Module; + }; gopass-hibp = callPackage ../tools/security/gopass/hibp.nix { }; From 7da40c8560c69de09e0bcb1e7d0b2a9aed7fbb1b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 17 Mar 2024 04:20:00 +0000 Subject: [PATCH 2/5] 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 { }; From 28706e6b166b623ba8bea77b35adefb74ed4c1c3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 17 Mar 2024 04:20:00 +0000 Subject: [PATCH 3/5] 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 --- pkgs/tools/security/gopass/jsonapi.nix | 15 ++++++++++++--- 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 37ac46356c3a..ca0ad5a96fd3 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 90742b7c0581..905557e92792 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 { }; From 4411c125fc1e1a3c85749c671539c23fb0d66c7f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 17 Mar 2024 04:20:00 +0000 Subject: [PATCH 4/5] gopass-summon-provider: 1.15.11 -> 1.15.12 Diff: https://github.com/gopasspw/gopass-summon-provider/compare/v1.15.11...v1.15.12 Changelog: https://github.com/gopasspw/gopass-summon-provider/blob/v1.15.12/CHANGELOG.md --- pkgs/tools/security/gopass/summon.nix | 15 ++++++++++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/gopass/summon.nix b/pkgs/tools/security/gopass/summon.nix index 97aed94c05fe..fca94219cf07 100644 --- a/pkgs/tools/security/gopass/summon.nix +++ b/pkgs/tools/security/gopass/summon.nix @@ -2,21 +2,30 @@ , makeWrapper , buildGoModule , fetchFromGitHub +, fetchpatch , gopass }: buildGoModule rec { pname = "gopass-summon-provider"; - version = "1.15.11"; + version = "1.15.12"; src = fetchFromGitHub { owner = "gopasspw"; repo = "gopass-summon-provider"; rev = "v${version}"; - hash = "sha256-rbfzmr6HtGUBCjO9jkocSghTAN+aNXTsSsMC38HqgW0="; + hash = "sha256-gvgHqeVB+4d8UJhMv3CYYidttCcaRPkgI7PXasv7pCI="; }; - vendorHash = "sha256-bit4+YgQ+Y/TA2q7KdZwYTE3ZKBwL6tUam+tHzBMiQw="; + patches = [ + # go mod tidy. Remove with next release + (fetchpatch { + url = "https://github.com/gopasspw/gopass-summon-provider/commit/b3085cab14588cb6a5a383033947d9266fe0cd56.patch"; + hash = "sha256-8mvJqejqmuOloj9mW9zzsE/Xr0DtPhJeDItzVFVv4+c="; + }) + ]; + + vendorHash = "sha256-y1PH0+tt/kcHw2I4LWD2XfLud3JtsYqrRd/yVRPdaTA="; subPackages = [ "." ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 905557e92792..98f8e4bc95ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4040,7 +4040,9 @@ with pkgs; git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { }; - gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { }; + gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { + buildGoModule = buildGo122Module; + }; gosh = callPackage ../tools/security/gosh { }; From 5642844096f882eab82d58b60aa82fe1d8a5b1cd Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 17 Mar 2024 04:20:00 +0000 Subject: [PATCH 5/5] git-credential-gopass: 1.15.11 -> 1.15.12 Diff: https://github.com/gopasspw/git-credential-gopass/compare/v1.15.11...v1.15.12 Changelog: https://github.com/gopasspw/git-credential-gopass/blob/v1.15.12/CHANGELOG.md --- pkgs/tools/security/gopass/git-credential.nix | 15 ++++++++++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/gopass/git-credential.nix b/pkgs/tools/security/gopass/git-credential.nix index 8654d05d9d13..cf05591bbbfc 100644 --- a/pkgs/tools/security/gopass/git-credential.nix +++ b/pkgs/tools/security/gopass/git-credential.nix @@ -2,21 +2,30 @@ , makeWrapper , buildGoModule , fetchFromGitHub +, fetchpatch , gopass }: buildGoModule rec { pname = "git-credential-gopass"; - version = "1.15.11"; + version = "1.15.12"; src = fetchFromGitHub { owner = "gopasspw"; repo = "git-credential-gopass"; rev = "v${version}"; - hash = "sha256-qnWgrpcj3DZQu5haP/5xqoO7eogkRjBmc8XpgFFNT6I="; + hash = "sha256-5j5+so4LT3x+epEZf9OVn/kLNHBk2ENQxxRrzbziEA4="; }; - vendorHash = "sha256-bit4+YgQ+Y/TA2q7KdZwYTE3ZKBwL6tUam+tHzBMiQw="; + patches = [ + # go mod tidy. Remove with next release + (fetchpatch { + url = "https://github.com/gopasspw/git-credential-gopass/commit/88d11d2b1b49f00b7fba9a917cf90f7ea14c9d1b.patch"; + hash = "sha256-mXxI9GXan0zYL8msL83VLqxOp4oAOwMyCOFaUOLAg5E="; + }) + ]; + + vendorHash = "sha256-y1PH0+tt/kcHw2I4LWD2XfLud3JtsYqrRd/yVRPdaTA="; subPackages = [ "." ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98f8e4bc95ad..8e2828136b10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4038,7 +4038,9 @@ with pkgs; buildGoModule = buildGo122Module; }; - git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { }; + git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { + buildGoModule = buildGo122Module; + }; gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { buildGoModule = buildGo122Module;