From patchwork Wed Sep 6 07:13:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 53527 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0396027BBEA; Wed, 6 Sep 2023 08:14:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 66E5A27BBE2 for ; Wed, 6 Sep 2023 08:14:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qdmji-0005Rd-6T; Wed, 06 Sep 2023 03:14:02 -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 1qdmjh-0005RH-BI for guix-patches@gnu.org; Wed, 06 Sep 2023 03:14:01 -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 1qdmjh-0007uP-3B for guix-patches@gnu.org; Wed, 06 Sep 2023 03:14:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qdmjh-0002sL-VX for guix-patches@gnu.org; Wed, 06 Sep 2023 03:14:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65439] [PATCH v2] WAS [bug#65439] [PATCH] maint: Support `guix shell' in Guix's git archive with Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 06 Sep 2023 07:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65439 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65439@debbugs.gnu.org Received: via spool by 65439-submit@debbugs.gnu.org id=B65439.169398443311032 (code B ref 65439); Wed, 06 Sep 2023 07:14:01 +0000 Received: (at 65439) by debbugs.gnu.org; 6 Sep 2023 07:13:53 +0000 Received: from localhost ([127.0.0.1]:60676 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdmjY-0002rr-U9 for submit@debbugs.gnu.org; Wed, 06 Sep 2023 03:13:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdmjS-0002rY-QK for 65439@debbugs.gnu.org; Wed, 06 Sep 2023 03:13:51 -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 1qdmjL-0007sg-Aq; Wed, 06 Sep 2023 03:13:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=BW/VZI4sUthkr1vdk/hUEF7nciokql30KrhOgp9Zu5k=; b=WgtDdQ/GhbQzp81q2/2K gUgT1XB4atZCjJ7BhxIQBtUhGEvCQY9vxiXA2azTp2aevogi3NU6/fLZaO1MaWDwalesVwYKM7QYy LibrFZ07M0+qJvvxkOzMg/BXCr25Bonhh+m0eE8I7th7B2t/h/s8AyYqXWUppu0Ea4x8fvteOdYqf D8mnKnG2VCcBebmnl7XxPmuDwdzlSUL9mch8Bb0mpYpIDUttSFd+DRkCo0uXAOBHGslqBORipl44g ilFv040vLhzY6p9sEM1Mdp0iKp8HiZ4mDuvjA2Ph+LlAU5JZohGbZNfuTDWnEuCz0vCeS7WwU3nRs UWuAhtU/b6528g==; From: Janneke Nieuwenhuizen Organization: AvatarAcademy.nl References: <87y1i48a9g.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Wed, 06 Sep 2023 09:13:30 +0200 In-Reply-To: <87y1i48a9g.fsf@gnu.org> (Janneke Nieuwenhuizen's message of "Mon, 21 Aug 2023 21:29:15 +0200") Message-ID: <87r0nbu63p.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Janneke Nieuwenhuizen writes: Hi! > In the attached patch I share my local hack `maintenance.scm', which > allows this generalized .envrc For v2 I removed unnecessary includes. (Initially `maintenance.scm' was a bit more interesting.) Also mention using it implicitly in Contributing.texi. [snip .envrc exapmle that runs ./pre-inst-env] ...and while I'm here; I'm using this much simpler .envrc now: --8<---------------cut here---------------start------------->8--- eval $(guix shell --search-paths) if test -f doc/dir; then export INFOPATH="$PWD/doc${INFOPATH:+:}$INFOPATH" fi --8<---------------cut here---------------end--------------->8--- I found that it's better to simply use ./pre-inst-env in the M-x compile command instead. Greetings, Janneke From 7f36f48a4757fc2952b8140b72f1952688d0ac6b Mon Sep 17 00:00:00 2001 Message-ID: <7f36f48a4757fc2952b8140b72f1952688d0ac6b.1693984077.git.janneke@gnu.org> From: Janneke Nieuwenhuizen Date: Mon, 21 Aug 2023 20:57:12 +0200 Subject: [PATCH v2] maint: Support `guix shell' in Guix's git archive with manifest.scm. * manifest.scm: New file. * Makefile.am (EXTRA_DIST): Add it. * doc/contributing.texi (Building from Git): Mention using it. --- Makefile.am | 1 + doc/contributing.texi | 6 ++++++ manifest.scm | 30 ++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 manifest.scm diff --git a/Makefile.am b/Makefile.am index 922913355c..8924974e8a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -692,6 +692,7 @@ EXTRA_DIST += \ ROADMAP \ TODO \ bootstrap \ + manifest.scm \ build-aux/build-self.scm \ build-aux/check-channel-news.scm \ build-aux/check-final-inputs-self-contained.scm \ diff --git a/doc/contributing.texi b/doc/contributing.texi index fa9238fde8..2ee1e4aa2c 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -77,6 +77,12 @@ Building from Git guix shell -D guix --pure @end example +or even, from within a Git worktree for Guix + +@example +guix shell --pure +@end example + @xref{Invoking guix shell}, for more information on that command. If you are unable to use Guix when building Guix from a checkout, the diff --git a/manifest.scm b/manifest.scm new file mode 100644 index 0000000000..bcd94b68c5 --- /dev/null +++ b/manifest.scm @@ -0,0 +1,30 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2022 Janneke Nieuwenhuizen +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +;; GNU Guix development manifest. To create development environment, run +;; +;; guix shell +;; +;; or something like +;; +;; guix shell --pure git git:send-email openssh + +(use-modules (guix profiles) + (gnu packages package-management)) + +(package->development-manifest guix) base-commit: 6113e0529d61df7425f64e30a6bf77f7cfdfe5a5 -- 2.41.0