gopass: 1.16.0 -> 1.16.1, modernize (#470593) (86fde554) · Commits · nix / nixpkgs

pkgs/tools/security/gopass/git-credential.nix→pkgs/by-name/gi/git-credential-gopass/package.nix

+61 −0

Original line number	Diff line number	Diff line
		{
		lib,
		makeWrapper,
		buildGoModule,
		fetchFromGitHub,
		makeWrapper,
		writableTmpDirAsHomeHook,
		gopass,
		versionCheckHook,
		}:

		buildGoModule rec {
		buildGoModule (finalAttrs: {
		pname = "git-credential-gopass";
		version = "1.16.0";
		version = "1.16.1";

		src = fetchFromGitHub {
		owner = "gopasspw";
		repo = "git-credential-gopass";
		rev = "v${version}";
		hash = "sha256-1045Ui8/WKNkAi6iSpJ1nsryA9J3U5KMAElYwN6Dho8=";
		tag = "v${finalAttrs.version}";
		hash = "sha256-IEur3Sw2zRYJxlwAhgpb2OnBt+FcC+OdeT7M/LzJwoY=";
		};

		vendorHash = "sha256-JDrC0h4+ltdMHOR36BDkVpcFDDaHGv6IDnW0O4QvWVI=";
		vendorHash = "sha256-mtJIm7dH3jP7p0R0KxN0Yf7mi9rkJ73u8biy2Ygvk3k=";

		subPackages = [ "." ];

		nativeBuildInputs = [ makeWrapper ];
		nativeBuildInputs = [
		makeWrapper
		writableTmpDirAsHomeHook
		];

		ldflags = [
		"-s"
		"-w"
		"-X main.version=${version}"
		"-X main.commit=${src.rev}"
		"-X main.version=${finalAttrs.version}"
		"-X main.commit=${finalAttrs.src.rev}"
		];

		postFixup = ''
		wrapProgram $out/bin/git-credential-gopass \
		--prefix PATH : "${lib.makeBinPath [ gopass ]}"
		--prefix PATH : "${gopass.wrapperPath}"
		'';

		doInstallCheck = true;
		nativeInstallCheckInputs = [
		versionCheckHook
		gopass
		];
		versionCheckKeepEnvironment = [ "HOME" ];
		preVersionCheck = ''
		gopass setup --name "user" --email "user@localhost"
		'';

		meta = {
		description = "Manage git credentials using gopass";
		homepage = "https://github.com/gopasspw/git-credential-gopass";
		changelog = "https://github.com/gopasspw/git-credential-gopass/blob/v${version}/CHANGELOG.md";
		changelog = "https://github.com/gopasspw/git-credential-gopass/blob/v${finalAttrs.version}/CHANGELOG.md";
		license = lib.licenses.mit;
		maintainers = with lib.maintainers; [ benneti ];
		mainProgram = "git-credential-gopass";
		};
		}
		})

pkgs/tools/security/gopass/hibp.nix→pkgs/by-name/go/gopass-hibp/package.nix

+24 −11

Original line number	Diff line number	Diff line
		{
		lib,
		makeWrapper,
		buildGoModule,
		fetchFromGitHub,
		makeWrapper,
		gopass,
		versionCheckHook,
		writableTmpDirAsHomeHook,
		}:

		buildGoModule rec {
		buildGoModule (finalAttrs: {
		pname = "gopass-hibp";
		version = "1.16.0";
		version = "1.16.1";

		src = fetchFromGitHub {
		owner = "gopasspw";
		repo = "gopass-hibp";
		rev = "v${version}";
		hash = "sha256-S4X2DWaktAfoqjLz7yAF5I0v+01bQbQLSgEb/105iCk=";
		tag = "v${finalAttrs.version}";
		hash = "sha256-BlZxXN14bOO7LMdjS/ooqVKmRZQTpNYlYp4A4rTew4Q=";
		};

		vendorHash = "sha256-8LC271XuMeDGWZnysMMumoqLwklQpDKr8VF/zyCvwNA=";
		vendorHash = "sha256-LUmxstDE0paYaNS2Em1Xc6pJmHHWk/IJEjTZXq5qWW8=";

		subPackages = [ "." ];

		@@ -26,13 +28,24 @@ buildGoModule rec {
		ldflags = [
		"-s"
		"-w"
		"-X main.version=${version}"
		"-X main.commit=${src.rev}"
		"-X main.version=${finalAttrs.version}"
		"-X main.commit=${finalAttrs.src.rev}"
		];

		postFixup = ''
		wrapProgram $out/bin/gopass-hibp \
		--prefix PATH : "${lib.makeBinPath [ gopass ]}"
		--prefix PATH : "${gopass.wrapperPath}"
		'';

		doInstallCheck = true;
		nativeInstallCheckInputs = [
		versionCheckHook
		writableTmpDirAsHomeHook
		gopass
		];
		versionCheckKeepEnvironment = [ "HOME" ];
		preVersionCheck = ''
		gopass setup --name "user" --email "user@localhost"
		'';

		__darwinAllowLocalNetworking = true;
		@@ -40,9 +53,9 @@ buildGoModule rec {
		meta = {
		description = "Gopass haveibeenpwnd.com integration";
		homepage = "https://github.com/gopasspw/gopass-hibp";
		changelog = "https://github.com/gopasspw/gopass-hibp/blob/v${version}/CHANGELOG.md";
		changelog = "https://github.com/gopasspw/gopass-hibp/blob/v${finalAttrs.version}/CHANGELOG.md";
		license = lib.licenses.mit;
		maintainers = with lib.maintainers; [ sikmir ];
		mainProgram = "gopass-hibp";
		};
		}
		})

pkgs/by-name/go/gopass-jsonapi/package.nix

+19 −14

Original line number	Diff line number	Diff line
		{
		lib,
		stdenv,
		makeWrapper,
		buildGoModule,
		fetchFromGitHub,
		installShellFiles,
		writableTmpDirAsHomeHook,
		jq,
		gnupg,
		gopass,
		versionCheckHook,
		}:

		let

		# https://github.com/gopasspw/gopass-jsonapi/blob/v1.16.0/internal/jsonapi/manifest/manifest_path_linux.go
		manifestPaths = {
		firefox = "$out/lib/mozilla/native-messaging-hosts/com.justwatch.gopass.json";
		@@ -22,38 +22,37 @@ let
		iridium = "$out/etc/iridium-browser/native-messaging-hosts/com.justwatch.gopass.json";
		slimjet = "$out/etc/opt/slimjet/native-messaging-hosts/com.justwatch.gopass.json";
		};

		in
		buildGoModule rec {
		buildGoModule (finalAttrs: {
		pname = "gopass-jsonapi";
		version = "1.16.0";
		version = "1.16.1";

		src = fetchFromGitHub {
		owner = "gopasspw";
		repo = "gopass-jsonapi";
		rev = "v${version}";
		hash = "sha256-LPGAK/vwcbsAvL3TXX78cPCbNbYXh2++Ta1D8RjbKK4=";
		tag = "v${finalAttrs.version}";
		hash = "sha256-JN/SC7lvPVTONNbOUmgu//xK/GaR5Tljxn99Zb1J/kQ=";
		};

		vendorHash = "sha256-TTTjQRUYKqtyE/vFHol0ewbkh+2oGo9Pjr1qTmfXrq4=";
		vendorHash = "sha256-Ki0gzhDkoUvgTCN4bYrqvN0u3AgdG22MWxcVHIE9lUQ=";

		subPackages = [ "." ];

		nativeBuildInputs = [
		installShellFiles
		makeWrapper
		writableTmpDirAsHomeHook
		];

		ldflags = [
		"-s"
		"-w"
		"-X main.version=${version}"
		"-X main.commit=${src.rev}"
		"-X main.version=${finalAttrs.version}"
		"-X main.commit=${finalAttrs.src.rev}"
		];

		postInstall = ''
		# Generate native messaging manifests for Chrome and Firefox.
		export HOME=$(mktemp -d)
		${gnupg}/bin/gpg --batch --passphrase "" --quick-generate-key "user <user@localhost>"
		${gopass}/bin/gopass setup --name "user" --email "user@localhost"

		@@ -64,7 +63,7 @@ buildGoModule rec {
		in
		# The options after `--print=false` are of no effect, but if missing
		# `gopass-jsonapi configure` will ask for them. (`--libpath` and `--global`
		# are overriden by `--manifest-path`. `--libpath` is only used to
		# are overridden by `--manifest-path`. `--libpath` is only used to
		# compute Firefox's global manifest path. See
		# https://github.com/gopasspw/gopass-jsonapi/blob/v1.16.0/setup_others.go#L33-L46)
		#
		@@ -96,10 +95,16 @@ buildGoModule rec {
		--prefix PATH : "${gopass.wrapperPath}"
		'';

		doInstallCheck = true;
		nativeInstallCheckInputs = [
		versionCheckHook
		];
		versionCheckKeepEnvironment = [ "HOME" ];

		meta = {
		description = "Enables communication with gopass via JSON messages";
		homepage = "https://github.com/gopasspw/gopass-jsonapi";
		changelog = "https://github.com/gopasspw/gopass-jsonapi/blob/v${version}/CHANGELOG.md";
		changelog = "https://github.com/gopasspw/gopass-jsonapi/blob/v${finalAttrs.version}/CHANGELOG.md";
		license = lib.licenses.mit;
		maintainers = with lib.maintainers; [
		maxhbr
		@@ -107,4 +112,4 @@ buildGoModule rec {
		];
		mainProgram = "gopass-jsonapi";
		};
		}
		})

pkgs/tools/security/gopass/summon.nix→pkgs/by-name/go/gopass-summon-provider/package.nix

+24 −11

Original line number	Diff line number	Diff line
		{
		lib,
		makeWrapper,
		buildGoModule,
		fetchFromGitHub,
		makeWrapper,
		gopass,
		versionCheckHook,
		writableTmpDirAsHomeHook,
		}:

		buildGoModule rec {
		buildGoModule (finalAttrs: {
		pname = "gopass-summon-provider";
		version = "1.16.0";
		version = "1.16.1";

		src = fetchFromGitHub {
		owner = "gopasspw";
		repo = "gopass-summon-provider";
		rev = "v${version}";
		hash = "sha256-ES+lU0iBwzkomWoVKQrKElOaH9XiumnzpBVRjWbI/cM=";
		tag = "v${finalAttrs.version}";
		hash = "sha256-j3N/snUCsw/NlMQO9CoVRf6JCG48DEHqrJnZ7wiVUPk=";
		};

		vendorHash = "sha256-gE8x+81DFzw0TSkxwU5s+OQccSvfRVH6dV+sWhMdBxI=";
		vendorHash = "sha256-FhS79dSY9FjlScoXd6EbYRRwEBObZLO9g/SXBEXQpjM=";

		subPackages = [ "." ];

		@@ -26,21 +28,32 @@ buildGoModule rec {
		ldflags = [
		"-s"
		"-w"
		"-X main.version=${version}"
		"-X main.commit=${src.rev}"
		"-X main.version=${finalAttrs.version}"
		"-X main.commit=${finalAttrs.src.rev}"
		];

		postFixup = ''
		wrapProgram $out/bin/gopass-summon-provider \
		--prefix PATH : "${lib.makeBinPath [ gopass ]}"
		--prefix PATH : "${gopass.wrapperPath}"
		'';

		doInstallCheck = true;
		nativeInstallCheckInputs = [
		versionCheckHook
		writableTmpDirAsHomeHook
		gopass
		];
		versionCheckKeepEnvironment = [ "HOME" ];
		preVersionCheck = ''
		gopass setup --name "user" --email "user@localhost"
		'';

		meta = {
		description = "Gopass Summon Provider";
		homepage = "https://github.com/gopasspw/gopass-summon-provider";
		changelog = "https://github.com/gopasspw/gopass-summon-provider/blob/v${version}/CHANGELOG.md";
		changelog = "https://github.com/gopasspw/gopass-summon-provider/blob/v${finalAttrs.version}/CHANGELOG.md";
		license = lib.licenses.mit;
		maintainers = with lib.maintainers; [ sikmir ];
		mainProgram = "gopass-summon-provider";
		};
		}
		})

pkgs/tools/security/gopass/default.nix→pkgs/by-name/go/gopass/package.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@ let
		in
		buildGoModule (finalAttrs: {
		pname = "gopass";
		version = "1.16.0";
		version = "1.16.1";

		nativeBuildInputs = [
		installShellFiles
		@@ -39,7 +39,7 @@ buildGoModule (finalAttrs: {
		owner = "gopasspw";
		repo = "gopass";
		tag = "v${finalAttrs.version}";
		hash = "sha256-JBa/PhVj0cKr9Btz9KzhGgsL4APAfZ/ixHGHWzd2TfA=";
		hash = "sha256-Yr66+LUEoONNkSQUQhIWtLvxN0a5YtRVbn/nJRLqn+E=";
		};

		vendorHash = "sha256-ebnnnAD7SQJrSVOPborHUWd8ThOstIgihEIUjrnCztQ=";
		@@ -75,7 +75,6 @@ buildGoModule (finalAttrs: {
		versionCheckHook
		gitMinimal
		];
		versionCheckProgramArg = "--version";

		passthru = {
		inherit wrapperPath;
		@@ -90,6 +89,7 @@ buildGoModule (finalAttrs: {
		maintainers = with lib.maintainers; [
		rvolosatovs
		sikmir
		yzx9
		];
		changelog = "https://github.com/gopasspw/gopass/blob/v${finalAttrs.version}/CHANGELOG.md";