[PATCH maintenance] hydra: services: guix-packages-website: Update to 0.0.927b073740.

  • Done
  • quality assurance status badge
Details
2 participants
  • Christopher Baines
  • sirgazil
Owner
unassigned
Submitted by
sirgazil
Severity
normal
S
S
sirgazil wrote on 7 Nov 16:02 +0100
(name . Luis Felipe)(address . sirgazil@zoho.com)
20241107150255.4283-1-sirgazil@zoho.com
From: Luis Felipe <sirgazil@zoho.com>

* hydra/modules/sysadmin/services.scm (%guix-packages-website):
Update to 0.0.927b073740c9a12a1f414ce9aee6008add4ef310.
[snippet]: Remove it. Artanis' config has been corrected upstream and
MANUAL_URL doesn't prevent (gweb urls) from loading.
---
hydra/modules/sysadmin/services.scm | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)

Toggle diff (41 lines)
diff --git a/hydra/modules/sysadmin/services.scm b/hydra/modules/sysadmin/services.scm
index fe30d4e..c501037 100644
--- a/hydra/modules/sysadmin/services.scm
+++ b/hydra/modules/sysadmin/services.scm
@@ -1170,7 +1170,7 @@ to a selected directory.")
;;;
(define %guix-packages-website
- (let* ((commit "72817057c0ba86663ae0a29bde13c15b686600d0")
+ (let* ((commit "927b073740c9a12a1f414ce9aee6008add4ef310")
(version (git-version "0" "0" commit)))
(origin
(method git-fetch)
@@ -1180,22 +1180,7 @@ to a selected directory.")
(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"))
-
- ;; Work around <https://issues.guix.gnu.org/71138>.
- (substitute* "conf/artanis.conf"
- (("^cookie\\.expire.*" line)
- (string-append "# " line "\n"))))))))
+ "0zl5dkz2cipfqhy95y5v3l5l0q1zak7f900q97zvdx9sz8k30wbx")))))
(define-record-type* <guix-packages-website-configuration>
guix-packages-website-configuration make-guix-packages-website-configuration

base-commit: ef18d820bbdfc257793824229e0ae22032d4986e
--
2.46.0
C
C
Christopher Baines wrote on 11 Nov 10:11 +0100
Re: Upgrading Guix packages website in Guix infrastructure
(name . Luis Felipe)(address . sirgazil@zoho.com)
87iksurv85.fsf@cbaines.net
Luis Felipe <sirgazil@zoho.com> writes:

Toggle quote (38 lines)
> On 4/11/24 22:12, Ludovic Courtès wrote:
>> Hello,
>>
>> Luis Felipe <sirgazil@zoho.com> skribis:
>>
>>> Hi guix,
>>>
>>> The software behind https://packages.guix.gnu.org/, Guix Packages
>>> Website,¹ has been updated with the following changes:
>> Yay!
>>
>> Could you send a patch against this:
>>
>> https://git.savannah.gnu.org/cgit/guix/maintenance.git/tree/hydra/modules/sysadmin/services.scm#n1172
>>
>> ? (You’re best positioned to know whether the snippet there is now
>> obsolete.)
>>
>> You should be able to check in ‘guix system vm’ whether this works as
>> expected, either with ‘bayfront.scm’ (but you’ll need to comment out
>> things like networking setup), or maybe with something like
>> ‘bare-bones.tmpl’ extended with the guix-packages-website service.
>
> Just to let you all know that I made the changes and checked in a VM
> (with a custom OS config) that the service runs correctly.
>
> * herd status reported that the service was up and running.
> * I could access the website from Emacs Web Browser (non graphical
> client) and it worked correctly: index page shows random packages, I
> can search for packages, package and product pages load correctly
> and external links take to expected locations.
> * I also checked the same pages from Qutebrowser (graphical client).
>
>
>> Once we have that, one of us sysadmins can redeploy it.
>
> I sent the patch to https://issues.guix.gnu.org/74240.

I've pushed this now and the site looks to have updated.

Thanks,

Chris
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmcxyipfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XdNSxAAjkBIyzTMRn9A8lG5m3iNF+EN+8JT8x6k
Q42qaqdjAGM7Ikm/SC8rUuIxlGoZvjs33qBeWOkELbj6B50m7AepaADzNCL4wInZ
0Y+Bhu/l4ssH93q7vwwj7h6MgpusYQDdUqBx5J6x86AX/o9f4wc5huvwROGQVYYE
5cnky91HjIaKIWoKztXBN6TGGUtGRxf3Axgb8aupf/dRKbu7q3Mt6aMZcAEVVfFr
MVzgo5icDoweDvyonAbuJ80MdlYjV1mRtQaLXdtEOqCQRqlHOEE4UtMKWncNjury
/EjS6k4ZVSHEL1gJ8pccSWgatQgWNfTampmQUCxanAL9MojnpEuFR29rzpWKZsJI
8+WiKoL9tkIeqB8A+/GmYNGg6YzirzYJvM/9NLEqfqPI42gGq4htIA86udBG8uGH
5+ao5TWBJNR//MGwm8B8DrKzpNeKQotWvgjW85Wz7rFgI5Ty/17tZPgNsRLOjiS9
wdOOVrg02X/ZlVzyYmJNM2IzNoEHS2ARueXNLvAf0aibJjIQ98uutbBMwY4ZaMRS
o7q2e233d8gQEQ7c1VElMDz/mSaUpKjV2nEogaYLnIcOKXhh9VZl6FmdLifUgPhC
f0AqAAftV2I+Lce8iX1AoTquLtOIUhLBiu2+XXnDZpo9cD+I8hdsYrNXXqgqqz5s
Bll1nxQzyGo=
=fQzS
-----END PGP SIGNATURE-----

Closed
?
Your comment

Commenting via the web interface is currently disabled.

To comment on this conversation send an email to 74240@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 74240
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch