me
/
guix
Archived
1
0
Fork 0
Code

gnu: openconnect-sso: Update to 0.8.0. 

* gnu/packages/vpn.scm (openconnect-sso): Update to 0.8.0.
[source]: Download using git-fetch.
[build-system]: Switch to pyproject-build-system.
[arguments]: Don't skip tests. Remove custom 'check phase. Move custom
'wrap-qt-process-path phase to after 'check.
[inputs]: Add poetry.
[native-inputs]: Remove python-setuptools-scm. Add
python-pytest-asyncio, python-pytest-httpserver.
Efraim Flashner 2022-11-02 19:34:37 +02:00
parent 6de705f259
commit db670af37d
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gnu/packages/vpn.scm
View File

@ -50,6 +50,7 @@
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system go) #:use-module (guix build-system go)
#:use-module (guix build-system linux-module) #:use-module (guix build-system linux-module)
#:use-module (guix build-system pyproject)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system qt) #:use-module (guix build-system qt)
#:use-module (guix utils) #:use-module (guix utils)
@ -709,17 +710,19 @@ and probably others.")
(define-public openconnect-sso (define-public openconnect-sso
(package (package
(name "openconnect-sso") (name "openconnect-sso")
(version "0.7.3") (version "0.8.0")
(source (source
(origin (origin
(method url-fetch) (method git-fetch)
(uri (pypi-uri "openconnect-sso" version)) (uri (git-reference
(url "https://github.com/vlaci/openconnect-sso")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256 (sha256
(base32 "065s5c8q80jh0psdw7694nlabwpra7aw6yc4jlgsc9vxx8rx2na1")))) (base32 "0l214qxhxx214628mcg6rmbzbzna7mxj5l7rah9q4vvcd88ymp39"))))
(build-system python-build-system) (build-system pyproject-build-system)
(arguments (arguments
`(#:tests? #f ; Tests not included, building from git requires poetry. `(#:phases
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-openconnect (add-after 'unpack 'patch-openconnect
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
@ -728,11 +731,7 @@ and probably others.")
(string-append "\"" (string-append "\""
(search-input-file inputs "/sbin/openconnect") (search-input-file inputs "/sbin/openconnect")
"\""))))) "\"")))))
(replace 'check (add-after 'check 'wrap-qt-process-path
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "pytest" "-v"))))
(add-after 'install 'wrap-qt-process-path
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin/openconnect-sso")) (bin (string-append out "/bin/openconnect-sso"))
@ -744,6 +743,7 @@ and probably others.")
`("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))))))))) `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path)))))))))
(inputs (inputs
(list openconnect (list openconnect
poetry
python-attrs python-attrs
python-colorama python-colorama
python-keyring python-keyring
@ -758,7 +758,9 @@ and probably others.")
python-toml python-toml
qtwebengine-5)) qtwebengine-5))
(native-inputs (native-inputs
(list python-pytest python-setuptools-scm)) (list python-pytest
python-pytest-asyncio
python-pytest-httpserver))
(home-page "https://github.com/vlaci/openconnect-sso") (home-page "https://github.com/vlaci/openconnect-sso")
(synopsis "OpenConnect wrapper script supporting Azure AD (SAMLv2)") (synopsis "OpenConnect wrapper script supporting Azure AD (SAMLv2)")
(description (description