From d686cec7d72cdcc60d9d75ddae423747cd2f6540 Mon Sep 17 00:00:00 2001 From: Rahul Rameshbabu Date: Wed, 13 Nov 2024 14:03:53 -0800 Subject: [PATCH 1/3] {gpauth,gpclient}: Add m1dugh as a maintainer @m1dugh has contributed a lot in #350777. The upstream state of the GUI component combined with the paid licensing model has made it daunting to consider integrating into nixpkgs. Instead, add @m1dugh as a co-maintainer for the existing v2 packages. Signed-off-by: Rahul Rameshbabu --- pkgs/by-name/gp/gpauth/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gp/gpauth/package.nix b/pkgs/by-name/gp/gpauth/package.nix index c54be41b2f06..43f59252de7f 100644 --- a/pkgs/by-name/gp/gpauth/package.nix +++ b/pkgs/by-name/gp/gpauth/package.nix @@ -45,6 +45,9 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/${src.owner}/${src.repo}"; license = with licenses; [ gpl3Only ]; - maintainers = with maintainers; [ binary-eater ]; + maintainers = with maintainers; [ + binary-eater + m1dugh + ]; }; } From 27787d0d25438284f15e714de8717eddae9b1a1c Mon Sep 17 00:00:00 2001 From: Rahul Rameshbabu Date: Wed, 13 Nov 2024 14:10:27 -0800 Subject: [PATCH 2/3] gpclient: Remove absolute path in desktop entry PR #308324 describes the various issues with using absolute paths in desktop entries. This change makes gpclient comply with the direction stated in that PR. Suggested-by: @tomodachi94 Signed-off-by: Rahul Rameshbabu --- pkgs/by-name/gp/gpclient/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/gp/gpclient/package.nix b/pkgs/by-name/gp/gpclient/package.nix index 49277a0a2462..d9547ccf8bae 100644 --- a/pkgs/by-name/gp/gpclient/package.nix +++ b/pkgs/by-name/gp/gpclient/package.nix @@ -47,6 +47,6 @@ rustPlatform.buildRustPackage rec { postFixup = '' substituteInPlace $out/share/applications/gpgui.desktop \ - --replace-fail /usr/bin/gpclient $out/bin/gpclient + --replace-fail /usr/bin/gpclient gpclient ''; } From d42fed462be9ef5d01741bb744699e70540d97f5 Mon Sep 17 00:00:00 2001 From: Rahul Rameshbabu Date: Wed, 13 Nov 2024 14:36:09 -0800 Subject: [PATCH 3/3] {gpauth,gpclient}: 2.3.7 -> 2.3.9 Signed-off-by: Rahul Rameshbabu --- pkgs/by-name/gp/gpauth/package.nix | 6 +++--- pkgs/by-name/gp/gpclient/package.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/gp/gpauth/package.nix b/pkgs/by-name/gp/gpauth/package.nix index 43f59252de7f..102cfe3ddf58 100644 --- a/pkgs/by-name/gp/gpauth/package.nix +++ b/pkgs/by-name/gp/gpauth/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage rec { pname = "gpauth"; - version = "2.3.7"; + version = "2.3.9"; src = fetchFromGitHub { owner = "yuezk"; repo = "GlobalProtect-openconnect"; rev = "v${version}"; - hash = "sha256-Zr888II65bUjrbStZfD0AYCXKY6VdKVJHQhbKwaY3is="; + hash = "sha256-s+uCpNrwQvdIINLSIbtcCCBg469J2xtlyiwDYqtXrQs="; }; buildAndTestSubdir = "apps/gpauth"; - cargoHash = "sha256-AuYw8CC0bMJzIJJQXhcQajQ4SACz4aKv6rG4HMq7U18="; + cargoHash = "sha256-QHqPVsMPKgAhhZwah3g1jqidl3UnvvKZnM4r1coUHSs="; nativeBuildInputs = [ perl diff --git a/pkgs/by-name/gp/gpclient/package.nix b/pkgs/by-name/gp/gpclient/package.nix index d9547ccf8bae..a662c56f718a 100644 --- a/pkgs/by-name/gp/gpclient/package.nix +++ b/pkgs/by-name/gp/gpclient/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { inherit (gpauth) version src meta; buildAndTestSubdir = "apps/gpclient"; - cargoHash = "sha256-aJYFBvVrj1n2+9WLLBH5WTRRzTle19LsdJ2DielJYik="; + cargoHash = "sha256-lKfcWKOxpXEB28JajypOdyJNxLIAI8udMlaEo+6pecQ="; nativeBuildInputs = [ perl