Message ID | 8d71ec46a7d06cecf6a5d8afb2585277980b3a73.camel@unstable.horse |
---|---|
State | New |
Headers | show |
Series | [bug#64443,v1] gnu: Add gp-saml-gui | expand |
Hi, On 2023-07-04 11:58, Unstable Horse wrote: > + (arguments > + `(#:phases > + (modify-phases %standard-phases > + (add-after 'install 'wrap-program > + (lambda* (#:key outputs #:allow-other-keys) > + (wrap-program > + (string-append (assoc-ref outputs "out") "/bin/gp-saml-gui") > + `("GUIX_PYTHONPATH" ":" prefix > + (,(getenv "GUIX_PYTHONPATH"))) > + `("GI_TYPELIB_PATH" ":" prefix > + (,(getenv "GI_TYPELIB_PATH"))))))))) I'd use G-Expressions and write this part as: --8<---------------cut here---------------start------------->8--- (list #:phases #~(modify-phases %standard-phases (add-after 'install 'wrap-program (lambda _ (let ((prog (string-append #$output "/bin/gp-saml-gui"))) (wrap-program prog `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH"))) `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))) --8<---------------cut here---------------end--------------->8--- Another thing, your email client mangled this patch since I had to do some sed magic to remove the Unicode non-breaking spaces. Please use 'git send-email' as it doesn't exhibit this behavior.
On Wed, 2023-07-05 at 15:22 +0100, Bruno Victal wrote: > I'd use G-Expressions and write this part as: > > --8<---------------cut here---------------start------------->8--- > (list > #:phases > #~(modify-phases %standard-phases > (add-after 'install 'wrap-program > (lambda _ > (let ((prog (string-append #$output "/bin/gp-saml-gui"))) > (wrap-program prog > `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH"))) > `("GI_TYPELIB_PATH" = (,(getenv > "GI_TYPELIB_PATH"))))))))) > --8<---------------cut here---------------end--------------->8--- Ooh, I haven't wrapped my head around those yet. I'll test this in a minute. > Another thing, your email client mangled this patch since I had to do > some sed magic to remove the Unicode non-breaking spaces. > Please use 'git send-email' as it doesn't exhibit this behavior. Thanks! That was Evolution... I'll keep that in mind.
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index af070526ec..ee1082bc68 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -67,6 +67,7 @@ (define-module (gnu packages vpn) #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) #:use-module (gnu packages gl) + #:use-module (gnu packages glib) #:use-module (gnu packages gnupg) #:use-module (gnu packages golang) #:use-module (gnu packages guile) @@ -86,6 +87,7 @@ (define-module (gnu packages vpn) #:use-module (gnu packages qt) #:use-module (gnu packages samba) #:use-module (gnu packages tls) + #:use-module (gnu packages webkit) #:use-module (gnu packages xml)) (define-public bitmask @@ -279,6 +281,49 @@ (define-public bitmask (home-page "https://bitmask.net/") (license license:gpl3+))) +(define-public gp-saml-gui + ;; No release. + (let ((commit "258f47cdc4a8ed57a1eef16667f6cad0d1cb49b1") + (revision "1")) + (package + (name "gp-saml-gui") + (version (git-version "0.0.0" revision commit)) + (home-page "https://github.com/dlenski/gp-saml-gui") + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0qj2mmi6lfkq5c4v6fbzgriajqc27k9kb1i9k2r776pn5pq14pc3")))) + (build-system python-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) + (wrap-program + (string-append (assoc-ref outputs "out") "/bin/gp-saml-gui") + `("GUIX_PYTHONPATH" ":" prefix + (,(getenv "GUIX_PYTHONPATH"))) + `("GI_TYPELIB_PATH" ":" prefix + (,(getenv "GI_TYPELIB_PATH"))))))))) + (inputs + (list bash-minimal + python-pygobject + python-urllib3 + python-requests + webkitgtk-with-libsoup2)) + (propagated-inputs + (list openconnect)) + (synopsis "Interactively authenticate to GlobalProtect VPNs that require SAML") + (description "This is a helper script to allow you to interactively login +to a GlobalProtect VPN that uses SAML authentication, so that you can +subsequently connect with OpenConnect.") + (license license:gpl3+)))) + (define-public gvpe (package (name "gvpe")