From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 6EDxJlyQi1/DRQAA0tVLHw (envelope-from ) for ; Sun, 18 Oct 2020 00:46:20 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id GMrcIlyQi1/RaAAAbx9fmQ (envelope-from ) for ; Sun, 18 Oct 2020 00:46:20 +0000 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 DAAB69401BF for ; Sun, 18 Oct 2020 00:46:19 +0000 (UTC) Received: from localhost ([::1]:36246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kTw9L-0005L4-Os for larch@yhetil.org; Sat, 17 Oct 2020 20:02:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTw9C-0005Kk-Ex for guix-patches@gnu.org; Sat, 17 Oct 2020 20:02:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52451) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kTw9C-0001PA-5h for guix-patches@gnu.org; Sat, 17 Oct 2020 20:02:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kTw9C-0004dd-2S for guix-patches@gnu.org; Sat, 17 Oct 2020 20:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#44051] [PATCH] website: Update manifest. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Oct 2020 00:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 44051 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44051@debbugs.gnu.org Cc: zimoun X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.160297928317785 (code B ref -1); Sun, 18 Oct 2020 00:02:01 +0000 Received: (at submit) by debbugs.gnu.org; 18 Oct 2020 00:01:23 +0000 Received: from localhost ([127.0.0.1]:35764 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kTw8Z-0004cn-Jy for submit@debbugs.gnu.org; Sat, 17 Oct 2020 20:01:23 -0400 Received: from lists.gnu.org ([209.51.188.17]:53242) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kTw8Y-0004cf-Gl for submit@debbugs.gnu.org; Sat, 17 Oct 2020 20:01:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTw8Y-0005IE-6u for guix-patches@gnu.org; Sat, 17 Oct 2020 20:01:22 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:39728) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kTw8V-0001Mc-V2 for guix-patches@gnu.org; Sat, 17 Oct 2020 20:01:21 -0400 Received: by mail-wr1-x443.google.com with SMTP id y12so7453008wrp.6 for ; Sat, 17 Oct 2020 17:01:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LNY+gkcC4cqatRVAGt/XQlwR2uQmbqsgmBEnfW+foZo=; b=RK+5XsdRe03GNEPtdmxbFGlmB7vSPCpBU7KRHJJ35wAyj8PxrWn9G+oFkNTNOqVlcJ 8hHh1PYU/kKxp6pUgS8wLEPR6hugcV/hNqFCLqm1MVBsJxCD0OV8ban35gRN/XRFVoXZ +vw4ypGqNdyloKmdKfu1EUORXuumSPUKlblpMYoisUVEbjhIyoh1086PFoEkXrRnuKcO KBbzBIKLmCdWCyCMDkmkj5edMShpvgYXPpmLK+w8JFXP2N779dXXl3BCiP5RLsRN6ekf fEF+lh6b+tqnqHadL4zGr2bmQUHTBueVVTlBinszJxKMDrMRhKrCwWcoVatAgpn5HK1r zAUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LNY+gkcC4cqatRVAGt/XQlwR2uQmbqsgmBEnfW+foZo=; b=iBB0esMipj7Hl9O0KQ9rJXd5FukLfDLFp+Qh+K3QpN3qIVrbAz4aSB+sSuu6tvoGbn QyyLxsPY0Yqonkj2b/AYuMVeyCEykrRuHs+UUDzc0LV2qNtw2p8O6qtAAyR4LE2CU8wD g/0m4g2NnCqeHdVT64QYzPvW7RjqX3Kto43NBtqE8T5n1oWaz5Qgm0+wQnLEEkYxIxhJ YHV84vGbPDSu1qcfy0KtoHbYklDHzsPRJnviSrp9d8jUlFOkUpF9Bfmk+ksWqRGyArrt mvqrqPVmUA4r34Ts6R7KRn31OhWBv8PSYVL3ML9tdltkoJPrsiIZCk7ZmGgkKyIxoBC9 186g== X-Gm-Message-State: AOAM530wcmB5JPgOw4Mj2VfIZltKn/A47jQ7IOkQjCw0k19PWAc92vaJ pqjYq2Ogh7u5o9V2BRgwrwKGDVXEYqs= X-Google-Smtp-Source: ABdhPJxHZBSxr+PDjBmTPNnYkk7LxEDbV9QZ+GhWUrkqib5tY+M/Mz/WQMcluOJemlf1M8hIcSUT2Q== X-Received: by 2002:adf:ab50:: with SMTP id r16mr11648263wrc.235.1602979276601; Sat, 17 Oct 2020 17:01:16 -0700 (PDT) Received: from localhost.localdomain ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id j17sm10527332wrw.68.2020.10.17.17.01.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Oct 2020 17:01:16 -0700 (PDT) From: zimoun Date: Sun, 18 Oct 2020 02:01:06 +0200 Message-Id: <20201018000106.30868-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::443; envelope-from=zimon.toutoune@gmail.com; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -2.3 (--) 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" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=RK+5XsdR; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 5.59 X-TUID: 0mqJd35tZydF * website/guix.packages: Rename to... * website/manifest.scm: ...this. * website/README: Update. --- website/README | 27 ++++++++++++++++++++++----- website/guix.packages | 16 ---------------- website/manifest.scm | 30 ++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 21 deletions(-) delete mode 100644 website/guix.packages create mode 100644 website/manifest.scm diff --git a/website/README b/website/README index 64b09c1..9ef044f 100644 --- a/website/README +++ b/website/README @@ -14,21 +14,38 @@ following command to install all the software needed to build the website: #+BEGIN_EXAMPLE -$ guix package -i git glibc-locales gnutls guile guile-json guile-syntax-highlight guix haunt + guix package -m manifest.scm #+END_EXAMPLE +*Note*: the packages =guix= and =haunt= should have the same version of Guile, +otherwise building the website is slow and raises bunch of warnings. The +manifest file takes care. + * Running the website To try out the website locally while you work on it, run the following commands: #+BEGIN_EXAMPLE -$ cd path/to/guix-artwork/website -$ export GUILE_LOAD_PATH=$(guix build guile-syntax-highlight)/share/guile/site/3.0:$GUILE_LOAD_PATH -$ LC_ALL=en_US.utf8 GUIX_WEB_SITE_LOCAL=yes haunt build -$ haunt serve + cd path/to/guix-artwork/website #+END_EXAMPLE +** Build locally +#+begin_example + GUIX_WEB_SITE_LOCAL=yes guix environment -C -m manifest.scm \ + -E GUIX_LOCPATH -E LANG --share=$HOME/.guix-profile/lib/locale \ + -E GUIX_WEB_SITE_LOCAL --share=/tmp \ + -- haunt build +#+end_example + +** Serve locally +#+begin_example + guix environment -CN -m manifest.scm \ + -E GUIX_LOCPATH -E LANG --share=$HOME/.guix-profile/lib/locale \ + --share=/tmp \ + -- haunt serve -w +#+end_example + Then, visit http://localhost:8080/en/guix.html in a web browser. You can stop the server pressing ~Ctrl + C~ twice. diff --git a/website/guix.packages b/website/guix.packages deleted file mode 100644 index 386307c..0000000 --- a/website/guix.packages +++ /dev/null @@ -1,16 +0,0 @@ -;;; Packages required to develop the website. -;;; (See guix package --manifest option for more details on this file). - -(use-modules (guix profiles) - (gnu packages)) - - -(define dev-packages - (list "glibc-locales" - "guile@2.2" - "guile-syntax-highlight" - "guix" - "haunt")) - - -(map specification->package dev-packages) diff --git a/website/manifest.scm b/website/manifest.scm new file mode 100644 index 0000000..eda382a --- /dev/null +++ b/website/manifest.scm @@ -0,0 +1,30 @@ +(use-modules (guix packages) + ((gnu packages package-management) #:select (guix)) + ((gnu packages guile-xyz) #:select (haunt)) + (srfi srfi-1)) + +(define the-good-guile + (car (assoc-ref (package-native-inputs guix) "guile"))) + +(define haunt-the-ghost + (package + (inherit haunt) + (name "haunt-for-guix-website") + (inputs + `(("guile" ,the-good-guile) + ,@(alist-delete "guile" (package-inputs haunt)))))) + +(packages->manifest + (append + ;; Guile needs to be compatible + (list + guix + the-good-guile + haunt-the-ghost) + + ;; Other packages + (map specification->package + (list + "glibc-locales" + "git" + "guile-syntax-highlight")))) base-commit: 2e0252dfa809d5a38ce87245764d936b659c16b4 prerequisite-patch-id: 977ecbddcfeb54b30cf8874ecf70ce1d7e41fecb -- 2.28.0