gp-saml: migrate to by-name (#427492)

authored by Weijia Wang and committed by GitHub c9f71ace 3e672c06

+16 -16
+16 -14
pkgs/tools/networking/gp-saml-gui/default.nix pkgs/by-name/gp/gp-saml-gui/package.nix
··· 2 2 lib, 3 3 stdenv, 4 4 fetchFromGitHub, 5 - buildPythonPackage, 5 + python3Packages, 6 6 webkitgtk_4_1, 7 7 wrapGAppsHook3, 8 8 glib-networking, 9 9 gobject-introspection, 10 10 openconnect, 11 - pygobject3, 12 - requests, 13 11 }: 14 - buildPythonPackage rec { 12 + python3Packages.buildPythonPackage rec { 15 13 pname = "gp-saml-gui"; 16 14 version = "0.1+20240731-${lib.strings.substring 0 7 src.rev}"; 17 15 format = "setuptools"; ··· 20 18 owner = "dlenski"; 21 19 repo = "gp-saml-gui"; 22 20 rev = "c46af04b3a6325b0ecc982840d7cfbd1629b6d43"; 23 - sha256 = "sha256-4MFHad1cuCWawy2hrqdXOgud0pXpYiV9J3Jwqyg4Udk="; 21 + hash = "sha256-4MFHad1cuCWawy2hrqdXOgud0pXpYiV9J3Jwqyg4Udk="; 24 22 }; 25 23 26 24 buildInputs = lib.optional stdenv.hostPlatform.isLinux glib-networking; ··· 31 29 glib-networking 32 30 ]; 33 31 34 - propagatedBuildInputs = [ 35 - requests 36 - pygobject3 37 - openconnect 38 - ] 39 - ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1; 32 + dependencies = 33 + with python3Packages; 34 + [ 35 + requests 36 + pygobject3 37 + ] 38 + ++ [ 39 + openconnect 40 + ] 41 + ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1; 40 42 41 43 preFixup = '' 42 44 gappsWrapperArgs+=( ··· 44 46 ) 45 47 ''; 46 48 47 - meta = with lib; { 49 + meta = { 48 50 description = "Interactively authenticate to GlobalProtect VPNs that require SAML"; 49 51 mainProgram = "gp-saml-gui"; 50 52 homepage = "https://github.com/dlenski/gp-saml-gui"; 51 - license = licenses.gpl3Only; 52 - maintainers = [ maintainers.pallix ]; 53 + license = lib.licenses.gpl3Only; 54 + maintainers = with lib.maintainers; [ pallix ]; 53 55 }; 54 56 }
-2
pkgs/top-level/all-packages.nix
··· 1085 1085 } 1086 1086 ); 1087 1087 1088 - gp-saml-gui = python3Packages.callPackage ../tools/networking/gp-saml-gui { }; 1089 - 1090 1088 inherit (callPackages ../tools/networking/ivpn/default.nix { }) 1091 1089 ivpn 1092 1090 ivpn-service