civodul pushed a commit to branch master
in repository maintenance.
commit e808b5216bc7b68c4759b9254825b184cd7911dc
Author: Ludovic Courtès <l...@gnu.org>
AuthorDate: Fri May 24 16:23:09 2024 +0200
hydra: services: Move guix-packages-website origin to the top level.
* hydra/modules/sysadmin/services.scm (%guix-packages-website): New
variable, taken from…
(<guix-packages-website-configuration>)[origin]: … here. Use it.
---
hydra/modules/sysadmin/services.scm | 47 +++++++++++++++++++------------------
1 file changed, 24 insertions(+), 23 deletions(-)
diff --git a/hydra/modules/sysadmin/services.scm
b/hydra/modules/sysadmin/services.scm
index 682d9d4..b294a89 100644
--- a/hydra/modules/sysadmin/services.scm
+++ b/hydra/modules/sysadmin/services.scm
@@ -1151,33 +1151,34 @@ to a selected directory.")
;;; packages.guix.gnu.org
;;;
+(define %guix-packages-website
+ (let* ((commit "72817057c0ba86663ae0a29bde13c15b686600d0")
+ (version (git-version "0" "0" commit)))
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://codeberg.org/luis-felipe/guix-packages-website.git";)
+ (commit commit)))
+ (file-name (git-file-name "guix-packages-website" version))
+ (sha256
+ (base32
+ "0jm0aipdw97sb1lwzczgwzacv9jgyippgq79na87647lqapq8fcx"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (use-modules (guix build utils))
+
+ ;; TODO This seemed to be needed to avoid `path` being undefined
+ ;; when Guile tries to load urls.scm
+ (substitute* "gweb/urls.scm"
+ (("define MANUAL_URL .*$")
+ "define MANUAL_URL
\"https://www.gnu.org/software/guix/manual\";)\n")))))))
+
(define-record-type* <guix-packages-website-configuration>
guix-packages-website-configuration make-guix-packages-website-configuration
guix-packages-website-configuration?
(origin guix-packages-website-configuration-origin
- (default
- (let* ((commit "72817057c0ba86663ae0a29bde13c15b686600d0")
- (version (git-version "0" "0" commit)))
- (origin
- (method git-fetch)
- (uri (git-reference
- (url
"https://codeberg.org/luis-felipe/guix-packages-website.git";)
- (commit commit)))
- (file-name (git-file-name "guix-packages-website"
version))
- (sha256
- (base32
-
"0jm0aipdw97sb1lwzczgwzacv9jgyippgq79na87647lqapq8fcx"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- (use-modules (guix build utils))
-
- ;; TODO This seemed to be needed to avoid
- ;; `path` being undefined when Guile tries
- ;; to load urls.scm
- (substitute* "gweb/urls.scm"
- (("define MANUAL_URL .*$")
- "define MANUAL_URL
\"https://www.gnu.org/software/guix/manual\";)\n"))))))))
+ (default %guix-packages-website))
(port guix-packages-website-configuration-port
(default 3000))
(host guix-packages-website-configuration-host
