[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#65866] [PATCH 0/8] Add built-in builder for Git checkouts
From: |
Maxim Cournoyer |
Subject: |
[bug#65866] [PATCH 0/8] Add built-in builder for Git checkouts |
Date: |
Wed, 20 Sep 2023 13:57:45 -0400 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) |
Hello,
Ludovic Courtès <ludo@gnu.org> writes:
> * configure.ac: Check for ‘git’ and substitute ‘GIT’.
> * guix/config.scm.in (%git): New variable.
> * guix/self.scm (compiled-guix): Define ‘git’ and pass it to
> ‘make-config.scm’.
> (make-config.scm): Add #:git; emit a ‘%git’ variable.
> * doc/guix.texi (Requirements): Add it.
I'm a bit confused; we *both* capture git from the build environment,
and reference git from the git-minimal Guix package -- why can't we
strictly rely on the captured Git from the environment?
Nitpick: this commit should be ordered before the daemon changes that
requires it.
> ---
> configure.ac | 7 +++++++
> doc/guix.texi | 1 +
> guix/config.scm.in | 6 +++++-
> guix/self.scm | 10 +++++++++-
> 4 files changed, 22 insertions(+), 2 deletions(-)
>
> diff --git a/configure.ac b/configure.ac
> index 92dede8014..d817f620cf 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -201,6 +201,13 @@ AC_SUBST([GZIP])
> AC_SUBST([BZIP2])
> AC_SUBST([XZ])
>
> +dnl Git is now required for the "builtin:git-download" derivation builder.
> +AC_PATH_PROG([GIT], [git])
> +if test "x$GIT" = "x"; then
> + AC_MSG_ERROR([Git is missing; please install it.])
> +fi
> +AC_SUBST([GIT])
Since git is now a hard requirement, the conditional checks to disable
tests relying on git in the test suite, as added in previous commits of
this series are no longer needed and should be removed.
--
Thanks,
Maxim