From 146f9c8de6e8c00f450cc0c01bb216c77a60720d Mon Sep 17 00:00:00 2001 From: Guangqing Chen Date: Wed, 25 Jan 2023 17:35:47 +0800 Subject: [PATCH 1/3] globalprotect-openconnect: 1.4.8 -> 1.4.9 --- .../globalprotect-openconnect/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/networking/globalprotect-openconnect/default.nix b/pkgs/tools/networking/globalprotect-openconnect/default.nix index 6558d72ecd93..0d2fd4fac042 100644 --- a/pkgs/tools/networking/globalprotect-openconnect/default.nix +++ b/pkgs/tools/networking/globalprotect-openconnect/default.nix @@ -1,22 +1,19 @@ { stdenv, lib, fetchFromGitHub -, cmake, qtwebsockets, qtwebengine, wrapQtAppsHook, openconnect +, cmake, qtwebsockets, qtwebengine, qtkeychain, wrapQtAppsHook, openconnect }: stdenv.mkDerivation rec { pname = "globalprotect-openconnect"; - version = "1.4.8"; + version = "1.4.9"; - src = fetchFromGitHub { - owner = "yuezk"; - repo = "GlobalProtect-openconnect"; - fetchSubmodules = true; - rev = "v${version}"; - sha256 = "sha256-PQAlGeHVayImKalCNv2SwPcxD0ts4BVSqeo1hKYmnMA="; + src = builtins.fetchTarball { + url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${version}/globalprotect-openconnect-${version}.tar.gz"; + sha256 = "0b7s3gf0gznlpmf9dxfq77254zlxmpajhzzn3scrdrvf413sjl0f"; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; - buildInputs = [ openconnect qtwebsockets qtwebengine ]; + buildInputs = [ openconnect qtwebsockets qtwebengine qtkeychain ]; patchPhase = '' substituteInPlace GPService/gpservice.h \ From 0e31d244c414fae6fdb3edca8ebc4cb2d15e3475 Mon Sep 17 00:00:00 2001 From: Guangqing Chen Date: Wed, 25 Jan 2023 20:14:10 +0800 Subject: [PATCH 2/3] use fetchurl instead Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com> --- pkgs/tools/networking/globalprotect-openconnect/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/globalprotect-openconnect/default.nix b/pkgs/tools/networking/globalprotect-openconnect/default.nix index 0d2fd4fac042..d93413668dc4 100644 --- a/pkgs/tools/networking/globalprotect-openconnect/default.nix +++ b/pkgs/tools/networking/globalprotect-openconnect/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "globalprotect-openconnect"; version = "1.4.9"; - src = builtins.fetchTarball { + src = fetchurl { url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${version}/globalprotect-openconnect-${version}.tar.gz"; sha256 = "0b7s3gf0gznlpmf9dxfq77254zlxmpajhzzn3scrdrvf413sjl0f"; }; From 464e87c40d8acfa9fa51199a42c1888d887e51c1 Mon Sep 17 00:00:00 2001 From: Guangqing Chen Date: Wed, 25 Jan 2023 20:14:10 +0800 Subject: [PATCH 3/3] address comments Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com> --- pkgs/tools/networking/globalprotect-openconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/globalprotect-openconnect/default.nix b/pkgs/tools/networking/globalprotect-openconnect/default.nix index d93413668dc4..5b00de2fda85 100644 --- a/pkgs/tools/networking/globalprotect-openconnect/default.nix +++ b/pkgs/tools/networking/globalprotect-openconnect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub +{ stdenv, lib, fetchurl , cmake, qtwebsockets, qtwebengine, qtkeychain, wrapQtAppsHook, openconnect }: @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/yuezk/GlobalProtect-openconnect/releases/download/v${version}/globalprotect-openconnect-${version}.tar.gz"; - sha256 = "0b7s3gf0gznlpmf9dxfq77254zlxmpajhzzn3scrdrvf413sjl0f"; + hash = "sha256-vhvVKESLbqHx3XumxbIWOXIreDkW3yONDMXMHxhjsvk="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ];