From patchwork Mon May 12 10:16:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jakob Kirsch X-Patchwork-Id: 42548 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 1948427BC4A; Mon, 12 May 2025 11:17:14 +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.3 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,URIBL_SBL_A autolearn=unavailable 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 64D1727BC49 for ; Mon, 12 May 2025 11:17:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEQDd-00054E-2J; Mon, 12 May 2025 06:17: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 1uEQDW-00051q-Ph for guix-patches@gnu.org; Mon, 12 May 2025 06:17: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 1uEQDW-0003Yg-Dj for guix-patches@gnu.org; Mon, 12 May 2025 06:17:02 -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=6P+XL36LbFP8erWF59jncotqMDw4nXEFQ2k0SgS7Cmk=; b=Wk2vrZotTePMIwr+i8VgrMVXdBss9UrUAJ1rjKhvFVTRh0SPB9jFchcFd88a9xIZ+AD0Mw/adn1W7+qntpKVQANp/Iyh1cBq/kH8iG9oiEduQajNAuhEMvMSXpVZjWBb5SMw+WP8gphBNz5qY0KItcjPCz+5YeO6ezAcK5YcnLRAHu4zvCgS1RlIhV5SQc1hxP8duENLaEZt90OX60LK18vEm+p9pwNNW1+qs+Q9TtcGBQnNjYsyUGHTpv33uYAsFThAXbg+VkZ/YEet19tgLHkthx9F7M6eIAWEDttYIFGs/oGoyjblBtzqbPiCBX9vbvBUYXQOQzvKz90r+q0D1A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uEQDV-0008VW-PL for guix-patches@gnu.org; Mon, 12 May 2025 06:17:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77873] [PATCH v3] 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: Mon, 12 May 2025 10:17:01 +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.174704499132645 (code B ref 77873); Mon, 12 May 2025 10:17:01 +0000 Received: (at 77873) by debbugs.gnu.org; 12 May 2025 10:16:31 +0000 Received: from localhost ([127.0.0.1]:50500 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uEQCt-0008UF-DK for submit@debbugs.gnu.org; Mon, 12 May 2025 06:16:31 -0400 Received: from mout.web.de ([212.227.15.4]:51669) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uEQCo-0008Ti-V9 for 77873@debbugs.gnu.org; Mon, 12 May 2025 06:16:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de; s=s29768273; t=1747044972; x=1747649772; i=jakob.kirsch@web.de; bh=6P+XL36LbFP8erWF59jncotqMDw4nXEFQ2k0SgS7Cmk=; 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=PiRn22Ff/mbi+0DYpqHczbe00kgg6puG60LLA7skw6QoNk/97NnoMBClOX7AgCwA hptVfNEImtzxkEn+W64zg/vZD+qUpMXS11kXSAaiyntpxlKbgdVvfY9Q89+egVPDp QHcdrwEc1Dnl1JgSSlRJoQrCvKVMBjmRl2VTe4o6CbSxl+gHNxl+gYMHQj2KXJUXd IYZ4JZy8FZtvcRg8Y4f1g6U3UGn5K/kDYfZqdPPpxwz5BrmwBI3dx7u/sGkrzVfPG yqXaKHHxr6EHMVi7DDnDJ31wxb+s4M+PVmFvVVd3+RA/0SZw/CwPVbp3SRVvcSNCJ mF63XJJdvTip62SDaw== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from kernelpanicroom ([134.19.28.124]) by smtp.web.de (mrweb005 [213.165.67.108]) with ESMTPSA (Nemesis) id 1N6b8s-1v4VW6187q-010NXh for <77873@debbugs.gnu.org>; Mon, 12 May 2025 12:16:12 +0200 Date: Mon, 12 May 2025 12:16:10 +0200 Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Provags-ID: V03:K1:pSRKOTjYm0y30cpBIJOtspZQbN9nAYnO0nUlMFjQt6s1wpf9Ien fgbgWUq9rwsc5/KKEZ0OJj7bSGRpsAjnRc2/nXe+bIL9fFYHB+NfAk8USoQZdy9nSMD62u+ AotbspzhikRp0mtSH8n5tMYCOFq7FeOtnCICKOWaw3mXtX++ugXsS3lui79tzyfBJ+mSm+f k3QwbO9DMwSdd5D+gxGew== UI-OutboundReport: notjunk:1;M01:P0:U6b2TPh2WK4=;MLg98qzTMQNPj4sQGrdt0xLuWG7 b6ue4fCxofDko8p1VpuHURcy7kD+1WAk5a9XmgWJpKPEiABrhvc70/VGAI/mvjJgRApJhu3Yj E3ts0ux0vTbI1u+u8iBga95qswjK3DkgkfQ5LJbaOhG+29sRugotz4f5u8Ytl0RTi7q7AMDYb QteSyyn49ABKSw0+aom+vN2lPyXRKTf+sUvgt7iu3scmmz/kmxDVU8AwGX5tT2AHhnJK9Wl/p k8Amf70X+LGclQpuTt1jyOJcIGLMohvvs56Y6UtEc+4mM/tfVDemX8LMWoa5ilOU3D8ou+AXW JkZ5ElkFGBNLKvALmElRFFZ5UDXbyj74z0K4Li/S7ttwSuQcou2/q+BSb7Q2HjrmbBIEntOXJ 2ie1tQTQXXUdy9PKLD0DXlsCS4iZFXvnx2O5Gq+sR7bTpcIjPq43T3D1rT3PBykka8ol9+rga yvvuWY1lhWaLhmgitf1zW1CiAJpYKWSa1IKGs3RT4ZtJ8NYcN1W58nPGMTvpVGR5sGYxfSjhV taQxQ9Dr/BMQO7Ekw579+WevLN30E6hMP+s/aVxrHQdZ/iEqx2lOXlKmZzttf4+H10vgKVQDe 9XMnkJObuIxNTKxd6qXpJbhC12xqBmYuP27YQ2W0NFryMhCZtYR/srbBYTETWpWEjpvW/t7BT IIqj2jdOYI8OE011FPTFyk70Z4ysTRtvftJAhLv4jChCDHOACAbysGt30oRI+a0zR3ZmuC565 bIk7LswDXQQJXA2lU643xcdWhk099qhZJ0WNTnTVIDhVXkt5kvjwrTPs2u7I7I2JePNMtKsgr 2CzZSC19tIaaVZefVthv8hx5y1fK3Yk6xPZ6vuIVNs3/c0UZP7gNz67TF43jCaVwsA+6w1B4i y53Zivb9KtA1GUumsTEUaSBd86aW4wICKvayc8s3yvmBX7iQlAli0tg5qb2GMVAwesPjfjS+p yirU3g0+msfVc4mpBCC70TBTQUuIjoHocn+uVeuvYSCCtkg4QJFaODAsd4JzczRsmn+hvZTe7 e636sr1jGIPirk6A1WV0qWtXPpJo4ISP5om5EbUX03+LXrw4EWSmL40LaiD/t+dNj1+FBCyTs rAgdBJ3YGAOdf0iMEQRowudUbGyzRQtD9xnAlf0e8GPlTEo0iwF+bABcNPhUFGS17qg4Pe29J dW9mR3bXzGu4zmV93ehREsYP192bhx4p+E6WgGo9ya2/K8WLBi/nkQQtBHhr6rGxLJoBlVP2Z vNoGzoyebmgSjL5MpuQNsnLQr6lXAtg0RA95bW0a0TBGjsZ1rUJKM6c9TXLlcrvvwjZVLW6j6 hkNcBi7geSdFV/rTnVQURKqAhTaKrpBgF1wBrPuTzUiH4cPbZ2cbRh3N+Hbj0pnxlhm5R3JWv wfe397MUattAkCCveFL4BULc38AYk91aQilPd0tl2H/afCJmheYvW9Ezz6bDCk1GuqL5Cx4lv jotbaZ17QtolwimWchMqMNJW+aErS5OsxuBZk4Wz7T3+v0n4M3UJcJ9xYjgP1DZdhXBawL+iD BY+fr7y2FtCa3Nk32Ay+FdjmbiyiuI7FtljdxUqS6MWmT+kYUn6tdx18Se63Skco0gxaiZfV4 VSxmJ1qH9R4Su691Tdh7FXfFPWi+hDZ3duqMJa4OzegPKXUF/kt7d10Vhmz4vk/ueJ1pmkg7X qx0ljfZabRpIF9YWLaSd9SpDBYyM44rntzEyJv3ZVDDcBaCwQmD3h1Dkbf2CjURdcPySp+k+m Z4auxismay90e+quPgCGc0leMZM+BWDdzcihSCZvWe8Sf+rVc0jIIgNaF1NN1gcLwxzxZ5/kr rB/htUF0oBX2V4DCHvwaPOnEio5uCVlFEhGFHeleEJ+nezHj75XHgsm8yQxM6f7JqzsOu7J6y hhLadG2exloQs8tCPOLiBNA4/iuCPBFOdvO0DToiL9DI9FAjWGVjMtuh+35KtY4YFM9cOGC60 DHbEo0pk2FGVuxTAZVN/9IydnTxKukLv2QzS6XIy0+z3wCI1l4DDv+qf7QGM/9VxJKqG0vu83 Zeue2dvgOZnJ88BwqZS5EAe6WmKywL4HyHMnJVW/7wgfoWrk7PF9LZmKB1DC8OkHRRefBR9t6 umCEv6eDktHxR5CQiVUJNG3exQC/l1VpZAsDEQzg4HDBEIckRqjoZnT2hniFEgcEsQWhK/gqi L/zCTIRBpbr79RVmdsfYBscFfn6IYvkXT/emCU1ujwRE9sXxilQWptIcQyMM0C14/9OH/2A7h xrXXd5fOt7uLHWcqNWZbN6/knuEvcOU4gegYVPf88OL35vO1FmwRsQxt5UrUStxEoZuQmT7xl NuLIJmyNjuQJnILX3AEbumtT1de2cffM62TDbk9FPQi0nSqvJ1UT/EipmNo7JcxWepdXDu+Z2 J4tfivSfCWMZerxQ9cbwbwwsUNKflMXQAPurHzESxK6Gklq0IBxTqhpsBgCqnxSWbf/uofMMC ELrg9yoFemAgq2AxVBP4h57Zg+ijLyVBqpe7j3K2k1YCC2XLHhjq7TMT/u4I8UKfVHMvUA1on 4fEhY7nCQijeZAiHMOv5yTciMww4WiyD85BtpTiD21gtkNT2Kz2yNwNxkLAPCS7RPIoVA4YEB vWw4RmQ/K/bp9RjZ8x4U9fVM+zphhtXGbRAGhmTPTpZiiWgczKLLEra8Oi4bAc1eD9H+/muvM Pg9yxQ43clg8gTDc0e3QrRoeMG5VldQg/0UeYiy6OwNRy6Ndih6OKYI+QzxTBKVu2OgJWJXin dfe54s+L/HD3xBZNIvbeu8AghNUoeVx9Q1qVx9VNewj9IJ2YjMiAskcT6g1fEYh3R/wT+78xi Rvoi/HzdXuJs80VMam6EepiZuL63q5dlbTuwaUtSWgJlGPQWb5S7c8zHo27UjK2r5AfCxnIOg BNU3r2brlfQzFuaz36bbcUE5TCowu/vA2sbwayUb5qL75+y9Uyk2hgWuPbMXbpe16aJ8bh9MI 058rI87EozpfTknKlhq/1I0io3+FnZGFbwNEC8uK5vQcuEbExzZVFQLlUEPihWfIpsGwb/rPk 6oLKNCDg73EjeW5IcBfYtom2dLJYI/bqnf23ZqccNOhwpolsoR6G2HB7741+FV0Ch/+XiL0cM aTeRMOKOHO2aQgIn7mDoaC/6ALgi1gNLD8lfEavb5rAO+RfxnGE0uH2g== 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. [arguments]: Disable tests. [arguments]: Delete phase 'do-not-self-update. [arguments]: Delete phase 'configure-git. [arguments]: Delete phase 'check. [native-inputs]: Remove python-pytest. [inputs]: Add bash-minimal. [home-page]: Add link. Change-Id: I866c995b96e972b3980df42819f1af538a70f79b --- gnu/packages/android.scm | 116 +++++++++++++-------------------------- 1 file changed, 37 insertions(+), 79 deletions(-) base-commit: e923c73403b6e0dc888c12c2eaaef450bcdbb632 diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 83df9bdfc92..13a036a54ac 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) @@ -925,7 +927,7 @@ (define-public etc1tool (define-public git-repo (package (name "git-repo") - (version "2.4.1") + (version "2.54") (source (origin (method git-fetch) @@ -934,87 +936,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) + (substitute* '("repo" "git_command.py") + (("^GIT = 'git'") + (string-append "GIT = '" + (search-input-file inputs "/bin/git")))) + (substitute* "git_config.py" + ((" command_base = \\['ssh',") + (string-append " command_base = ['" + (search-input-file inputs "/bin/ssh") ","))))) + (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"))))))))) + (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