From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 8AwbAYUVDmWUZQAAG6o9tA:P1 (envelope-from ) for ; Sat, 23 Sep 2023 00:30:29 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 8AwbAYUVDmWUZQAAG6o9tA (envelope-from ) for ; Sat, 23 Sep 2023 00:30:29 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9122335E1D for ; Sat, 23 Sep 2023 00:30:28 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=WJgW7p5e; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1695421828; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=+TlMDh70EYvfg4cVz5uy++mbsJSSzAW/iTqtp0ssVZw=; b=lwDLNbnq9Y60Rk+bSMHQ/zDsBZLy6Vj1hCLvLJSNm5yB4hEkt2jFepOXlB8tKLMh0gn9Ez yZpUk7FyJpQv6i8D09ijkcDfDLmcAd1fzFIPCBEtaRXP+UU5jDeJuI0SaRV+8wT3ZeABT+ FVb9WH7KVVp6lqh9HkQFHxazxVr7kQ/dkPEM1YS6p1e1nl9+G6Q6tLDT7tTpn4fVFABggh UR/VxSzo2YrbSO2EHSyuoQv2yzOalcwvAMufWCF3xvKVX/ih9ZeRAoU7XoBjBt8Ti7NTNd wT24YzQvTE8pklZsiOuVA9k4jhi6h95p9yb+H+xMh9MQnXoQYCSv2cqavFuePA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1695421828; a=rsa-sha256; cv=none; b=nGMEDeJp1j6c0LGB0RGK0v/wya4W182ereOCFe0Z+Aimz7FVC6P+X3MG0if68lJGJgNx2c 0hh42PKcitXjQI8mAo9CMATGqdpKgcKyYSSYct/8B5opJHFeP19DHjEYnUQXLlLBNTDdQi Nsi4Lo31l4PtIrEJ3XCI4xoA3n0I/Xdy5Tqmkt20jJMYKiNENO+s0pNaYkUbmX/eEfjVE8 yybcizf9sl7s/5z6O7YsII6+lekLBTz3vNymMkc2jpJ+Sc/IBS51OgeDnFQaMO0k6Z3GzK J96QokHEz6HMPoRu2LbPqmm00HFO45lOFWsbHxfILk2W1FAm9uKag4r5MHFUsg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=WJgW7p5e; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjoes-0001zq-Pc; Fri, 22 Sep 2023 18:29:58 -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 1qjoeq-0001zJ-W1 for guix-patches@gnu.org; Fri, 22 Sep 2023 18:29:57 -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 1qjoeq-0005zl-Nm; Fri, 22 Sep 2023 18:29:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qjoey-0006oT-Jj; Fri, 22 Sep 2023 18:30:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65866] [PATCH v2 5/8] build: Add dependency on Git. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Fri, 22 Sep 2023 22:30:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65866 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65866@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 65866-submit@debbugs.gnu.org id=B65866.169542177426087 (code B ref 65866); Fri, 22 Sep 2023 22:30:04 +0000 Received: (at 65866) by debbugs.gnu.org; 22 Sep 2023 22:29:34 +0000 Received: from localhost ([127.0.0.1]:37435 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjoeQ-0006mX-En for submit@debbugs.gnu.org; Fri, 22 Sep 2023 18:29:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45546) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjodq-0006jM-Nr for 65866@debbugs.gnu.org; Fri, 22 Sep 2023 18:28:58 -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 1qjoda-0005mD-JP; Fri, 22 Sep 2023 18:28:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=+TlMDh70EYvfg4cVz5uy++mbsJSSzAW/iTqtp0ssVZw=; b=WJgW7p5eJx4CL3cxclQi yeiT9P59rCMyoY4v9ovfAShcqixERvZcfbET82wj35DOwho++rnYSQP53Wqx0A6NABQkftqktDSWs 2PgoIip03B9Wd0AB3LUBJBSw5nvBethQxa4XSoNjjtCi8Amtj971d52hpSXwuMJhSlYTQd9r1hkiy xkZqxr/lLGgZOHHEpJDq+SH9ESUM50hJaS60XZAeXHD2whjqbkJCVAGP7bBWrB98DJdu7cedqU6t3 dX1lokFb1h87FcRIlK2NSOn9shQS3bA6IOIGiCFssDQkEtmxy+eT9Tu++84VNbe5O1P8y5JMayZiN 0tVKwfHT2AuXpw==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Sat, 23 Sep 2023 00:28:01 +0200 Message-ID: <8ec588483525275aac1eb057543a903bea707ead.1695421391.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: <87o7hwas61.fsf@gnu.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx0.migadu.com X-Migadu-Spam-Score: -4.44 X-Spam-Score: -4.44 X-Migadu-Queue-Id: 9122335E1D X-TUID: YGLQ+KgWk8DT * 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. --- 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]) + LIBGCRYPT_LIBDIR="no" LIBGCRYPT_PREFIX="no" diff --git a/doc/guix.texi b/doc/guix.texi index 50c4984d71..8812e42e99 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -1011,6 +1011,7 @@ Requirements @item @uref{https://gitlab.com/guile-git/guile-git, Guile-Git}, version 0.5.0 or later; +@item @uref{https://git-scm.com, Git} (yes, both!); @item @uref{https://savannah.nongnu.org/projects/guile-json/, Guile-JSON} 4.3.0 or later; @item @url{https://www.gnu.org/software/make/, GNU Make}. diff --git a/guix/config.scm.in b/guix/config.scm.in index d582d91d74..62e15dd713 100644 --- a/guix/config.scm.in +++ b/guix/config.scm.in @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2018, 2019, 2021 Ludovic Courtès +;;; Copyright © 2012-2016, 2018-2019, 2021, 2023 Ludovic Courtès ;;; Copyright © 2017 Caleb Ristvedt ;;; ;;; This file is part of GNU Guix. @@ -35,6 +35,7 @@ (define-module (guix config) %config-directory %system + %git %gzip %bzip2 %xz)) @@ -109,6 +110,9 @@ (define %config-directory (define %system "@guix_system@") +(define %git + "@GIT@") + (define %gzip "@GZIP@") diff --git a/guix/self.scm b/guix/self.scm index d2300052d8..9eaddc7a29 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -69,6 +69,7 @@ (define %packages ("gzip" . ,(ref 'compression 'gzip)) ("bzip2" . ,(ref 'compression 'bzip2)) ("xz" . ,(ref 'compression 'xz)) + ("git-minimal" . ,(ref 'version-control 'git-minimal)) ("po4a" . ,(ref 'gettext 'po4a)) ("gettext-minimal" . ,(ref 'gettext 'gettext-minimal)) ("gcc-toolchain" . ,(ref 'commencement 'gcc-toolchain)) @@ -826,6 +827,9 @@ (define* (compiled-guix source #:key (define guile-lzma (specification->package "guile-lzma")) + (define git + (specification->package "git-minimal")) + (define dependencies (append-map transitive-package-dependencies (list guile-gcrypt guile-gnutls guile-git guile-avahi @@ -999,6 +1003,7 @@ (define* (compiled-guix source #:key => ,(make-config.scm #:gzip gzip #:bzip2 bzip2 #:xz xz + #:git git #:package-name %guix-package-name #:package-version @@ -1104,7 +1109,7 @@ (define %default-config-variables (%storedir . "/gnu/store") (%sysconfdir . "/etc"))) -(define* (make-config.scm #:key gzip xz bzip2 +(define* (make-config.scm #:key gzip xz bzip2 git (package-name "GNU Guix") (package-version "0") (channel-metadata #f) @@ -1134,6 +1139,7 @@ (define* (make-config.scm #:key gzip xz bzip2 %state-directory %store-database-directory %config-directory + %git %gzip %bzip2 %xz)) @@ -1176,6 +1182,8 @@ (define* (make-config.scm #:key gzip xz bzip2 ;; information is used by (guix describe). '#$channel-metadata) + (define %git + #+(and git (file-append git "/bin/git"))) (define %gzip #+(and gzip (file-append gzip "/bin/gzip"))) (define %bzip2 -- 2.41.0