Package: guix-patches;
Reported by: Jakob Kirsch <jakob.kirsch <at> web.de>
Date: Thu, 17 Apr 2025 19:52:04 UTC
Severity: normal
Tags: patch
Done: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To reply to this bug, email your comments to 77873 AT debbugs.gnu.org.
There is no need to reopen the bug first.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#77873; Package guix-patches.
(Thu, 17 Apr 2025 19:52:05 GMT) Full text and rfc822 format available.Jakob Kirsch <jakob.kirsch <at> web.de>:guix-patches <at> gnu.org.
(Thu, 17 Apr 2025 19:52:05 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Jakob Kirsch <jakob.kirsch <at> web.de> To: guix-patches <at> gnu.org Subject: [PATCH] gnu: git-repo: Update to 2.54. Date: Thu, 17 Apr 2025 21:50:31 +0200
* 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(-)
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 <glv <at> posteo.net>
;;; Copyright © 2021 Petr Hodina <phodina <at> protonmail.com>
;;; Copyright © 2023 Camilo Q.S. (Distopico) <distopico <at> riseup.net>
+;;; Copyright © 2025 Jakob Kirsch <jakob.kirsch <at> web.de>
;;;
;;; 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 <at> 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
base-commit: cc4b392a8303788762ed9adb9c5635cf227e58a2
--
2.49.0
guix-patches <at> gnu.org:bug#77873; Package guix-patches.
(Thu, 17 Apr 2025 20:39:04 GMT) Full text and rfc822 format available.Message #8 received at 77873 <at> debbugs.gnu.org (full text, mbox):
From: Jakob Kirsch <jakob.kirsch <at> web.de> To: 77873 <at> debbugs.gnu.org Subject: [PATCH v2] gnu: git-repo: Update to 2.54. Date: Thu, 17 Apr 2025 22:38:05 +0200
* 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(-)
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 <glv <at> posteo.net>
;;; Copyright © 2021 Petr Hodina <phodina <at> protonmail.com>
;;; Copyright © 2023 Camilo Q.S. (Distopico) <distopico <at> riseup.net>
+;;; Copyright © 2025 Jakob Kirsch <jakob.kirsch <at> web.de>
;;;
;;; 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 <at> 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
base-commit: cc4b392a8303788762ed9adb9c5635cf227e58a2
--
2.49.0
guix-patches <at> gnu.org:bug#77873; Package guix-patches.
(Tue, 06 May 2025 10:32:03 GMT) Full text and rfc822 format available.Message #11 received at 77873 <at> debbugs.gnu.org (full text, mbox):
From: Ludovic Courtès <ludo <at> gnu.org> To: Jakob Kirsch <jakob.kirsch <at> web.de> Cc: 77873 <at> debbugs.gnu.org Subject: Re: bug#77873: [PATCH] gnu: git-repo: Update to 2.54. Date: Tue, 06 May 2025 12:05:40 +0200
Hi,
Jakob Kirsch <jakob.kirsch <at> web.de> 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 _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.
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 ‘begin’.
> + (substitute* '("repo" "git_command.py")
> + (("^GIT = 'git'")
> + (string-append "GIT = '"
> + #$git "/bin/git'")))
Instead, write: (search-input-file inputs "/bin/git").
> + (substitute* "git_config.py"
> + ((" command_base = \\['ssh',")
> + (string-append " command_base = ['"
> + #$openssh "/bin/ssh',"))) #t)))
Likewise.
Please also remove the trailing #t.
> + (wrap-program (string-append bin-dir "/repo")
> + '("REPO_SKIP_SELF_UPDATE" =
> + ("1"))
> + '("REPO_TRACE" =
> + ("0")))
> + #t))))))
Please remove the trailing #t as well.
Could you send an updated patch?
Thanks,
Ludo’.
guix-patches <at> gnu.org:bug#77873; Package guix-patches.
(Mon, 12 May 2025 10:17:01 GMT) Full text and rfc822 format available.Message #14 received at 77873 <at> debbugs.gnu.org (full text, mbox):
From: Jakob Kirsch <jakob.kirsch <at> web.de> To: 77873 <at> debbugs.gnu.org Subject: [PATCH v3] gnu: git-repo: Update to 2.54. Date: Mon, 12 May 2025 12:16:10 +0200
* 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(-)
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 <glv <at> posteo.net>
;;; Copyright © 2021 Petr Hodina <phodina <at> protonmail.com>
;;; Copyright © 2023 Camilo Q.S. (Distopico) <distopico <at> riseup.net>
+;;; Copyright © 2025 Jakob Kirsch <jakob.kirsch <at> web.de>
;;;
;;; 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 <at> 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
base-commit: e923c73403b6e0dc888c12c2eaaef450bcdbb632
--
2.49.0
guix-patches <at> gnu.org:bug#77873; Package guix-patches.
(Mon, 12 May 2025 10:18:01 GMT) Full text and rfc822 format available.Message #17 received at 77873 <at> debbugs.gnu.org (full text, mbox):
From: Jakob Kirsch <jakob.kirsch <at> web.de> To: Ludovic Courtès <ludo <at> gnu.org> Cc: 77873 <at> debbugs.gnu.org Subject: Re: bug#77873: [PATCH] gnu: git-repo: Update to 2.54. Date: Mon, 12 May 2025 12:17:23 +0200
> 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.
guix-patches <at> gnu.org:bug#77873; Package guix-patches.
(Tue, 27 May 2025 00:05:02 GMT) Full text and rfc822 format available.Message #20 received at 77873 <at> debbugs.gnu.org (full text, mbox):
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> To: Jakob Kirsch <jakob.kirsch <at> web.de> Cc: Ludovic Courtès <ludo <at> gnu.org>, 77873 <at> debbugs.gnu.org Subject: Re: [bug#77873] [PATCH] gnu: git-repo: Update to 2.54. Date: Tue, 27 May 2025 09:04:17 +0900
Hi, Jakob Kirsch <jakob.kirsch <at> web.de> 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
Maxim Cournoyer <maxim.cournoyer <at> gmail.com>:Jakob Kirsch <jakob.kirsch <at> web.de>:Message #25 received at 77873-done <at> debbugs.gnu.org (full text, mbox):
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> To: Jakob Kirsch <jakob.kirsch <at> web.de> Cc: 77873-done <at> debbugs.gnu.org Subject: Re: bug#77873: [PATCH] gnu: git-repo: Update to 2.54. Date: Tue, 27 May 2025 09:13:06 +0900
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
guix-patches <at> gnu.org:bug#77873; Package guix-patches.
(Wed, 28 May 2025 03:34:02 GMT) Full text and rfc822 format available.Message #28 received at 77873 <at> debbugs.gnu.org (full text, mbox):
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> To: Jakob Kirsch <jakob.kirsch <at> web.de> Cc: Ludovic Courtès <ludo <at> gnu.org>, 77873 <at> debbugs.gnu.org Subject: Re: [bug#77873] [PATCH] gnu: git-repo: Update to 2.54. Date: Wed, 28 May 2025 12:33:24 +0900
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
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.