;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 John Darrington <jmd@gnu.org>
-;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2014, 2019 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015, 2016, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
(version "3.0.5")
(source (origin
(method url-fetch)
- (uri (string-append "http://www.dillo.org/download/"
- name "-" version ".tar.bz2"))
+ (uri (string-append "https://www.dillo.org/download/"
+ "dillo-" version ".tar.bz2"))
(sha256
(base32
"12ql8n1lypv3k5zqgwjxlw1md90ixz3ag6j1gghfnhjq3inf26yv"))))
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("fltk" ,fltk)
("fontconfig" ,fontconfig)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libxcursor" ,libxcursor)
("libxft" ,libxft)
("libxi" ,libxi)
("libxinerama" ,libxinerama)
- ("openssl" ,openssl)
+ ("openssl" ,openssl-1.0) ;XXX try latest openssl for dillo > 3.0.5
("perl" ,perl)
("zlib" ,zlib)))
(synopsis "Very small and fast graphical web browser")
(description "Dillo is a minimalistic web browser particularly intended for
older or slower computers and embedded systems.")
- (home-page "http://www.dillo.org")
+ (home-page "https://www.dillo.org")
(license license:gpl3+)))
(define-public links
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("zlib" ,zlib)
("openssl" ,openssl)
- ("libjpeg" ,libjpeg)
+ ("libjpeg" ,libjpeg-turbo)
("libtiff" ,libtiff)
("libevent" ,libevent)
("libpng" ,libpng)
(define-public qutebrowser
(package
(name "qutebrowser")
- (version "1.8.3")
+ (version "1.10.0")
(source
(origin
(method url-fetch)
"qutebrowser-" version ".tar.gz"))
(sha256
(base32
- "055zmzk3q0m3hx1742nfy2mdawfllrkvijnbzp1hiv01dj1bxaf8"))))
+ "1prvd3cysmcjfybn0dmr3ih0bl6lm5ml9i7wd09fn8hb7047mkby"))))
(build-system python-build-system)
(native-inputs
- `(("asciidoc" ,asciidoc)
- ("python-attrs" ,python-attrs))) ; for tests
+ `(("python-attrs" ,python-attrs))) ; for tests
(inputs
`(("python-colorama" ,python-colorama)
("python-cssutils" ,python-cssutils)
("python-pygments" ,python-pygments)
("python-pypeg2" ,python-pypeg2)
("python-pyyaml" ,python-pyyaml)
+ ;; FIXME: python-pyqtwebengine needs to come before python-pyqt so
+ ;; that it's __init__.py is used first.
+ ("python-pyqtwebengine" ,python-pyqtwebengine)
("python-pyqt" ,python-pyqt)
- ("qtwebkit" ,qtwebkit)))
+ ;; While qtwebengine is provided by python-pyqtwebengine, it's
+ ;; included here so we can wrap QTWEBENGINEPROCESS_PATH.
+ ("qtwebengine" ,qtwebengine)))
(arguments
- `(;; FIXME: Tests have been added to Qutebrowser. But they currently fail on
- ;; trying to locate QtWebEngine, and run it on a specific display.
- ;; There does not seem to be a trivial way to suppress this test.
- ;; Either fix this, or wait for a liberated QtWebEngine to make into GNU Guix.
- ;; Change this according to <https://bugs.gnu.org/35866>.
+ `(;; FIXME: With the existance 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
#:phases
(modify-phases %standard-phases
+ (add-before 'check 'set-env-offscreen
+ (lambda _
+ (setenv "QT_QPA_PLATFORM" "offscreen")
+ #t))
(add-after 'install 'install-more
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(app (string-append out "/share/applications"))
(hicolor (string-append out "/share/icons/hicolor")))
- (invoke "a2x" "-f" "manpage" "doc/qutebrowser.1.asciidoc")
(install-file "doc/qutebrowser.1"
(string-append out "/share/man/man1"))
(for-each
(("Exec=qutebrowser")
(string-append "Exec=" out "/bin/qutebrowser")))
(install-file "misc/org.qutebrowser.qutebrowser.desktop" app)
+ #t)))
+ (add-after 'wrap 'wrap-qt-process-path
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin/qutebrowser"))
+ (qt-process-path (string-append
+ (assoc-ref inputs "qtwebengine")
+ "/lib/qt5/libexec/QtWebEngineProcess")))
+ (wrap-program bin
+ `("QTWEBENGINEPROCESS_PATH" ":" prefix (,qt-process-path)))
#t))))))
(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 QtWebKit.")
+GUI. It is based on PyQt5 and QtWebEngine.")
(license license:gpl3+)))
(define-public vimb
(package
(name "vimb")
- (version "3.5.0")
+ (version "3.6.0")
(source
(origin
(method git-fetch)
(url "https://github.com/fanglingsu/vimb/")
(commit version)))
(sha256
- (base32 "13q7mk1hhjri0s30a98r8ncy0skf6m6lrnbqaf0jimf6sbwgiirf"))
+ (base32 "0228khh3lqbal046k6akqah7s5igq9s0wjfjbdjam75kjj42pbhj"))
(file-name (git-file-name name version))))
(build-system glib-or-gtk-build-system)
(arguments
(define next-gtk-webkit
(package
(name "next-gtk-webkit")
- (version "1.3.4")
+ (version "1.4.0")
(source
(origin
(method git-fetch)
(commit version)))
(sha256
(base32
- "00iqv4xarabl98gdl1rzqkc5v0vfljx1nawsxqsx9x3a9mnxmgxi"))
+ "1gkmr746rqqg94698a051gv79fblc8n9dq0zg04llba44adhpmjl"))
(file-name (git-file-name "next" version))))
(build-system glib-or-gtk-build-system)
(arguments
("prove-asdf" ,sbcl-prove-asdf)))
(synopsis "Infinitely extensible web-browser (password manager)")))
+(define sbcl-next-hooks
+ (package
+ (inherit next-gtk-webkit)
+ (name "sbcl-next-hooks")
+ (build-system asdf-build-system/sbcl)
+ (arguments
+ `(#:tests? #t
+ #:asd-file "next.asd"
+ #:asd-system-name "next/hooks"))
+ (inputs
+ `(("alexandria" ,sbcl-alexandria)
+ ("serapeum" ,sbcl-serapeum)
+ ("fare-quasiquote-extras" ,cl-fare-quasiquote-extras)))
+ (native-inputs
+ `(("trivial-features" ,sbcl-trivial-features)
+ ("prove-asdf" ,sbcl-prove-asdf)))
+ (synopsis "Infinitely extensible web-browser (hooks)")))
+
(define-public next
(let ((version (package-version next-gtk-webkit)))
(package
("cl-annot" ,sbcl-cl-annot)
("cl-ansi-text" ,sbcl-cl-ansi-text)
("cl-css" ,sbcl-cl-css)
- ("cl-hooks" ,sbcl-cl-hooks)
("cl-json" ,sbcl-cl-json)
("cl-markup" ,sbcl-cl-markup)
("cl-ppcre" ,sbcl-cl-ppcre)
("closer-mop" ,sbcl-closer-mop)
("dbus" ,cl-dbus)
("dexador" ,sbcl-dexador)
+ ("fare-quasiquote-extras" ,cl-fare-quasiquote-extras) ; For serapeum. Guix bug?
("ironclad" ,sbcl-ironclad)
("local-time" ,sbcl-local-time)
("log4cl" ,sbcl-log4cl)
("lparallel" ,sbcl-lparallel)
("mk-string-metrics" ,sbcl-mk-string-metrics)
("parenscript" ,sbcl-parenscript)
+ ("plump" ,sbcl-plump)
("quri" ,sbcl-quri)
+ ("serapeum" ,sbcl-serapeum)
("sqlite" ,sbcl-cl-sqlite)
("str" ,sbcl-cl-str)
- ("swank" ,cl-slime-swank)
+ ("swank" ,sbcl-slime-swank)
("trivia" ,sbcl-trivia)
("trivial-clipboard" ,sbcl-trivial-clipboard)
("unix-opts" ,sbcl-unix-opts)
("next-download-manager" ,sbcl-next-download-manager)
("next-ring" ,sbcl-next-ring)
("next-history-tree" ,sbcl-next-history-tree)
- ("next-password-manager" ,sbcl-next-password-manager)))
+ ("next-password-manager" ,sbcl-next-password-manager)
+ ("next-hooks" ,sbcl-next-hooks)))
(native-inputs
`(("trivial-features" ,sbcl-trivial-features)
+ ("trivial-types" ,sbcl-trivial-types)
("prove-asdf" ,sbcl-prove-asdf)))
(synopsis "Infinitely extensible web-browser (with Lisp development files)"))))