diff options
| author | Distopico <distopico@riseup.net> | 2025-09-23 16:55:01 -0500 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2025-09-24 15:07:32 +0200 |
| commit | 32bc77002fa3485fc947346aaf643848fe38357f (patch) | |
| tree | 91d58ad38ba9c1d04240c4423e3e4b1b1db957c6 /gnu/packages | |
| parent | 632ea2db9869459aac88767b2c6aebb70b8c43e2 (diff) | |
gnu: sdkmanager: Update to 0.6.11.
* gnu/packages/android.scm (sdkmanager): Update to 0.6.11.
[native-inputs]: Add python-defusedxml, python-requests-cache.
[native-inputs]: Add python-requests-cache, change python-urllib3 version.
[native-search-paths]: Add `$SSL_CERT_FILE` to avoid error 'Could not
find a suitable TLS CA certificate bundle'.
[arguments]<#:phases>{patch-tests}: Disable tests that require network.
{check}: Replace.
Change-Id: I95d2908bc9e814b1cfe5efd799a1955f2c6bba3c
Signed-off-by: Andreas Enge <andreas@enge.fr>
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/android.scm | 61 |
1 files changed, 41 insertions, 20 deletions
diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index a83e5df4199..8c16e1a5c8f 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2020 Sergey Trofimov <sarg@sarg.org.ru> ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com> -;;; Copyright © 2023 Camilo Q.S. (Distopico) <distopico@riseup.net> +;;; Copyright © 2023, 2025 Camilo Q.S. (Distopico) <distopico@riseup.net> ;;; Copyright © 2025 Jordan Moore <lockbox@struct.foo> ;;; ;;; This file is part of GNU Guix. @@ -45,6 +45,7 @@ #:use-module (guix build-system qt) #:use-module (guix build-system trivial) #:use-module ((guix licenses) #:prefix license:) + #:use-module ((guix search-paths) #:select ($SSL_CERT_FILE)) #:use-module (gnu packages) #:use-module (gnu packages check) #:use-module (gnu packages compression) @@ -739,27 +740,47 @@ file system.") (define-public sdkmanager (package (name "sdkmanager") - (version "0.6.5") - (source (origin - (method url-fetch) - (uri (pypi-uri "sdkmanager" version ".tar.gz")) - (sha256 - (base32 - "11as7n2mj3nbqsqb3ivyv9985n73i022s748qvjg36cs8ig50afx")))) + (version "0.6.11") + (source + (origin + (method url-fetch) + (uri (pypi-uri "sdkmanager" version ".tar.gz")) + (sha256 + (base32 "0r3xwk8xsfxvmxyw3d57sy2i9by24g0l1jl40735jiac9mypcg7n")))) (build-system pyproject-build-system) - (inputs (list python-requests - python-argcomplete - python-urllib3-1.26 - gnupg)) - (native-inputs (list python-setuptools python-wheel)) + (inputs (list python-requests python-argcomplete python-urllib3 + python-looseversion gnupg)) + (native-inputs (list python-setuptools python-wheel python-requests-cache + python-defusedxml)) + (native-search-paths + (list $SSL_CERT_FILE)) (arguments - (list #:phases #~(modify-phases %standard-phases - (add-before 'build 'patch-gnupg - (lambda _ - (substitute* "sdkmanager.py" - (("gpgv") - (string-append #$(this-package-input "gnupg") - "/bin/gpgv")))))))) + (list + #:test-flags + #~(list "-k" "test_*") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-tests + (lambda _ + (substitute* "test_sdkmanager.py" + ;; Tests below require network. + (("def test_checksums_json_mirrors") + "def __test_checksums_json_mirrors") + (("def test_install_and_rerun") + "def __test_install_and_rerun") + (("def test_main_args") + "def __test_main_args") + (("def test_licenses") + "def __test_licenses")))) + (add-before 'build 'patch-gnupg + (lambda _ + (substitute* "sdkmanager.py" + (("gpgv") + (string-append #$(this-package-input "gnupg") "/bin/gpgv"))))) + (replace 'check + (lambda* (#:key tests? test-flags #:allow-other-keys) + (when tests? + (apply invoke "python" "-m" "unittest" test-flags))))))) (home-page "https://gitlab.com/fdroid/sdkmanager") (synopsis "Replacement for Android sdkmanager written in Python") (description |