diff options
| -rw-r--r-- | website/README | 3 | ||||
| -rw-r--r-- | website/apps/base/templates/help.scm | 4 | ||||
| -rw-r--r-- | website/apps/base/utils.scm | 4 | ||||
| -rw-r--r-- | website/apps/packages/builder.scm | 22 | ||||
| -rw-r--r-- | website/haunt.scm | 4 |
5 files changed, 7 insertions, 30 deletions
diff --git a/website/README b/website/README index 11f5058..d3a3a78 100644 --- a/website/README +++ b/website/README @@ -32,9 +32,6 @@ Then, visit http://localhost:8080/guix.html in a web browser. You can stop the server pressing ~Ctrl + C~ twice. -To build the website for guix.info set the environment variable -=GUIX_WEB_SITE_INFO= first. - * Deploying Like the pages of many GNU websites, this website is managed through diff --git a/website/apps/base/templates/help.scm b/website/apps/base/templates/help.scm index ce04032..8117957 100644 --- a/website/apps/base/templates/help.scm +++ b/website/apps/base/templates/help.scm @@ -60,9 +60,7 @@ ,(link-more #:label "Get Guix reference card" - #:url (if (getenv "GUIX_WEB_SITE_INFO") - "https://www.gnu.org/software/guix/guix-refcard.pdf" - (guix-url "guix-refcard.pdf")))) + #:url (guix-url "guix-refcard.pdf"))) (div diff --git a/website/apps/base/utils.scm b/website/apps/base/utils.scm index ba812cd..d57ec7c 100644 --- a/website/apps/base/utils.scm +++ b/website/apps/base/utils.scm @@ -46,9 +46,7 @@ (define guix-irc-log-url "http://logs.guix.gnu.org/guix") (define guix-root-url-path - (if (getenv "GUIX_WEB_SITE_INFO") - (make-parameter "/") - (make-parameter "/software/guix/"))) ; Path to GNU Guix site in gnu.org + (make-parameter "/")) ; Path to GNU Guix site at guix.gnu.org (define latest-guix-version (make-parameter "1.0.1")) diff --git a/website/apps/packages/builder.scm b/website/apps/packages/builder.scm index 59f86c1..40a54f9 100644 --- a/website/apps/packages/builder.scm +++ b/website/apps/packages/builder.scm @@ -60,24 +60,10 @@ A list of page objects that represent the web resources of the application. See Haunt <page> objects for more information." (flatten - (if (getenv "GUIX_WEB_SITE_INFO") - (list - (index-builder) - (packages-builder) - (package-list-builder)) - - ;; These provisional builders are used because of a limitation of - ;; the CVS repository used for deploying the website. The idea is - ;; to have "package list" and "package detail" pages as proposed - ;; in Guix bug #25227. This, however, would generate thousands of - ;; pages that could choke the current CVS repository. - ;; - ;; When this limitation is gone, the above builders should be - ;; used instead. They should generate pages as those described - ;; in the proposal. - (list - (detailed-index-builder) - (detailed-package-list-builder))))) + (list + (index-builder) + (packages-builder) + (package-list-builder)))) diff --git a/website/haunt.scm b/website/haunt.scm index d29c0d4..9f66920 100644 --- a/website/haunt.scm +++ b/website/haunt.scm @@ -14,9 +14,7 @@ (site #:title "GNUÂ Guix" - #:domain (if (getenv "GUIX_WEB_SITE_INFO") - "https://guix.info" - "https://gnu.org/software/guix") + #:domain "https://guix.gnu.org" #:build-directory "/tmp/gnu.org/software/guix" #:readers (list sxml-reader html-reader commonmark-reader) #:builders (list base:builder |