* [bug#63673] [PATCH]: Update Nyxt to 3.0.0
@ 2023-05-23 20:39 André A. Gomes
2023-05-24 8:51 ` Pierre Neidhardt
0 siblings, 1 reply; 2+ messages in thread
From: André A. Gomes @ 2023-05-23 20:39 UTC (permalink / raw)
To: 63673; +Cc: pierre
[-- Attachment #1: Type: text/plain, Size: 255 bytes --]
Hello Guix,
Find 3 patches attached that enable bumping Nyxt to the latest stable
version. Note that patches relative to sbcl-nfiles and sbcl-nasdf are
needed for that goal.
Thanks.
--
André A. Gomes
"You cannot even find the ruins..."
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-nyxt-Update-to-3.0.0.patch --]
[-- Type: text/x-patch, Size: 6535 bytes --]
From f845872b501e33b0c3b2e515e1a78fdfb4820903 Mon Sep 17 00:00:00 2001
From: "Andre A. Gomes" <andremegafone@gmail.com>
Date: Mon, 22 May 2023 00:34:25 +0300
Subject: [PATCH 1/3] gnu: nyxt: Update to 3.0.0.
* gnu/packages/web-browsers.scm (nyxt): Update to 3.0.0.
---
gnu/packages/web-browsers.scm | 135 ++++++++++++++++++++--------------
1 file changed, 78 insertions(+), 57 deletions(-)
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index 33de003983..8131592b33 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -587,7 +587,7 @@ (define-public vimb
(define-public nyxt
(package
(name "nyxt")
- (version "2.2.4")
+ (version "3.0.0")
(source
(origin
(method git-fetch)
@@ -596,8 +596,13 @@ (define-public nyxt
(commit version)))
(sha256
(base32
- "12l7ir3q29v06jx0zng5cvlbmap7p709ka3ik6x29lw334qshm9b"))
- (file-name (git-file-name "nyxt" version))))
+ "1jzlpi2iam15f0724nh6pb0zfs8d89mrf3zkvd87g99aq9w2h02a"))
+ (file-name (git-file-name "nyxt" version))
+ (modules '((guix build utils)))
+ (snippet
+ `(begin
+ (delete-file-recursively "libraries/nasdf")
+ #t))))
(build-system gnu-build-system)
(arguments
`(#:make-flags (list "nyxt" "NYXT_SUBMODULES=false"
@@ -639,60 +644,76 @@ (define-public nyxt
`("LD_LIBRARY_PATH" ":" prefix (,path))
`("XDG_DATA_DIRS" ":" prefix (,xdg-path)))
#t))))))
- (native-inputs
- `(("prove" ,sbcl-prove)
- ("sbcl" ,sbcl)))
- (inputs
- `(("alexandria" ,sbcl-alexandria)
- ("bordeaux-threads" ,sbcl-bordeaux-threads)
- ("cl-base64" ,sbcl-cl-base64)
- ("cl-calispel" ,sbcl-calispel)
- ("cl-containers" ,sbcl-cl-containers)
- ("cl-css" ,sbcl-cl-css)
- ("cl-custom-hash-table" ,sbcl-custom-hash-table)
- ("cl-html-diff" ,sbcl-cl-html-diff)
- ("cl-json" ,sbcl-cl-json)
- ("cl-ppcre" ,sbcl-cl-ppcre)
- ("cl-prevalence" ,sbcl-cl-prevalence)
- ("cl-qrencode" ,sbcl-cl-qrencode)
- ("closer-mop" ,sbcl-closer-mop)
- ("cluffer" ,sbcl-cluffer)
- ("dexador" ,sbcl-dexador)
- ("enchant" ,sbcl-enchant)
- ("flexi-streams" ,cl-flexi-streams)
- ("fset" ,sbcl-fset)
- ("hu.dwim.defclass-star" ,sbcl-hu.dwim.defclass-star)
- ("iolib" ,sbcl-iolib)
- ("local-time" ,sbcl-local-time)
- ("log4cl" ,sbcl-log4cl)
- ("lparallel" ,sbcl-lparallel)
- ("mk-string-metrics" ,sbcl-mk-string-metrics)
- ("moptilities" ,sbcl-moptilities)
- ("named-readtables" ,sbcl-named-readtables)
- ("parenscript" ,sbcl-parenscript)
- ("plump" ,sbcl-plump)
- ("clss" ,sbcl-clss)
- ("quri" ,sbcl-quri)
- ("serapeum" ,sbcl-serapeum)
- ("spinneret" ,sbcl-spinneret)
- ("str" ,sbcl-cl-str)
- ("swank" ,sbcl-slime-swank)
- ("trivia" ,sbcl-trivia)
- ("trivial-clipboard" ,sbcl-trivial-clipboard)
- ("trivial-features" ,sbcl-trivial-features)
- ("trivial-package-local-nicknames" ,sbcl-trivial-package-local-nicknames)
- ("trivial-types" ,sbcl-trivial-types)
- ("unix-opts" ,sbcl-unix-opts)
- ;; WebKitGTK deps
- ("cl-cffi-gtk" ,sbcl-cl-cffi-gtk)
- ("cl-webkit" ,sbcl-cl-webkit)
- ("glib-networking" ,glib-networking)
- ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
- ;; GObjectIntrospection
- ("cl-gobject-introspection" ,sbcl-cl-gobject-introspection)
- ("gtk" ,gtk+) ; For the main loop.
- ("webkitgtk" ,webkitgtk) ; Required when we use its typelib.
- ("gobject-introspection" ,gobject-introspection)))
+ (native-inputs (list cl-lisp-unit2 sbcl))
+ (inputs (list sbcl-alexandria
+ sbcl-bordeaux-threads
+ sbcl-calispel
+ sbcl-cl-base64
+ sbcl-cl-colors2
+ sbcl-cl-containers
+ sbcl-cl-gopher
+ sbcl-cl-html-diff
+ sbcl-cl-json
+ sbcl-cl-ppcre
+ sbcl-cl-prevalence
+ sbcl-cl-qrencode
+ sbcl-cl-str
+ sbcl-cl-tld
+ sbcl-closer-mop
+ sbcl-clss
+ sbcl-cluffer
+ sbcl-custom-hash-table
+ sbcl-dexador
+ sbcl-dissect
+ sbcl-enchant
+ sbcl-flexi-streams
+ sbcl-fset
+ sbcl-history-tree
+ sbcl-iolib
+ sbcl-lass
+ sbcl-local-time
+ sbcl-log4cl
+ sbcl-lparallel
+ sbcl-mk-string-metrics
+ sbcl-montezuma
+ sbcl-moptilities
+ sbcl-named-readtables
+ sbcl-nasdf
+ sbcl-nclasses
+ sbcl-ndebug
+ sbcl-nfiles
+ sbcl-nhooks
+ sbcl-njson
+ sbcl-nkeymaps
+ sbcl-nsymbols
+ sbcl-parenscript
+ sbcl-phos
+ sbcl-plump
+ sbcl-prompter
+ sbcl-py-configparser
+ sbcl-quri
+ sbcl-serapeum
+ sbcl-slime-swank
+ sbcl-slynk
+ sbcl-spinneret
+ sbcl-trivia
+ sbcl-trivial-clipboard
+ sbcl-trivial-custom-debugger
+ sbcl-trivial-features
+ sbcl-trivial-garbage
+ sbcl-trivial-package-local-nicknames
+ sbcl-trivial-types
+ sbcl-unix-opts
+ ;; WebKitGTK deps
+ sbcl-cl-cffi-gtk
+ sbcl-cl-webkit
+ glib-networking
+ gsettings-desktop-schemas
+ cl-gobject-introspection
+ gtk+ ; For the main loop
+ webkitgtk ; Required when we use its typelib
+ gobject-introspection
+ pkg-config))
(synopsis "Extensible web-browser in Common Lisp")
(home-page "https://nyxt.atlas.engineer")
(description "Nyxt is a keyboard-oriented, extensible web-browser designed
--
2.39.2
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-sbcl-nfiles-Temporarily-disable-tests.patch --]
[-- Type: text/x-patch, Size: 985 bytes --]
From 3a44b2f0330c30ac9c301add2405eef89aa5a7e4 Mon Sep 17 00:00:00 2001
From: "Andre A. Gomes" <andremegafone@gmail.com>
Date: Tue, 23 May 2023 23:28:35 +0300
Subject: [PATCH 2/3] gnu: sbcl-nfiles: Temporarily disable tests.
* gnu/packages/lisp-xyz.scm (sbcl-nfiles): Temporarily disable tests.
---
gnu/packages/lisp-xyz.scm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index c8e8cd47e3..4f67973b91 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -25575,7 +25575,10 @@ (define-public sbcl-nfiles
(list sbcl-lisp-unit2
sbcl-nasdf))
(arguments
- `(#:phases
+ ;; Temporarily disabled until the issue below is fixed.
+ ;; https://github.com/atlas-engineer/nfiles/issues/25
+ `(#:tests? #f
+ #:phases
(modify-phases %standard-phases
(add-after 'unpack 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
--
2.39.2
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0003-gnu-sbcl-nasdf-Update-to-0.1.5.patch --]
[-- Type: text/x-patch, Size: 1341 bytes --]
From 38f05613717e65ce9c13ec62567d72dd07c6c151 Mon Sep 17 00:00:00 2001
From: "Andre A. Gomes" <andremegafone@gmail.com>
Date: Tue, 23 May 2023 23:29:58 +0300
Subject: [PATCH 3/3] gnu: sbcl-nasdf: Update to 0.1.5.
* gnu/packages/lisp-xyz.scm (sbcl-nasdf): Update to 0.1.5.
---
gnu/packages/lisp-xyz.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 4f67973b91..4554099a95 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -25627,10 +25627,11 @@ (define-public cl-nfiles
(package-inputs sbcl-nfiles)))))
(define-public sbcl-nasdf
- (let ((commit "c63a6ff12239f132844cc0703e79ea3b33dae630"))
+ (let ((commit "5d823d97282e11cecd8da9bcb255c4a8ead1ba93")
+ (revision "1"))
(package
(name "sbcl-nasdf")
- (version "0.1.2")
+ (version "0.1.5")
(source
(origin
(method git-fetch)
@@ -25640,7 +25641,7 @@ (define-public sbcl-nasdf
(file-name (git-file-name "cl-ntemplate" version))
(sha256
(base32
- "1b57jkyrvr3n0c66lih4m34fqzw3s5yqlk91v7hg2gchcn3v9glg"))))
+ "0vs40ndfyhpx3nj9fc505apk98qgp0pq3cdmqpf67jqkrpcdmnvx"))))
(build-system asdf-build-system/sbcl)
(arguments
`(#:phases
--
2.39.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [bug#63673] [PATCH]: Update Nyxt to 3.0.0
2023-05-23 20:39 [bug#63673] [PATCH]: Update Nyxt to 3.0.0 André A. Gomes
@ 2023-05-24 8:51 ` Pierre Neidhardt
0 siblings, 0 replies; 2+ messages in thread
From: Pierre Neidhardt @ 2023-05-24 8:51 UTC (permalink / raw)
To: andremegafone, 63673
[-- Attachment #1: Type: text/plain, Size: 275 bytes --]
Thanks André!
Merged with ae7a7d76d602e11bec5ba028da63a96a59dfcf6b, with the following
changes:
- I've updated Nfiles to 1.1.3 instead of your patch.
- I've ellided the unused `revision' in sbcl-nasdf. No need since there
is a stable version number.
Cheers!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 515 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-05-24 8:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-23 20:39 [bug#63673] [PATCH]: Update Nyxt to 3.0.0 André A. Gomes
2023-05-24 8:51 ` Pierre Neidhardt
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).