From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 17 15:51:30 2025 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 From: Jakob Kirsch To: guix-patches@gnu.org Subject: [PATCH] gnu: git-repo: Update to 2.54. Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:2WyzLvrycuToV84Y6lrmi0ouOiC19mHluRpdgsgZMGnkNwhptDx YA4Z/aYPQWkKs60iZrq3RDzAFh05A5sSncOLzxTS/SQESxaaL0fCGQjJrIUXZVVn3DlcxoC nxUiWmlRYcgtJxkcyATDaffL1B+rikexJ3CH1Az41ZQeF6xQFPCRCRdq7YabDZbQbvqXPJL eflTjGtI5e5r9UH5nas9Q== X-Spam-Flag: NO 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-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/android.scm (git-repo): Update to 2.54. Change-Id: I241ba0acb19c72272780500b593ea4d3b5b9ddf6 =2D-- gnu/packages/android.scm | 116 +++++++++++++-------------------------- 1 file changed, 37 insertions(+), 79 deletions(-) diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index cb699b06dc..27a0f2c7e6 100644 =2D-- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -13,6 +13,7 @@ ;;; Copyright =A9 2021 Guillaume Le Vaillant ;;; Copyright =A9 2021 Petr Hodina ;;; Copyright =A9 2023 Camilo Q.S. (Distopico) +;;; Copyright =A9 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 =3D 'git'") - (string-append "GIT =3D '" git "/bin/git'"))) - (substitute* "git_config.py" - ((" command_base =3D \\['ssh',") - (string-append " command_base =3D ['" 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 i= s - ;; 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 t= he - ;; self update mechanism: - ;; https://bugs.chromium.org/p/gerrit/issues/detail?id=3D124= 07. - (let* ((out (assoc-ref outputs "out")) - (repo-main (string-append out "/share/git-repo/main.p= y"))) - (substitute* "repo" - (("^REPO_MAIN =3D .*") - (format #f "REPO_MAIN =3D ~s~%" repo-main)) - ((" _Init\\(args, gitc_init=3D\\(cmd =3D=3D.*" all) - (string-append "True #" all))) - ;; Prevent repo from trying to git describe its version fr= om - ;; the (disabled) self updated copy. - (substitute* "git_command.py" - (("ver =3D getattr\\(RepoSourceVersion.*") - (format #f "ver =3D ~s~%" ,version))) - (substitute* "subcmds/version.py" - (("rp_ver =3D .*") - (format #f "rp_ver =3D ~s~%" ,version))) - ;; Prevent repo from adding its (disabled) self update cop= y 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 gui= x - `(("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 =3D 'git'") + (string-append "GIT =3D '" + #$git "/bin/git'"))) + (substitute* "git_config.py" + ((" command_base =3D \\['ssh',") + (string-append " command_base =3D ['" + #$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" =3D + ("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 autom= ates parts of the development workflow. Repo is not meant to replace Git, onl= y to make it easier to work with Git. The repo command is an executable Pytho= n base-commit: cc4b392a8303788762ed9adb9c5635cf227e58a2 =2D-=20 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 17 16:38:28 2025 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 From: Jakob Kirsch To: 77873@debbugs.gnu.org Subject: [PATCH v2] gnu: git-repo: Update to 2.54. Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:QHwEcBrqC18F8Ra4OGHe4njRtRWv8B4WRqYhW4m9EoRODBztcQZ yhwNwtSryFQol2D6AzFt1DhRlUgD2p28eJsTm12NAjSEEsOcx/zLek6Q3ekGTl2z1RzCE7m TZC5Svmrqq1vlJz8HOdCqJaaNFudjDaCGOm1m4+CalUf1rQ/bxtjYG7uzLCe/dMaj5WZ2tv 6dSdjTLwLsNZYtGljjwdQ== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:2f8pzkx0Scc=;yjSbbbkwS5fCMNxBx2B7rghaeeB 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 Q== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 77873 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/android.scm (git-repo): Update to 2.54. Change-Id: I241ba0acb19c72272780500b593ea4d3b5b9ddf6 =2D-- gnu/packages/android.scm | 118 +++++++++++++-------------------------- 1 file changed, 39 insertions(+), 79 deletions(-) diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index cb699b06dc..30dc1a53b5 100644 =2D-- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -13,6 +13,7 @@ ;;; Copyright =A9 2021 Guillaume Le Vaillant ;;; Copyright =A9 2021 Petr Hodina ;;; Copyright =A9 2023 Camilo Q.S. (Distopico) +;;; Copyright =A9 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 =3D 'git'") - (string-append "GIT =3D '" git "/bin/git'"))) - (substitute* "git_config.py" - ((" command_base =3D \\['ssh',") - (string-append " command_base =3D ['" 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 i= s - ;; 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 t= he - ;; self update mechanism: - ;; https://bugs.chromium.org/p/gerrit/issues/detail?id=3D124= 07. - (let* ((out (assoc-ref outputs "out")) - (repo-main (string-append out "/share/git-repo/main.p= y"))) - (substitute* "repo" - (("^REPO_MAIN =3D .*") - (format #f "REPO_MAIN =3D ~s~%" repo-main)) - ((" _Init\\(args, gitc_init=3D\\(cmd =3D=3D.*" all) - (string-append "True #" all))) - ;; Prevent repo from trying to git describe its version fr= om - ;; the (disabled) self updated copy. - (substitute* "git_command.py" - (("ver =3D getattr\\(RepoSourceVersion.*") - (format #f "ver =3D ~s~%" ,version))) - (substitute* "subcmds/version.py" - (("rp_ver =3D .*") - (format #f "rp_ver =3D ~s~%" ,version))) - ;; Prevent repo from adding its (disabled) self update cop= y 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 gui= x - `(("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 =3D 'git'") + (string-append "GIT =3D '" + #$git "/bin/git'"))) + (substitute* "git_config.py" + ((" command_base =3D \\['ssh',") + (string-append " command_base =3D ['" + #$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" =3D + ("1")) + '("REPO_TRACE" =3D + ("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 autom= ates parts of the development workflow. Repo is not meant to replace Git, onl= y to make it easier to work with Git. The repo command is an executable Pytho= n base-commit: cc4b392a8303788762ed9adb9c5635cf227e58a2 =2D-=20 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Tue May 06 06:31:13 2025 Received: (at 77873) by debbugs.gnu.org; 6 May 2025 10:31:14 +0000 Received: from localhost ([127.0.0.1]:52868 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uCFZw-0001kY-Qh for submit@debbugs.gnu.org; Tue, 06 May 2025 06:31:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50004) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uCFZj-0001hv-Hh for 77873@debbugs.gnu.org; Tue, 06 May 2025 06:31:01 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCFZa-0003UD-MY; Tue, 06 May 2025 06:30:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=mTdeqDvdWSbPkILtF8Wij4xaQ1r+0PHhTiXmbpqmLEg=; b=MMZv39t81z9zJgHeMJh5 eZfi8EQ1LIyt+5T5Pt68WsyqMzDiBeop9tUaoOx36aMFKZts6mG9nY4BZfclHJTstYe1r91nz+dUD SWIr7ialORBwgZly6zCV2g3HutvZTzWVnd0hvQKg2eTDhpIJgu7haYGAGRv9dBxLlUtINOJxe460M 0GOctwhb+irpJ7VEj6qZYeBGf/v+FqsMAuZNT7jL11G7LA4aDc8QkhvdKjZqDdYX8QSWbJUNQYGNx dDjgCgVuwMwFQYNoiO6pWoyfswKAL3JHI3+k3/myk+GIq/EC6JtBPGQ0U1JkG3Kth39rGabUDqy+/ DQ4ejg+CFcx3Dg==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Jakob Kirsch Subject: Re: bug#77873: [PATCH] gnu: git-repo: Update to 2.54. In-Reply-To: (Jakob Kirsch's message of "Thu, 17 Apr 2025 22:38:05 +0200") References: Date: Tue, 06 May 2025 12:05:40 +0200 Message-ID: <87jz6uvytn.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 77873 Cc: 77873@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Jakob Kirsch writes: > * gnu/packages/android.scm (git-repo): Update to 2.54. > > Change-Id: I241ba0acb19c72272780500b593ea4d3b5b9ddf6 Please mention all the changes made in the commit log: phases added/remove, use of gexps, etc. > - (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 _Ini= t() 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=3D12= 407. Did this become unnecessary? > + #~(modify-phases %standard-phases > + (add-before 'build 'set-executable-paths > + (lambda* (#:key inputs outputs #:allow-other-keys) > + (begin You can remove =E2=80=98begin=E2=80=99. > + (substitute* '("repo" "git_command.py") > + (("^GIT =3D 'git'") > + (string-append "GIT =3D '" > + #$git "/bin/git'"))) Instead, write: (search-input-file inputs "/bin/git"). > + (substitute* "git_config.py" > + ((" command_base =3D \\['ssh',") > + (string-append " command_base =3D ['" > + #$openssh "/bin/ssh',"))) #t))) Likewise. Please also remove the trailing #t. > + (wrap-program (string-append bin-dir "/repo") > + '("REPO_SKIP_SELF_UPDATE" =3D > + ("1")) > + '("REPO_TRACE" =3D > + ("0"))) > + #t)))))) Please remove the trailing #t as well. Could you send an updated patch? Thanks, Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Mon May 12 06:16:31 2025 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 From: Jakob Kirsch To: 77873@debbugs.gnu.org Subject: [PATCH v3] gnu: git-repo: Update to 2.54. Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:pSRKOTjYm0y30cpBIJOtspZQbN9nAYnO0nUlMFjQt6s1wpf9Ien fgbgWUq9rwsc5/KKEZ0OJj7bSGRpsAjnRc2/nXe+bIL9fFYHB+NfAk8USoQZdy9nSMD62u+ AotbspzhikRp0mtSH8n5tMYCOFq7FeOtnCICKOWaw3mXtX++ugXsS3lui79tzyfBJ+mSm+f k3QwbO9DMwSdd5D+gxGew== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:U6b2TPh2WK4=;MLg98qzTMQNPj4sQGrdt0xLuWG7 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 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77873 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 =2D-- gnu/packages/android.scm | 116 +++++++++++++-------------------------- 1 file changed, 37 insertions(+), 79 deletions(-) diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm index 83df9bdfc92..13a036a54ac 100644 =2D-- a/gnu/packages/android.scm +++ b/gnu/packages/android.scm @@ -13,6 +13,7 @@ ;;; Copyright =A9 2021 Guillaume Le Vaillant ;;; Copyright =A9 2021 Petr Hodina ;;; Copyright =A9 2023 Camilo Q.S. (Distopico) +;;; Copyright =A9 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 =3D 'git'") - (string-append "GIT =3D '" git "/bin/git'"))) - (substitute* "git_config.py" - ((" command_base =3D \\['ssh',") - (string-append " command_base =3D ['" 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 i= s - ;; 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 t= he - ;; self update mechanism: - ;; https://bugs.chromium.org/p/gerrit/issues/detail?id=3D124= 07. - (let* ((out (assoc-ref outputs "out")) - (repo-main (string-append out "/share/git-repo/main.p= y"))) - (substitute* "repo" - (("^REPO_MAIN =3D .*") - (format #f "REPO_MAIN =3D ~s~%" repo-main)) - ((" _Init\\(args, gitc_init=3D\\(cmd =3D=3D.*" all) - (string-append "True #" all))) - ;; Prevent repo from trying to git describe its version fr= om - ;; the (disabled) self updated copy. - (substitute* "git_command.py" - (("ver =3D getattr\\(RepoSourceVersion.*") - (format #f "ver =3D ~s~%" ,version))) - (substitute* "subcmds/version.py" - (("rp_ver =3D .*") - (format #f "rp_ver =3D ~s~%" ,version))) - ;; Prevent repo from adding its (disabled) self update cop= y 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 gui= x - `(("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 =3D 'git'") + (string-append "GIT =3D '" + (search-input-file inputs "/bin/git")))) + (substitute* "git_config.py" + ((" command_base =3D \\['ssh',") + (string-append " command_base =3D ['" + (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" =3D + ("1")) + '("REPO_TRACE" =3D + ("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 autom= ates parts of the development workflow. Repo is not meant to replace Git, onl= y to make it easier to work with Git. The repo command is an executable Pytho= n base-commit: e923c73403b6e0dc888c12c2eaaef450bcdbb632 =2D-=20 2.49.0 From debbugs-submit-bounces@debbugs.gnu.org Mon May 12 06:17:34 2025 Received: (at 77873) by debbugs.gnu.org; 12 May 2025 10:17:34 +0000 Received: from localhost ([127.0.0.1]:50506 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uEQE2-00005O-1j for submit@debbugs.gnu.org; Mon, 12 May 2025 06:17:34 -0400 Received: from mout.web.de ([212.227.15.14]:41369) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uEQDz-000050-HT for 77873@debbugs.gnu.org; Mon, 12 May 2025 06:17:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de; s=s29768273; t=1747045045; x=1747649845; i=jakob.kirsch@web.de; bh=1aYeP8UIEr+tyh1C4tcel3RPOhMoyqlcILXSxAQL3ps=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:Message-ID:References: MIME-Version:Content-Type:In-Reply-To:Content-Transfer-Encoding: cc:content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=P8gxYWjFB7GZCxtEFDRO4Uy+Vd+QNOKza6UNTzpJ0CNYRzSi0JKGwf2z5r24Fo5e fQzc6Ba8SIysxV84jtB6A0z2Od8yL6QW4pkkFXJThL38jTUJnsRk9Kif7W9aBHDzy +VsvUaYonqlpqqqZ11fhmb04IX1++qbwX1ZCXIYf2MQXIfs75Kg6yCxQz35vmx/AI IG66hQrV/0M815bLwBU1S8E+wRYqbjm1plQKHBEhyLoPBxizTgvVZvQipOXUfnt+R DJGVMu70rU4N9BXPeRA571ONC15VUCUYowjw1N045awYr7uYWzbk7BiiQrxzevUB0 Q89E+ec49/4W+viKlg== 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 1Mrfou-1ukEmv0eCi-00kMjO; Mon, 12 May 2025 12:17:25 +0200 Date: Mon, 12 May 2025 12:17:23 +0200 From: Jakob Kirsch To: Ludovic =?iso-8859-1?Q?Court=E8s?= Subject: Re: bug#77873: [PATCH] gnu: git-repo: Update to 2.54. Message-ID: References: <87jz6uvytn.fsf_-_@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87jz6uvytn.fsf_-_@gnu.org> X-Provags-ID: V03:K1:G94AuEhFswwNCFi8jeRS2DBJlBm9cWHDPpr0G0NZqUD15BfI2S3 K5DzzCg8s2+QB/6W9ojNL1MMt/bU6SEs/CZ88kYfY2COdpYmElt2+N7zeP2REeGTmw5tcAU 7ZnPAbCGzTYOL5uqziUaI0IqYVndxvD7YHqYrSCAIHpbqnyi431hqUu5YW0QlW6GrYbhhwt +uwMo3kh6slKcUWrTWfZg== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:Upo9km/yxSQ=;lCMhq74GDach3axujJabeTIj0RB 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 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -1.7 (-) X-Debbugs-Envelope-To: 77873 Cc: 77873@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.7 (--) > Did this become unnecessary? >=20 > > + #~(modify-phases %standard-phases > > + (add-before 'build 'set-executable-paths > > + (lambda* (#:key inputs outputs #:allow-other-keys) > > + (begin Yes as there is now an environment variable named REPO_SKIP_SELF_UPDATE th= at is set in the 'install phase. From debbugs-submit-bounces@debbugs.gnu.org Mon May 26 20:04:30 2025 Received: (at 77873) by debbugs.gnu.org; 27 May 2025 00:04:30 +0000 Received: from localhost ([127.0.0.1]:33885 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uJhny-0008QD-48 for submit@debbugs.gnu.org; Mon, 26 May 2025 20:04:30 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]:56771) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uJhnw-0008Pn-5B for 77873@debbugs.gnu.org; Mon, 26 May 2025 20:04:28 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-234496a33a1so10650565ad.1 for <77873@debbugs.gnu.org>; Mon, 26 May 2025 17:04:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748304261; x=1748909061; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=wtkh8f60I6sZFY6CMu7tVoye0uXPWDKqeb12ZUF2erI=; b=ZeUdnQm4nhYXQo9AKvYvb1sM3vtNqd+xv2Gkeazh2mKLBkT1/I7qnbbFA23kfsKfUk Q5I3kUfMbQU1HWUMrXGk73wMNSz9xdwb2anWH4l3l5l2f12H+CQxdrEBNXPJMfTEbUoR mEyScPE1AUAICxwwBZTYSH6DJj5ENgfmjAGKlkoxIHdqcVqnAPFmID03R/TEQUQp7JPD 0LEcC/O6cHojAE/1lXAU6GKc3Lxp2pMLi7zNp6nERmKXxOxmYI8eo2JtIvZO3BgwQylk m4eWglcjkx1bdU6aUD08J3XfzY1adgz746sNaEzqdQqtzbY+PDelVKoyLeQT7uTfA/Gp GInA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748304261; x=1748909061; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=wtkh8f60I6sZFY6CMu7tVoye0uXPWDKqeb12ZUF2erI=; b=WoegyDnWqR3QLKcPfMhfMFVjOjUe+edfzsV1mp7rEiIYix6YMoBBXplZqhehATTOsV 8WWcgtsJ+KCm7lN5ojjxzBuuUxyio36uLEovRyMD71vXYxn+xNIt5Tjgj5lJL6yq9S8r fr++3B6K91cYM9IGMqfyHxIPCkSchik0S7KRnqFzqwS2xiEULgdao9Yulmb6OcuqTDom Og1bJ/YUJG8bZyTZav+mzgqas9qZEt4pBsM1/acmgROLmc0q4B5b7b0+C78MIJ0fNmb+ 7KqmVE0kSbVA4Ab9T8agiLEbVv6BYra/JDRp10t69KhSCDdkoEwAWnOWOG8+E4pufksE 4T4Q== X-Forwarded-Encrypted: i=1; AJvYcCUSAHjOok78b1nHLmHRwf/IzT+ao+f2gSv1SYVjC8FJxSCXy+CIA5GTs4bYZAda1OJZrpzF4Q==@debbugs.gnu.org X-Gm-Message-State: AOJu0Yyh8ZFrUbBon/qCzG9SOpLCzpKyOEndKvxb1BDo+cGAqnYC+cOp iVuX5gj/PgbLJaGYU7PrbI6AUXiI3lYVJnnJS+QqndYOFMLgl00AcLNHtIzqDoHAsiw= X-Gm-Gg: ASbGncvJOp+BZJtRi8USVqKCtXNgfefKLcvMAWDUnEz7L4uM0JvHJIo9QLaqgoIsQq2 Be1aMOMKpbuZvJG8HoartcFBkFTW8JFH3BKPoLnr4S6nqoO115sFLgEGClaaLWYRvDd5M7MoiZB n4E7xmZQnwAEXq8qGm5pcyAD0CasREp6tGd5bwcgQG3Sok00FIGi0N7iuQ78TzaTPETASCRItlN fNllMUvB4ZIBTwHk56v0jWzMbdRjzdXHhr9tO186T+cRdh1HHup4Tv1SulZHVi8fpktBQ626uBy 4x2o2e+yR5CV6RSA7efcRUsUMoEt8waUpS5a/ruWs+FioG4Abw== X-Google-Smtp-Source: AGHT+IEk9IsVi+Uae5fX1m0OS9XooBeEHEnWIJxvrNOcbfCOfGL8Uv/5fxaWX/kj1YeS7u7U6XxEOQ== X-Received: by 2002:a17:903:8cc:b0:234:e88:f27 with SMTP id d9443c01a7336-23414f49e17mr166166525ad.12.1748304261462; Mon, 26 May 2025 17:04:21 -0700 (PDT) Received: from terra ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2345948c2d4sm25857125ad.2.2025.05.26.17.04.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 May 2025 17:04:20 -0700 (PDT) From: Maxim Cournoyer To: Jakob Kirsch Subject: Re: [bug#77873] [PATCH] gnu: git-repo: Update to 2.54. In-Reply-To: (Jakob Kirsch's message of "Mon, 12 May 2025 12:17:23 +0200") References: <87jz6uvytn.fsf_-_@gnu.org> Date: Tue, 27 May 2025 09:04:17 +0900 Message-ID: <87tt56gbr2.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77873 Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , 77873@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Jakob Kirsch writes: >> Did this become unnecessary? >> >> > + #~(modify-phases %standard-phases >> > + (add-before 'build 'set-executable-paths >> > + (lambda* (#:key inputs outputs #:allow-other-keys) >> > + (begin > > Yes as there is now an environment variable named REPO_SKIP_SELF_UPDATE that is set in the 'install phase. I don't think that's sufficient. Repo will then update at runtime. We should wrap the repo binary with REPO_SKIP_SELF_UPDATE=1. Guix packages should not mutate themselves like git-repo does out of the box. -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Mon May 26 20:13:19 2025 Received: (at 77873-done) by debbugs.gnu.org; 27 May 2025 00:13:19 +0000 Received: from localhost ([127.0.0.1]:33970 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uJhwU-0000gw-F2 for submit@debbugs.gnu.org; Mon, 26 May 2025 20:13:19 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]:54335) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uJhwS-0000gP-Bx for 77873-done@debbugs.gnu.org; Mon, 26 May 2025 20:13:16 -0400 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-742c3d06de3so2727655b3a.0 for <77873-done@debbugs.gnu.org>; Mon, 26 May 2025 17:13:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748304790; x=1748909590; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=3NZiQRyAf+hzbsmDSyc0KSEoFgzacsq6TFeBCgRNw+Y=; b=Fo+KGXHRiT71q/QG3yCPoQGovy8bFjMeYwMEkQEdiMj24K6e1MZVkRCGfwZGJxRCiF u6mkqzW9CVDEZZyguwVaZj6i68kIDJ0khkwRFswy9I518YvLnD7+Bp8G2HEqFGejaJN5 jT0GOBQfsFgQjY8BsJdXtJ/Q4aYtpF685eR+WwaTGnAqgbprps5aRjn5AMPrVPs7eBQ8 uFtL/ppX63dfOHkRbmQPG08Bwh98UtrVzBA/jr237BQeaNk2cuJJzb5KZ0GfFhLhvc2i aAODZ8mHY9iCzmpwCYKVvHaiIqP+85E6P8hhMhAJbfY9QlonmO3GaKmbSZN7kbv4uMAY Crqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748304790; x=1748909590; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=3NZiQRyAf+hzbsmDSyc0KSEoFgzacsq6TFeBCgRNw+Y=; b=wAzd9vQP1tztyetA6+zKOwGikymU0OupGg37O2G1uMjDAl5Z1W8sW28UeBw0CWbNII hOvcgw6l7+leF1ndILUG15rEju5JGAFh3f8j9I4zh855DBIg/lvDWhoInSXirZXQlOLY mX63SUqXTIYGEt3UdtENHZ0KT/20UvPcNpWbl9ELXmwoqZ9nh9wXBDimGClT/TEwwp1f a/XwLhIFTGSohVdLvFLkvM1QgF2V8JohhhbOcFPRoPwu5Omiz48s9tMBmlqzbPiNGQBL TNfy2BA/hKrWXRjJOKUCbbEHBZz0Aqnjq0wpKpM5DxRhLDJgsM8YyyPJxtWZv3djX1ds Om9A== X-Gm-Message-State: AOJu0YxaarhvOx/UiCDlNP0F0qWmco5G2k1UDx5tb46+lL6Rxe7V3QSq uHYi0yn/RckySgZ9iKP7yUgBB4MAYLfcB/2ssAdXXLEPEASO2Kr2GxCRZQ/WZup2dl0= X-Gm-Gg: ASbGncucSfKI0YoK7YP39/ZMj1Ow907PsghjkjYKBey9JAF6vNoz5QflJpmv3g95opE JQEYzEvHsP+/WWiXt3eaIiyS14T2MoZTZsOevYsfyuCrXjJoAyo2+7drYC0AYUd8mMHaRhxZAO9 5LUJ3EY7ak6zakkb1t6k5tjQgZBBM85DKrQU6SmpOsQYWDvgfMCdbkbK9ZvMvMIgZuQ8cpiE/+3 QEHnSjdrIRpnb1RQnUWw8eyG5ATpbyx/IYnp/+BLveLjfTVoHcf124D8VCsAVYTIH9dEgMFmsXM keC5wEsO0ehWt8MPeJ6iyJwxKDh2IRS1LBvDE2UZyA5elFYNLQ== X-Google-Smtp-Source: AGHT+IGqvwQ0qsub1Q6OjC3SPjf+47xZUGmpgTp8DUplb67WNw8zYQAL+NY2dGoBLJ+Yd/Dm6/9Lxw== X-Received: by 2002:a05:6a20:2d0c:b0:1f5:6b36:f56c with SMTP id adf61e73a8af0-2188c3b49a8mr17176364637.39.1748304789693; Mon, 26 May 2025 17:13:09 -0700 (PDT) Received: from terra ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7461c3e5892sm1610257b3a.40.2025.05.26.17.13.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 May 2025 17:13:09 -0700 (PDT) From: Maxim Cournoyer To: Jakob Kirsch Subject: Re: bug#77873: [PATCH] gnu: git-repo: Update to 2.54. In-Reply-To: (Jakob Kirsch's message of "Mon, 12 May 2025 12:16:10 +0200") References: Date: Tue, 27 May 2025 09:13:06 +0900 Message-ID: <87o6vegbcd.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77873-done Cc: 77873-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi! Nevermind my previous comment, it seems you already took care of doing that. Great :-). I've just made these light touch ups: --8<---------------cut here---------------start------------->8--- modified gnu/packages/android.scm @@ -944,7 +944,7 @@ (define-public git-repo #:phases #~(modify-phases %standard-phases (add-before 'build 'set-executable-paths - (lambda* (#:key inputs outputs #:allow-other-keys) + (lambda* (#:key inputs #:allow-other-keys) (substitute* '("repo" "git_command.py") (("^GIT = 'git'") (string-append "GIT = '" @@ -954,7 +954,7 @@ (define-public git-repo (string-append " command_base = ['" (search-input-file inputs "/bin/ssh") ","))))) (replace 'install - (lambda* (#:key outputs #:allow-other-keys) + (lambda _ (let* ((bin-dir (string-append #$output "/bin")) (repo-dir (string-append #$output "/share/git-repo"))) (mkdir-p bin-dir) --8<---------------cut here---------------end--------------->8--- And pushed; closing! -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Tue May 27 23:33:37 2025 Received: (at 77873) by debbugs.gnu.org; 28 May 2025 03:33:37 +0000 Received: from localhost ([127.0.0.1]:47962 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uK7Xs-0008KT-Gf for submit@debbugs.gnu.org; Tue, 27 May 2025 23:33:36 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]:53376) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uK7Xp-0008K7-OK for 77873@debbugs.gnu.org; Tue, 27 May 2025 23:33:34 -0400 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-72d3b48d2ffso3081919b3a.2 for <77873@debbugs.gnu.org>; Tue, 27 May 2025 20:33:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1748403207; x=1749008007; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=oYk0ibsUo+n8CeL+kEHNsmbi2AwZk+wBEXv0V64E7bo=; b=kSWDFN5K9pfEQFYsK31m0rya4fNlprzi2K8H3ev9v1mNLP2p63kaDyTipeAJEDTLrS +MlzFLVcjCItZomYYhDmaanULCdVdo1zJ51Cpr69IvROuomjAI4N2cdIugKaJukVY8Xs 6aTKA59ToHY9iDkF6LtsNGsiueADfqp2zNNQS8ZQH3Zd85FYuyHzeP9RVwuVdRPT9G/w G+kKNb8si7kbe+2hoanAdo3H2pMBvEZ2Z+TedRClroDe6/Zi1eGuslhw0tGlMQfCko7U Tf8oBdlFRBvVk7N0ZE7aUwNAeakZDZSydE0EGMBhPt7ycBwCc68jYgJ0WYg8DOrfttkj 6z2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748403207; x=1749008007; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=oYk0ibsUo+n8CeL+kEHNsmbi2AwZk+wBEXv0V64E7bo=; b=sVAeafxDB0JclWRcbmDUArxaHGrIxj9dTM0rWFLmTEkAxFBb/NUYYRW5sOEFyjH/kr eGEnN7DMM9GyWrxYNZKrQ/1v4dtM6vaLdyyBaHUg+nKFbxus6KuezX9oV2/ph7kyEe0/ SkKFueOgwFBgamVPheicY2kNQLKi+AOnvTKs6Wzt7xOs2f+RybwC/lpzi1t99CxNEUE6 3tAUru5jfFZlx3TOKgUy4jBAZtMtFGQIXXGBMLCDJeoSBsEOCgFp9BhzgIIpaQm8FHfH w8dasaLWE91Cu5iYxA5qxf0DXVj9JZTofTygLUdKfuHezDWHqAohpGqLxEiUx4A34XTy QuXg== X-Forwarded-Encrypted: i=1; AJvYcCVnOEuQky1BrJeKEvoAKkopWwpdrmTMGpQchg1ncsQhX+grtQTZ5NG8neuHnaSghRwkOBY3iw==@debbugs.gnu.org X-Gm-Message-State: AOJu0Yy9fzBO6Y2mX/vFdltHNtriTVpf0Q4ue3kK31BGtD7Xb2yUS1W8 cVESwgyQyMpDVJ0myTlkBz5p2aXpzkFPnqVwTEBLfm8D2oKATZi0ZJt4us+WPH2U X-Gm-Gg: ASbGncur1VOcfp6cd5yJ8bwwQMnps8WFSbBVECerNmTieoJDCmVQuQNViDMV8dwec3k Uanxnc1HiG4UfUNrd5dzGd1qiz04ZCm8dhduKe4SxCYOFHA1ZHbYgs5zUXywThruAgtg0VkfVYq qug/P8Mn9dMXaRZtPQR/MSk7HKccRP+pZbu2FyspassJ6VYLY/JIcaN0d28FBukjGu9pv/tKNg8 v+LpsguQCYnMwS6uv1sxeiKJyQb3EYo24OXc8u7EA1qZj706lUUojwf3Z8iJd0MdpaD89Y0fPZ6 yeejTNwQb0MiHjaCLdinFuNnZTbovbw91RPjPfST24bPs8GYtQ== X-Google-Smtp-Source: AGHT+IEC9VkwUBey9AdVyO/0QmZQg8dQkBLVj/Ygg0D+EdBx0qdPyMDISgGgkcdLEwRijnUx3gk3QA== X-Received: by 2002:a05:6a00:14c6:b0:736:5438:ccc with SMTP id d2e1a72fcca58-745fde87a75mr21882412b3a.9.1748403207146; Tue, 27 May 2025 20:33:27 -0700 (PDT) Received: from terra ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-746e345bb9dsm240298b3a.159.2025.05.27.20.33.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 May 2025 20:33:26 -0700 (PDT) From: Maxim Cournoyer To: Jakob Kirsch Subject: Re: [bug#77873] [PATCH] gnu: git-repo: Update to 2.54. In-Reply-To: <87tt56gbr2.fsf@gmail.com> (Maxim Cournoyer's message of "Tue, 27 May 2025 09:04:17 +0900") References: <87jz6uvytn.fsf_-_@gnu.org> <87tt56gbr2.fsf@gmail.com> Date: Wed, 28 May 2025 12:33:24 +0900 Message-ID: <87wma1e7ej.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 77873 Cc: Ludovic =?utf-8?Q?Court=C3=A8s?= , 77873@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, > I don't think that's sufficient. Repo will then update at runtime. We > should wrap the repo binary with REPO_SKIP_SELF_UPDATE=1. Guix packages > should not mutate themselves like git-repo does out of the box. OK, I had missed that this package didn't provide an initial working copy: --8<---------------cut here---------------start------------->8--- $ /gnu/store/0s3amrgdl6is2bjb3k7zbwi6fwklbldb-git-repo-2.54/bin/repo --help usage: repo COMMAND [ARGS] repo is not yet installed. Use "repo init" to install it here. The most commonly used repo commands are: init Install repo in the current working directory help Display detailed help on a command For access to the full online help, install repo ("repo init"). Bug reports: https://issues.gerritcodereview.com/issues/new?component=1370071 --8<---------------cut here---------------end--------------->8--- The goal should be that install 'git-repo' with Guix gives you a fully working command, not just an updater that wants to fetch an online copy and put it somewhere in your HOME. I'll revert this. If you manage to fix this, please submit a new PR to Codeberg. -- Thanks, Maxim