From patchwork Thu Apr 17 19:50:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jakob Kirsch X-Patchwork-Id: 41742 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 1440627BC4B; Thu, 17 Apr 2025 20:52:28 +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 0D80327BC49 for ; Thu, 17 Apr 2025 20:52:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u5VHM-0004Dp-JI; Thu, 17 Apr 2025 15:52: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 1u5VHK-00049y-07 for guix-patches@gnu.org; Thu, 17 Apr 2025 15:52: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 1u5VHJ-0002As-Fz for guix-patches@gnu.org; Thu, 17 Apr 2025 15:52: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:Subject; bh=Hx/0p0vrQwAKyy+AHFwezIfawyA7yGs+LZYslc/2V8k=; b=eZg2Ghf6fWNuya36XAFBAgXArj2ez2r738+4i/aP62SI7iy1jk9HMYv2rsAPcuTxUsmgocSTqgeLxYwZMXUZUcmWyjjYG8TV1MeF112iFVvCWXo1A0NjZFjyhr4Wt5530oTOUDRmIqG+K0IQxxGBVQwoZiDl/W5BkesfyyvlL226PkaO+2hEvU2yEJhWsshRNAWcHCL86tINdIP2TfLpykSC+lRhNr3CFnhFL+H4AdFkcwSiN8wsQWejMT8SOlCs6WvAUvTcy93mzepDdrCPujnDd7W2PGrRrjOwtUnd2lI29Sfbi2htRx0cYJeJ44s5Rwa6g98e9uv0BhA1PT9Gvw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u5VHJ-000170-7J for guix-patches@gnu.org; Thu, 17 Apr 2025 15:52:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77873] [PATCH] gnu: git-repo: Update to 2.54. Resent-From: Jakob Kirsch Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 17 Apr 2025 19:52:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77873@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17449194913974 (code B ref -1); Thu, 17 Apr 2025 19:52:04 +0000 Received: (at submit) by debbugs.gnu.org; 17 Apr 2025 19:51:31 +0000 Received: from localhost ([127.0.0.1]:48498 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u5VGb-00010V-Vc for submit@debbugs.gnu.org; Thu, 17 Apr 2025 15:51:30 -0400 Received: from lists.gnu.org ([2001:470:142::17]:59332) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u5VGM-0000wy-5D for submit@debbugs.gnu.org; Thu, 17 Apr 2025 15:51:09 -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 1u5VG6-0003KH-Rw for guix-patches@gnu.org; Thu, 17 Apr 2025 15:50:53 -0400 Received: from mout.web.de ([217.72.192.78]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u5VG3-0001y9-Q5 for guix-patches@gnu.org; Thu, 17 Apr 2025 15:50:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de; s=s29768273; t=1744919433; x=1745524233; i=jakob.kirsch@web.de; bh=Hx/0p0vrQwAKyy+AHFwezIfawyA7yGs+LZYslc/2V8k=; 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=Cxl+8N0fkg/gT8wMOQ3nAmmbS+GJ7TesLVx5aSvMKGNDF8OAYCz3H3z88zUyMksU G0S/N2hmlekKwy2gzWF7wSUMQCv9IMB/FDaTM+5EZ/TupbjDrxzw4iGbF9gJCie1N gFT9ptpq07mgHiYGiadGRGohay4d/h8AwQN6Bx0fMEi0GoYKLE3uMDWbSG66jJygM OeucMhiXBUwfN6tQEB6Y55PcavUPEfaqshyBrx9yz3iGt8OrVxRHF+iFCbVixuQ+Z 3EUPscEkZFcNS526yIxl0OBhmwzo8418Kfszov9dzzGxyrtTrdLvAYxAczfEVr349 i7qIeRdnWpmM1VyIGA== 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 1MumJF-1uwdju0h8d-00xROz for ; Thu, 17 Apr 2025 21:50:33 +0200 Date: Thu, 17 Apr 2025 21:50:31 +0200 Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Provags-ID: V03:K1:2WyzLvrycuToV84Y6lrmi0ouOiC19mHluRpdgsgZMGnkNwhptDx YA4Z/aYPQWkKs60iZrq3RDzAFh05A5sSncOLzxTS/SQESxaaL0fCGQjJrIUXZVVn3DlcxoC nxUiWmlRYcgtJxkcyATDaffL1B+rikexJ3CH1Az41ZQeF6xQFPCRCRdq7YabDZbQbvqXPJL eflTjGtI5e5r9UH5nas9Q== UI-OutboundReport: notjunk:1;M01:P0:0XYcTUNSXCk=;xm2gZoM2P7CZLvG86XXCO5oAaS2 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 Q== Received-SPF: pass client-ip=217.72.192.78; envelope-from=jakob.kirsch@web.de; helo=mout.web.de X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 | 116 +++++++++++++-------------------------- 1 file changed, 37 insertions(+), 79 deletions(-) base-commit: cc4b392a8303788762ed9adb9c5635cf227e58a2 diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index cb699b06dc..27a0f2c7e6 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,43 @@ (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"))) + #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