From patchwork Thu Apr 17 20:38:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jakob Kirsch X-Patchwork-Id: 41746 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5F02727BC4B; Thu, 17 Apr 2025 21:39:38 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0EBF127BC49 for ; Thu, 17 Apr 2025 21:39:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u5W0q-0008N9-1d; Thu, 17 Apr 2025 16:39:08 -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 1u5W0n-0008Mr-Uf for guix-patches@gnu.org; Thu, 17 Apr 2025 16:39:06 -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 1u5W0n-0004W5-JY for guix-patches@gnu.org; Thu, 17 Apr 2025 16:39:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:From:Date:To:In-Reply-To:References:Subject; bh=57SlEuHxWjzH7iyOPjS8kEBwx06F9H01wlPVwuMGRsg=; b=PK8akS1YUEpVqxPIDBub5e1+GWAG4OcI8Z9LAxrD/MAWmBGoVjQ0eZ7neg2bVk/QJExxKETFwrz76sIaubgsK//8q4sz5gszfLy2osoPjPN5RGuOyAxO9b2G879/4tTM6+JUlUKKgAbwKdkv8YvkRBCUUIcZL3M0iZiXhaj3WuuM6oMTQWSf3IrmeIG33SelvzT67UgBO1tSUhSqURBdt2yQ4Rps6diohrTFcONwtI8h2jpTG1T4asWlrZThDP9yGFKWM4Az/PvnlsUQF1W3E4utwXNMYDJnSOkQFX22xEsOd7u2WPWwckui/zM8+cMeUC3Va4IiEm20x9OtIyw4RQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u5W0m-0001HN-UV for guix-patches@gnu.org; Thu, 17 Apr 2025 16:39:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77873] [PATCH v2] gnu: git-repo: Update to 2.54. References: In-Reply-To: Resent-From: Jakob Kirsch Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Apr 2025 20:39:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77873@debbugs.gnu.org Received: via spool by 77873-submit@debbugs.gnu.org id=B77873.17449223094558 (code B ref 77873); Thu, 17 Apr 2025 20:39:04 +0000 Received: (at 77873) by debbugs.gnu.org; 17 Apr 2025 20:38:29 +0000 Received: from localhost ([127.0.0.1]:48621 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u5W03-0001A0-6a for submit@debbugs.gnu.org; Thu, 17 Apr 2025 16:38:28 -0400 Received: from mout.web.de ([217.72.192.78]:47765) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u5Vzy-00018H-RP for 77873@debbugs.gnu.org; Thu, 17 Apr 2025 16:38:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de; s=s29768273; t=1744922287; x=1745527087; i=jakob.kirsch@web.de; bh=57SlEuHxWjzH7iyOPjS8kEBwx06F9H01wlPVwuMGRsg=; h=X-UI-Sender-Class:Date:From:To:Subject:Message-ID:MIME-Version: Content-Type:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=f20IIWd88Fj85gZUf1v1nDsT5iZNMVjf/+j/5t88/9I3fUdBRb1o8nDsVuKkokbM 1ZagaXDGzokhTXU2m3FzlyjAY06eLATcSOSgLeAs6DSH6kzDxGJwnqveUXyZckHd8 erZEUVg2CFHIKMFCrCw6YGWbGjhBOtJu88HnMZNq+IUFyaX3/jFS0wY3RDliuZj9h N3vLu5kMHpI7F2aBxZzM+s2N68lgKmbGSRM1iEEoPTg60m7w1dUIyaujX9wtjpxL0 gKa50hljUUk3FCRR+uUg8bGrsPVqzqxNhRZ+ElD7zJf2DhGb953Mi17asBXNzX7I3 2IjS2FpdKbm312g8tg== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from kernelpanicroom ([134.19.24.167]) by smtp.web.de (mrweb106 [213.165.67.124]) with ESMTPSA (Nemesis) id 1Mr7eu-1utfuz21aA-00lfoW for <77873@debbugs.gnu.org>; Thu, 17 Apr 2025 22:38:07 +0200 Date: Thu, 17 Apr 2025 22:38:05 +0200 Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Provags-ID: V03:K1:QHwEcBrqC18F8Ra4OGHe4njRtRWv8B4WRqYhW4m9EoRODBztcQZ yhwNwtSryFQol2D6AzFt1DhRlUgD2p28eJsTm12NAjSEEsOcx/zLek6Q3ekGTl2z1RzCE7m TZC5Svmrqq1vlJz8HOdCqJaaNFudjDaCGOm1m4+CalUf1rQ/bxtjYG7uzLCe/dMaj5WZ2tv 6dSdjTLwLsNZYtGljjwdQ== UI-OutboundReport: notjunk:1;M01:P0:2f8pzkx0Scc=;yjSbbbkwS5fCMNxBx2B7rghaeeB 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 Q== 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: , Reply-to: Jakob Kirsch X-ACL-Warn: , Jakob Kirsch via Guix-patches X-Patchwork-Original-From: Jakob Kirsch via Guix-patches via From: Jakob Kirsch Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/android.scm (git-repo): Update to 2.54. Change-Id: I241ba0acb19c72272780500b593ea4d3b5b9ddf6 --- gnu/packages/android.scm | 118 +++++++++++++-------------------------- 1 file changed, 39 insertions(+), 79 deletions(-) base-commit: cc4b392a8303788762ed9adb9c5635cf227e58a2 diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index cb699b06dc..30dc1a53b5 100644 --- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021 Petr Hodina ;;; Copyright © 2023 Camilo Q.S. (Distopico) +;;; Copyright © 2025 Jakob Kirsch ;;; ;;; This file is part of GNU Guix. ;;; @@ -45,6 +46,7 @@ (define-module (gnu packages android) #:use-module (guix build-system trivial) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) + #:use-module (gnu packages bash) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages docker) @@ -922,7 +924,7 @@ (define-public etc1tool (define-public git-repo (package (name "git-repo") - (version "2.4.1") + (version "2.54") (source (origin (method git-fetch) @@ -931,87 +933,45 @@ (define-public git-repo (commit (string-append "v" version)))) (file-name (string-append "git-repo-" version "-checkout")) (sha256 - (base32 "0khg1731927gvin73dcbw1657kbfq4k7agla5rpzqcnwkk5agzg3")))) + (base32 "0a1qa7gq3ink0cfgdxx3l3p26jm2w5vsifqs9xdvb98kkswak45d")))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'build 'set-executable-paths - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (git (assoc-ref inputs "git")) - (ssh (assoc-ref inputs "ssh"))) - (substitute* '("repo" "git_command.py") - (("^GIT = 'git'") - (string-append "GIT = '" git "/bin/git'"))) - (substitute* "git_config.py" - ((" command_base = \\['ssh',") - (string-append " command_base = ['" ssh "/bin/ssh',"))) - #t))) - (add-before 'build 'do-not-self-update - (lambda* (#:key outputs #:allow-other-keys) - ;; Setting the REPO_MAIN variable to an absolute file name is - ;; enough to have _FindRepo return the store main.py file. The - ;; self update mechanism is activated with the call to _Init() in - ;; main(), so we bypass it. - - ;; Ticket requesting upstream to provide a mean to disable the - ;; self update mechanism: - ;; https://bugs.chromium.org/p/gerrit/issues/detail?id=12407. - (let* ((out (assoc-ref outputs "out")) - (repo-main (string-append out "/share/git-repo/main.py"))) - (substitute* "repo" - (("^REPO_MAIN = .*") - (format #f "REPO_MAIN = ~s~%" repo-main)) - ((" _Init\\(args, gitc_init=\\(cmd ==.*" all) - (string-append "True #" all))) - ;; Prevent repo from trying to git describe its version from - ;; the (disabled) self updated copy. - (substitute* "git_command.py" - (("ver = getattr\\(RepoSourceVersion.*") - (format #f "ver = ~s~%" ,version))) - (substitute* "subcmds/version.py" - (("rp_ver = .*") - (format #f "rp_ver = ~s~%" ,version))) - ;; Prevent repo from adding its (disabled) self update copy to - ;; the list of projects to fetch when using 'repo sync'. - (substitute* "subcmds/sync.py" - (("to_fetch\\.extend\\(all_projects\\).*" all) - (string-append "#" all)) - (("self\\._Fetch\\(to_fetch") - "self._Fetch(all_projects") - (("_PostRepoFetch\\(rp, opt\\.repo_verify).*" all) - (string-append "#" all)))))) - (delete 'build) ; nothing to build - (add-before 'check 'configure-git - (lambda _ - (setenv "HOME" (getcwd)) - (invoke "git" "config" "--global" "user.email" "you@example.com") - (invoke "git" "config" "--global" "user.name" "Your Name"))) - (replace 'check - (lambda _ - (invoke "./run_tests"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin-dir (string-append out "/bin")) - (repo-dir (string-append out "/share/" ,name))) - (mkdir-p bin-dir) - (mkdir-p repo-dir) - (copy-recursively "." repo-dir) - (delete-file-recursively (string-append repo-dir "/tests")) - (symlink (string-append repo-dir "/repo") - (string-append bin-dir "/repo")) - #t)))))) - (inputs - ;; TODO: Add git-remote-persistent-https once it is available in guix - `(("git" ,git) - ("ssh" ,openssh))) - (native-inputs - `(("pytest" ,python-pytest))) - (home-page "https://code.google.com/p/git-repo/") + (list + #:tests? #f ;tests consist of just formatting the code + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'set-executable-paths + (lambda* (#:key inputs outputs #:allow-other-keys) + (begin + (substitute* '("repo" "git_command.py") + (("^GIT = 'git'") + (string-append "GIT = '" + #$git "/bin/git'"))) + (substitute* "git_config.py" + ((" command_base = \\['ssh',") + (string-append " command_base = ['" + #$openssh "/bin/ssh',"))) #t))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((bin-dir (string-append #$output "/bin")) + (repo-dir (string-append #$output "/share/git-repo"))) + (mkdir-p bin-dir) + (mkdir-p repo-dir) + (copy-recursively "." repo-dir) + (delete-file-recursively (string-append repo-dir "/tests")) + (symlink (string-append repo-dir "/repo") + (string-append bin-dir "/repo")) + (wrap-program (string-append bin-dir "/repo") + '("REPO_SKIP_SELF_UPDATE" = + ("1")) + '("REPO_TRACE" = + ("0"))) + #t)))))) + (inputs (list git openssh bash-minimal)) + (home-page "https://gerrit.googlesource.com/git-repo/") (synopsis "Helps to manage many Git repositories") - (description "Repo is a tool built on top of Git. Repo helps manage many + (description + "Repo is a tool built on top of Git. Repo helps manage many Git repositories, does the uploads to revision control systems, and automates parts of the development workflow. Repo is not meant to replace Git, only to make it easier to work with Git. The repo command is an executable Python