Subject: Re: bug#77873: [PATCH] gnu: git-repo: Update to 2.54.

From: Ludovic Courtès <[email-masked]>
Date: Tue, 06 May 2025 12:05:40 +0200

Hi,

Jakob Kirsch <[email-masked]> 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’.