diff options
Diffstat (limited to 'gnu/packages/web-browsers.scm')
| -rw-r--r-- | gnu/packages/web-browsers.scm | 57 |
1 files changed, 29 insertions, 28 deletions
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index e60661e493..71289dbb2b 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2021 Alexander Krotov <krotov@iitp.ru> ;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2021 Christopher Howard <christopher@librehacker.com> +;;; Copyright © 2023 Herman Rimm <herman@rimm.ee> ;;; ;;; This file is part of GNU Guix. ;;; @@ -83,7 +84,6 @@ #:use-module (gnu packages man) #:use-module (gnu packages markup) #:use-module (gnu packages mp3) - #:use-module (gnu packages nano) #:use-module (gnu packages ncurses) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) @@ -95,6 +95,8 @@ #:use-module (gnu packages qt) #:use-module (gnu packages sdl) #:use-module (gnu packages sqlite) + #:use-module (gnu packages tcl) + #:use-module (gnu packages text-editors) #:use-module (gnu packages tls) #:use-module (gnu packages webkit) #:use-module (gnu packages xorg)) @@ -459,7 +461,7 @@ interface.") (define-public qutebrowser (package (name "qutebrowser") - (version "2.5.4") + (version "3.1.0") (source (origin (method url-fetch) @@ -467,7 +469,7 @@ interface.") "qutebrowser/releases/download/v" version "/" "qutebrowser-" version ".tar.gz")) (sha256 - (base32 "1c8skkc5vjbvbslz65hzrj9d05v4zbcjbli61ikjmr174lhb4q54")))) + (base32 "0prf9c7nx4aizfczjb0fpsn3alz210i6wc7s2jwb1mh8r8fcq3ah")))) (build-system python-build-system) (native-inputs (list python-attrs)) ; for tests @@ -480,15 +482,13 @@ interface.") python-pynacl python-pypeg2 python-pyyaml - ;; FIXME: python-pyqtwebengine needs to come before python-pyqt so - ;; that it's __init__.py is used first. - python-pyqtwebengine - python-pyqt - ;; While qtwebengine-5 is provided by python-pyqtwebengine, it's + python-pyqt-6 + python-pyqtwebengine-6 + ;; While qtwebengine is provided by python-pyqtwebengine-6, it's ;; included here so we can wrap QTWEBENGINEPROCESS_PATH. - qtwebengine-5)) + qtwebengine)) (arguments - `(;; FIXME: With the existance of qtwebengine-5, tests can now run. But + `(;; FIXME: With the existence of qtwebengine, tests can now run. But ;; they are still disabled because test phase hangs. It's not readily ;; apparent as to why. #:tests? #f @@ -538,13 +538,16 @@ interface.") (add-after 'wrap 'wrap-qt-process-path (lambda* (#:key inputs outputs #:allow-other-keys) (wrap-program (search-input-file outputs "bin/qutebrowser") + `("QTWEBENGINE_RESOURCES_PATH" = + (,(search-input-directory + inputs "/share/qt6/resources"))) `("QTWEBENGINEPROCESS_PATH" = (,(search-input-file - inputs "/lib/qt5/libexec/QtWebEngineProcess"))))))))) + inputs "/lib/qt6/libexec/QtWebEngineProcess"))))))))) (home-page "https://qutebrowser.org/") (synopsis "Minimal, keyboard-focused, vim-like web browser") (description "qutebrowser is a keyboard-focused browser with a minimal -GUI. It is based on PyQt5 and QtWebEngine.") +GUI. It is based on PyQt6 and QtWebEngine.") (license license:gpl3+))) (define-public vimb @@ -586,7 +589,7 @@ driven and does not detract you from your daily work.") (define-public nyxt (package (name "nyxt") - (version "3.9.1") + (version "3.11.0") (source (origin (method git-fetch) @@ -595,13 +598,8 @@ driven and does not detract you from your daily work.") (commit version))) (sha256 (base32 - "1x7ia43yh024hwwsh2a6g2daznkzgjlisnxvjfcb9sgvfqfa368i")) - (file-name (git-file-name "nyxt" version)) - (modules '((guix build utils))) - (snippet - `(begin - (delete-file-recursively "libraries/nasdf") - #t)))) + "0hzkpk8kshw7afz3pryi99xz2vg3v676day0mgji3hvaazfan39p")) + (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments `(#:make-flags (list "nyxt" "NYXT_SUBMODULES=false" @@ -678,7 +676,6 @@ driven and does not detract you from your daily work.") sbcl-montezuma sbcl-moptilities sbcl-named-readtables - sbcl-nasdf sbcl-nclasses sbcl-ndebug sbcl-nfiles @@ -711,7 +708,7 @@ driven and does not detract you from your daily work.") gsettings-desktop-schemas cl-gobject-introspection gtk+ ; For the main loop - webkitgtk ; Required when we use its typelib + webkitgtk-for-gtk3 ; Required when we use its typelib gobject-introspection pkg-config)) (synopsis "Extensible web-browser in Common Lisp") @@ -852,16 +849,16 @@ http, and https via third-party applications.") (define-public tinmop (package (name "tinmop") - (version "0.9.9.141") + (version "0.9.9.1414213") (source (origin (method git-fetch) (uri (git-reference - (url "https://notabug.org/cage/tinmop") + (url "https://codeberg.org/cage/tinmop") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0hx52kaq0q9iccalkxk50q1v3mf9ypardjgv56d5sdrbhfqyashl")))) + (base32 "0rlgnqld6ls46452xvcr8k4ji4lwmlsrxib5ii9l9clkm0s477wv")))) (build-system gnu-build-system) (native-inputs (list autoconf @@ -872,6 +869,7 @@ http, and https via third-party applications.") nano openssl sbcl + tk unzip xdg-utils)) (inputs @@ -893,10 +891,12 @@ http, and https via third-party applications.") sbcl-crypto-shortcuts sbcl-drakma sbcl-esrap + sbcl-flexi-streams sbcl-ieee-floats sbcl-local-time sbcl-log4cl sbcl-marshal + sbcl-nodgui sbcl-osicat sbcl-parse-number sbcl-percent-encoding @@ -907,6 +907,7 @@ http, and https via third-party applications.") sbcl-trivial-clipboard sbcl-unix-opts sbcl-usocket + sbcl-yason sqlite)) (arguments `(#:tests? #f @@ -937,10 +938,10 @@ http, and https via third-party applications.") "--eval \"(push \\\"$$(pwd)/\\\" asdf:*central-registry*)\" ")))) #t))))) (synopsis - "Gemini, gopher, kami and pleroma client with a terminal interface") + "Gemini, gopher, kami and mastodon/pleroma client with a terminal interface") (description - "This package provides a Gemini, gopher, kami and pleroma client with a -terminal interface.") + "This package provides a Gemini, gopher, kami and mastodon/pleroma client +with a terminal interface, for Gemini also a GUI is available.") (home-page "https://www.autistici.org/interzona/tinmop.html") (license license:gpl3+))) |