From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id AH5JGlucvmQ4UAEASxT56A (envelope-from ) for ; Mon, 24 Jul 2023 17:44:27 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id iJZdGlucvmTB+wAA9RJhRA (envelope-from ) for ; Mon, 24 Jul 2023 17:44:27 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id EF3B13BCC0 for ; Mon, 24 Jul 2023 17:44:26 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1690213467; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=Xzy0q6c6U3lxy27nR2e6g6rz7ONVwtTzxwG+Yvz//bo=; b=L7euXP6sfYGBRHHCNh/88ES9CugK7/AX/u+z3SHZ/fF3L/FFh5QxpmWv0lHap86UoV1KLG 6xJOECZ7myPY5EkW/ZJpIEvdWchp+05ZMBpTM+1b1c/yzfvYrF6YTjLd/SPESgbAdkmb7I NDRcVwaapkABxZ6F+dFeqe/Yb4IsvrZNPhQLL1W0jiv6uuZoHG08HSt7LujE0zvZnl7bYH MaLSyu8dKape5iYREh74H6WRVNpzbat+7ipJqPr140OvQ0tHQ+tufRSJKWaaCD2bj6gaCt SiYuaDUr2dCmylzy+RfX7W6td+ALLyJp+EUIlTll6d4B4ojmQQktJxXkgpmN0Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1690213467; a=rsa-sha256; cv=none; b=P6reYGAyTL2ibGv0C/38Pr43Miq1EAb2Rqu+1ex1vUo386SL6dSpcB9domsoSQBBU63tK4 qb/HowUR+8EUKUIuvuRIY7DccICVr8uLVZxXNx4SOpnLP1DQejdVXANmLWEA9kgEHieUj0 I0pkCdy5tFrLyQNpsyPAQOX3tOpF5JQT6Dp/w44UxNX3YkgQoMtAMEe6KitcLOvhQra+/O u4/1e5XKIMIRKJfuS9IrF28X9GLT8fFVAeO7ahjeK3qay+2zwttFh8u6bSpo+ZdWy69re7 yf77j7ioFxW4mi7xkHWhSmIE9mZAR/GARgL42+3nUVvSkChveF+zXgYukjxR2w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNxjB-0005td-B3; Mon, 24 Jul 2023 11:44:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qNxj9-0005tU-9Y for guix-patches@gnu.org; Mon, 24 Jul 2023 11:44:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qNxj9-0006Hq-1t for guix-patches@gnu.org; Mon, 24 Jul 2023 11:44:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNxj8-0003Nz-Bn for guix-patches@gnu.org; Mon, 24 Jul 2023 11:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64808] [PATCH] gnu: Add andorid-sdkmanager. Resent-From: Andreas Enge Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Jul 2023 15:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64808 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Distopico Cc: 64808@debbugs.gnu.org, maxim.cournoyer@gmail.com Received: via spool by 64808-submit@debbugs.gnu.org id=B64808.169021342012967 (code B ref 64808); Mon, 24 Jul 2023 15:44:02 +0000 Received: (at 64808) by debbugs.gnu.org; 24 Jul 2023 15:43:40 +0000 Received: from localhost ([127.0.0.1]:43824 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNxim-0003N5-7o for submit@debbugs.gnu.org; Mon, 24 Jul 2023 11:43:40 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:45662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNxii-0003Mk-Qm for 64808@debbugs.gnu.org; Mon, 24 Jul 2023 11:43:39 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 817871D22; Mon, 24 Jul 2023 17:43:30 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hera.aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Tkt0ak0ODau8; Mon, 24 Jul 2023 17:43:29 +0200 (CEST) Received: from jurong (unknown [IPv6:2001:861:c4:f2f0::c64]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 37600389; Mon, 24 Jul 2023 17:43:29 +0200 (CEST) Date: Mon, 24 Jul 2023 17:43:27 +0200 From: Andreas Enge Message-ID: References: <87y1j6o437.fsf@riseup.net> <87ttttnyuf.fsf@riseup.net> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MjONEB5T5vfpFX76" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <87ttttnyuf.fsf@riseup.net> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.15 X-Spam-Score: -4.15 X-Migadu-Queue-Id: EF3B13BCC0 X-Migadu-Scanner: mx1.migadu.com X-TUID: aau4AJWeQCnX --MjONEB5T5vfpFX76 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Am Mon, Jul 24, 2023 at 09:51:35AM -0500 schrieb Distopico: > The name change make sense, thank you and ANDROID_HOME is the way > according with the documentation, but "gnupg" is necessary, if you test > with `--container -N` you will se the error: > `FileNotFoundError: [Errno 2] No such file or directory: 'gpgv'` > after run `sdkmanager --list`, "gpgv" is part of gnupg package, for that > reason I added it in "propagated-inputs". attached a patch with that > change. Ah, I see, of course I did have gnupg in my profile already... I think a better option is to replace the one occurrence of "gpgv" in the script by the absolute path to the binary; this also registers a reference with the package. Could you test the attached patch, please? Andreas --MjONEB5T5vfpFX76 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: attachment; filename="0001-gnu-Add-sdkmanager.patch" Content-Transfer-Encoding: 8bit >From 18c42e27cca61c868fc6b5d06ab8e13cc0a02302 Mon Sep 17 00:00:00 2001 Message-ID: <18c42e27cca61c868fc6b5d06ab8e13cc0a02302.1690213156.git.andreas@enge.fr> From: Distopico Date: Sun, 23 Jul 2023 13:41:32 -0500 Subject: [PATCH] gnu: Add sdkmanager. * gnu/packages/android.scm (sdkmanager): New variable. Co-authored-by: Andreas Enge --- gnu/packages/android.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index f35c2398bd..b9b8b89208 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2020 Sergey Trofimov ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021 Petr Hodina +;;; Copyright © 2023 Camilo Q.S. (Distopico) ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,6 +39,7 @@ (define-module (gnu packages android) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system python) + #:use-module (guix build-system pyproject) #:use-module (guix build-system trivial) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) @@ -721,6 +723,35 @@ (define-public fastboot "This package provides @command{fastboot}, a tool to upload file system images to Android devices.") (license license:asl2.0))) +(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")))) + (build-system pyproject-build-system) + (inputs (list python-requests python-argcomplete python-urllib3 gnupg)) + (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")))))))) + (home-page "https://gitlab.com/fdroid/sdkmanager") + (synopsis "Replacement for Android sdkmanager written in Python") + (description + "This package provides a drop-in replacement for sdkmanager from +the Android SDK. It is written in Python and part of the F-Droid +project. It implements the exact API of the Android sdkmanager command +line. The project also attempts to maintain the same terminal output.") + (license license:agpl3+))) + (define-public android-udev-rules (package (name "android-udev-rules") base-commit: cf9904bcc8dd03e73675475bb4d8746dc434e415 -- 2.41.0 --MjONEB5T5vfpFX76--