diff options
Diffstat (limited to 'gnu/packages/vpn.scm')
| -rw-r--r-- | gnu/packages/vpn.scm | 85 |
1 files changed, 46 insertions, 39 deletions
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index e511423525..8c4204ce8f 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -798,6 +798,12 @@ others.") (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'use-poetry-core + (lambda _ + ;; Patch to use the core poetry API. + (substitute* "pyproject.toml" + (("poetry.masonry.api") + "poetry.core.masonry.api")))) (add-after 'unpack 'patch-openconnect (lambda* (#:key inputs #:allow-other-keys) (substitute* "openconnect_sso/app.py" @@ -807,7 +813,6 @@ others.") "\"")))))))) (inputs (list openconnect - poetry python-attrs python-colorama python-keyring @@ -822,7 +827,8 @@ others.") python-toml qtwebengine-5)) (native-inputs - (list python-pytest + (list python-poetry-core + python-pytest python-pytest-asyncio python-pytest-httpserver)) (home-page "https://github.com/vlaci/openconnect-sso") @@ -1050,35 +1056,31 @@ DNS domain name queries.") (version "1.5.1") (source (origin - (method url-fetch) - (uri (pypi-uri name version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/albertodonato/sshoot") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "05i54nga4vy660yy9yf6dl376yj0jc51303yr295qk3k9w0k96yd")))) - (build-system python-build-system) + (base32 "0725p0l2gx881hsjw3nj44n4gm1kv9hirv5cd4d9yr1ba87whp3q")))) + (build-system pyproject-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-paths - (lambda _ - (substitute* "sshoot/tests/test_manager.py" - (("/bin/sh") (which "sh"))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "-vv" "--pyargs" "sshoot"))))))) - (inputs - (list python-argcomplete - python-prettytable - python-pyyaml - python-pyxdg - python-toolrack)) - ;; For tests only. - (native-inputs - (list python-pytest python-pytest-mock)) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "sshoot/tests/test_manager.py" + (("/bin/sh") + (search-input-file inputs "bin/sh")))))))) + (inputs (list python-argcomplete python-prettytable python-pyyaml + python-pyxdg python-toolrack)) + (native-inputs (list python-pytest python-pytest-mock python-setuptools + python-wheel)) (home-page "https://github.com/albertodonato/sshoot") (synopsis "VPN session manager (sshuttle)") - (description "sshoot provides a command-line interface to manage multiple + (description + "sshoot provides a command-line interface to manage multiple @command{sshuttle} virtual private networks. It supports flexible profiles with configuration options for most of @command{sshuttle}’s features.") (license license:gpl3+))) @@ -1297,22 +1299,27 @@ L2TP allows you to tunnel PPP over UDP.") (version "0.16.1") (source (origin - (method url-fetch) - (uri (pypi-uri "vpn-slice" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/dlenski/vpn-slice") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "1anfx4hn2ggm6sbwqmqx68s3l2rjcy4z4l038xqb440jnk8jvl18")))) - (build-system python-build-system) + (base32 "16shhgypw78d9982r7v293h8fbmpl4wvjb6076w66baincn599ag")))) + (build-system pyproject-build-system) (arguments (list + #:tests? #f ; No tests. #:phases - '(modify-phases %standard-phases - (add-after 'unpack 'patch-FHS-file-names - (lambda _ - (substitute* "vpn_slice/linux.py" - (("/sbin/iptables") - (which "iptables")) - (("/sbin/ip") - (which "ip")))))))) + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-FHS-file-names + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "vpn_slice/linux.py" + (("/sbin/iptables") + (search-input-file inputs "/sbin/iptables")) + (("/sbin/ip") + (search-input-file inputs "/sbin/ip")))))))) + (native-inputs (list python-setuptools python-wheel)) (inputs (list python-dnspython python-setproctitle iproute iptables)) (home-page "https://github.com/dlenski/vpn-slice") (synopsis "Split tunneling replacement for vpnc-script") |