;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 John Darrington <jmd@gnu.org>
-;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; 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>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Timo Eisenmann <eisenmann@fn.de>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
+;;; Copyright © 2019 Clément Lassieur <clement@lassieur.org>
+;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (gnu packages libevent)
#:use-module (gnu packages libidn)
#:use-module (gnu packages lisp)
+ #:use-module (gnu packages lisp-xyz)
#:use-module (gnu packages lua)
#:use-module (gnu packages gnome)
#:use-module (gnu packages ncurses)
(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"))))
("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
(package
(name "links")
- (version "2.18")
+ (version "2.20.2")
(source (origin
(method url-fetch)
(uri (string-append "http://links.twibright.com/download/"
- name "-" version ".tar.bz2"))
- (sha256
+ "links-" version ".tar.bz2"))
+ (sha256
(base32
- "0mwhh61klicn2vwk39nc7y4cw4mygzdi2nljn4r0gjbw6jmw3337"))))
+ "097ll98ympzfx7qfdyhc52yzvsp167x5nnjs6v8ih496wv80fksb"))))
(build-system gnu-build-system)
(arguments
`(#:phases
(name "luakit")
(version "2.1")
(source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/luakit/luakit/archive/" version
- ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/luakit/luakit.git")
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "09kgsm2w2xa4xwylsi0bwjvdl9k6hkyjyyrq2i3l8bvi2qrs5gzc"))
- (file-name (string-append name "-" version ".tar.gz"))))
+ "1qa90caxv1k6ak88fn0a7n7h0c4iv8szw6zn2axch8ig83i86az2"))))
(inputs
`(("lua-5.1" ,lua-5.1)
("gtk+" ,gtk+)
("perl" ,perl)))
(inputs `(("ncurses" ,ncurses)
("libidn" ,libidn)
- ("gnutls" ,gnutls)
+ ("openssl" ,openssl)
("libgcrypt" ,libgcrypt)
("unzip" ,unzip)
("zlib" ,zlib)
("bzip2" ,bzip2)))
(arguments
`(#:configure-flags
- (let ((gnutls (assoc-ref %build-inputs "gnutls")))
+ (let ((openssl (assoc-ref %build-inputs "openssl")))
`("--with-pkg-config"
"--with-screen=ncurses"
"--with-zlib"
"--with-bzlib"
- ,(string-append "--with-gnutls=" gnutls)
+ ,(string-append "--with-ssl=" openssl)
;; "--with-socks5" ; XXX TODO
"--enable-widec"
"--enable-ascii-ctypes"
the WWW, or to build information systems intended primarily for local
access.")
(home-page "https://lynx.invisible-island.net/")
+ ;; This was fixed in 2.8.9dev.10.
+ (properties `((lint-hidden-cve . ("CVE-2016-9179"))))
(license license:gpl2)))
(define-public qutebrowser
(package
(name "qutebrowser")
- (version "0.11.0")
+ (version "1.10.0")
(source
(origin
(method url-fetch)
- (uri (string-append "https://github.com/The-Compiler/"
+ (uri (string-append "https://github.com/qutebrowser/"
"qutebrowser/releases/download/v" version "/"
"qutebrowser-" version ".tar.gz"))
(sha256
(base32
- "13ihx66jm1dd6vx8px7pm0kbzf2sf9x43hhivc1rp17kahnxxdyv"))))
+ "1prvd3cysmcjfybn0dmr3ih0bl6lm5ml9i7wd09fn8hb7047mkby"))))
(build-system python-build-system)
(native-inputs
- `(("asciidoc" ,asciidoc)))
+ `(("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
- `(#:tests? #f ;no tests
+ `(;; 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
(lambda (i)
(let ((src (format #f "icons/qutebrowser-~dx~d.png" i i))
'(16 24 32 48 64 128 256 512))
(install-file "icons/qutebrowser.svg"
(string-append hicolor "/scalable/apps"))
-
- (substitute* "qutebrowser.desktop"
+ (substitute* "misc/org.qutebrowser.qutebrowser.desktop"
(("Exec=qutebrowser")
(string-append "Exec=" out "/bin/qutebrowser")))
- (install-file "qutebrowser.desktop" app)
+ (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.3.0")
+ (version "3.6.0")
(source
(origin
(method git-fetch)
(url "https://github.com/fanglingsu/vimb/")
(commit version)))
(sha256
- (base32
- "1qg18z2gnsli9qgrqfhqfrsi6g9mcgr90w8yab28nxrq4aha6brf"))
+ (base32 "0228khh3lqbal046k6akqah7s5igq9s0wjfjbdjam75kjj42pbhj"))
(file-name (git-file-name name version))))
(build-system glib-or-gtk-build-system)
(arguments
- '(#:tests? #f ; no tests
+ '(#:tests? #f ; no tests
#:make-flags (list "CC=gcc"
"DESTDIR="
(string-append "PREFIX=" %output))
driven and does not detract you from your daily work.")
(license license:gpl3+)))
-(define-public next-gtk-webkit
+(define next-gtk-webkit
(package
(name "next-gtk-webkit")
- (version "1.2.0")
+ (version "1.5.0")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://source.atlas.engineer/public/next")
+ ;; TODO: Mirror seems to hang, let's fallback to GitHub for now.
+ ;; (url "https://source.atlas.engineer/public/next")
+ (url "https://github.com/atlas-engineer/next")
(commit version)))
(sha256
(base32
- "0a066f56hnb9znbwnv1blm31j0ysv05n4wzlkli0zgw087c9047x"))
+ "1gqkp185wcwaxr8py90hqk44nqjblrrdwvig19gizrbzr2gx2zhy"))
(file-name (git-file-name "next" version))))
(build-system glib-or-gtk-build-system)
(arguments
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://next.atlas.engineer")
- (synopsis "Infinitely extensible web-browser (user interface only)")
+ (synopsis "Extensible web-browser in Common Lisp")
(description "Next is a keyboard-oriented, extensible web-browser
-inspired by Emacs and designed for power users. The application has familiar
-key-bindings, is fully configurable and extensible in Lisp, and has powerful
-features for productive professionals.")
+designed for power users. The application has familiar Emacs and VI
+key-bindings and is fully configurable and extensible in Common Lisp.")
(license license:bsd-3)))
-(define-public sbcl-next
+(define sbcl-next-download-manager
(package
(inherit next-gtk-webkit)
- (name "sbcl-next")
+ (name "sbcl-next-download-manager")
(build-system asdf-build-system/sbcl)
- (outputs '("out" "lib"))
(arguments
- `(#:tests? #f ; no tests
- #:phases (modify-phases %standard-phases
- (add-after 'unpack 'patch-platform-port-path
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "source/ports/gtk-webkit.lisp"
- (("\"next-gtk-webkit\"")
- (string-append "\"" (assoc-ref inputs "next-gtk-webkit")
- "/bin/next-gtk-webkit\"")))))
- (add-before 'cleanup 'move-bundle
- (lambda* (#:key outputs #:allow-other-keys)
- (define lib (assoc-ref outputs "lib"))
- (define actual-fasl (string-append
- lib
- "/lib/sbcl/next.fasl"))
- (define expected-fasl (string-append
- lib
- "/lib/sbcl/next--system.fasl"))
- (copy-file actual-fasl expected-fasl)
- #t))
- (add-after 'create-symlinks 'build-program
- (lambda* (#:key outputs #:allow-other-keys)
- (build-program
- (string-append (assoc-ref outputs "out") "/bin/next")
- outputs
- #:entry-program '((next:start-with-port) 0))))
- (add-before 'build 'install-assets
- ;; Since the ASDF build system generates a new .asd with a
- ;; possibly suffixed and thus illegal version number, assets
- ;; should not be installed after the 'build phase or else
- ;; the illegal version will result in NIL in the .desktop
- ;; file.
- (lambda* (#:key outputs #:allow-other-keys)
- (with-output-to-file "version"
- (lambda _
- (format #t "~a" ,(package-version next-gtk-webkit))))
- (invoke "make" "install-assets"
- (string-append "PREFIX="
- (assoc-ref outputs "out"))))))))
+ `(#:tests? #f ; Need online access.
+ #:asd-file "next.asd"
+ #:asd-system-name "next/download-manager"))
+ (inputs
+ `(("cl-ppcre" ,sbcl-cl-ppcre)
+ ("dexador" ,sbcl-dexador)
+ ("log4cl" ,sbcl-log4cl)
+ ("lparallel" ,sbcl-lparallel)
+ ("quri" ,sbcl-quri)
+ ("str" ,sbcl-cl-str)))
+ (native-inputs
+ `(("trivial-features" ,sbcl-trivial-features)
+ ("prove-asdf" ,sbcl-prove-asdf)))
+ (synopsis "Extensible web-browser in Common Lisp (download manager)")))
+
+(define sbcl-next-ring
+ (package
+ (inherit next-gtk-webkit)
+ (name "sbcl-next-ring")
+ (build-system asdf-build-system/sbcl)
+ (arguments
+ `(#:tests? #t
+ #:asd-file "next.asd"
+ #:asd-system-name "next/ring"))
+ (native-inputs
+ `(("trivial-features" ,sbcl-trivial-features)
+ ("prove-asdf" ,sbcl-prove-asdf)))
+ (synopsis "Extensible web-browser in Common Lisp (ring)")))
+
+(define sbcl-next-history-tree
+ (package
+ (inherit next-gtk-webkit)
+ (name "sbcl-next-history-tree")
+ (build-system asdf-build-system/sbcl)
+ (arguments
+ `(#:tests? #t
+ #:asd-file "next.asd"
+ #:asd-system-name "next/history-tree"))
+ (native-inputs
+ `(("trivial-features" ,sbcl-trivial-features)
+ ("prove-asdf" ,sbcl-prove-asdf)))
+ (synopsis "Extensible web-browser in Common Lisp (history-tree)")))
+
+(define sbcl-next-password-manager
+ (package
+ (inherit next-gtk-webkit)
+ (name "sbcl-next-password-manager")
+ (build-system asdf-build-system/sbcl)
+ (arguments
+ `(#:tests? #t
+ #:asd-file "next.asd"
+ #:asd-system-name "next/password-manager"))
(inputs
- `(("next-gtk-webkit" ,next-gtk-webkit)
- ;; Lisp libraries:
- ("trivial-features" ,sbcl-trivial-features)
- ("alexandria" ,sbcl-alexandria)
- ("cl-strings" ,sbcl-cl-strings)
- ("cl-string-match" ,sbcl-cl-string-match)
- ("puri" ,sbcl-puri)
- ("sqlite" ,sbcl-cl-sqlite)
- ("parenscript" ,sbcl-parenscript)
- ("cl-json" ,sbcl-cl-json)
- ("swank" ,sbcl-slime-swank)
- ("cl-markup" ,sbcl-cl-markup)
- ("cl-css" ,sbcl-cl-css)
- ("bordeaux-threads" ,sbcl-bordeaux-threads)
- ("s-xml-rpc" ,sbcl-s-xml-rpc)
- ("unix-opts" ,sbcl-unix-opts)
+ `(("bordeaux-threads" ,sbcl-bordeaux-threads)
+ ("cl-annot" ,sbcl-cl-annot)
+ ("cl-ppcre" ,sbcl-cl-ppcre)
+ ("str" ,sbcl-cl-str)
("trivial-clipboard" ,sbcl-trivial-clipboard)))
- (synopsis "Infinitely extensible web-browser (with Lisp development files)")))
+ (native-inputs
+ `(("trivial-features" ,sbcl-trivial-features)
+ ("prove-asdf" ,sbcl-prove-asdf)))
+ (synopsis "Extensible web-browser in Common Lisp (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)))
+ (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
+ (inherit next-gtk-webkit)
+ (name "next")
+ (build-system asdf-build-system/sbcl)
+ (outputs '("out" "lib"))
+ (arguments
+ `(#:tests? #f ; no tests
+ #:asd-system-name "next"
+ #:phases (modify-phases %standard-phases
+ (add-after 'unpack 'patch-platform-port-path
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "source/ports/gtk-webkit.lisp"
+ (("\"next-gtk-webkit\"")
+ (string-append "\"" (assoc-ref inputs "next-gtk-webkit")
+ "/bin/next-gtk-webkit\"")))
+ #t))
+ (add-after 'patch-platform-port-path 'patch-version
+ ;; When the version is not just dot-separated numerals
+ ;; (e.g. a git-commit version), Guix modifies the .asd with
+ ;; an illegal version number, and then Next fails to query
+ ;; it. So we hard-code it here.
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((version (format #f "~a" ,version)))
+ (substitute* "source/global.lisp"
+ (("version\\)\\)\\)")
+ (string-append "version)))
+(setf +version+ \"" version "\")"))))
+ #t))
+ (add-before 'cleanup 'move-bundle
+ (lambda* (#:key outputs #:allow-other-keys)
+ (define lib (assoc-ref outputs "lib"))
+ (define actual-fasl (string-append
+ lib
+ "/lib/sbcl/next.fasl"))
+ (define expected-fasl (string-append
+ lib
+ "/lib/sbcl/next--system.fasl"))
+ (copy-file actual-fasl expected-fasl)
+ #t))
+ (add-after 'create-symlinks 'build-program
+ (lambda* (#:key outputs #:allow-other-keys)
+ (build-program
+ (string-append (assoc-ref outputs "out") "/bin/next")
+ outputs
+ #:entry-program '((next:entry-point) 0))))
+ (add-before 'build 'install-assets
+ ;; Since the ASDF build system generates a new .asd with a
+ ;; possibly suffixed and thus illegal version number, assets
+ ;; should not be installed after the 'build phase or else
+ ;; the illegal version will result in NIL in the .desktop
+ ;; file.
+ (lambda* (#:key outputs #:allow-other-keys)
+ (with-output-to-file "version"
+ (lambda _
+ (format #t "~a" ,(package-version next-gtk-webkit))))
+ (invoke "make" "install-assets"
+ (string-append "PREFIX="
+ (assoc-ref outputs "out")))))
+ (add-after 'unpack 'fix-lambda-list
+ ;; Starting from SBCL 2.0.2, Next 1.5.0 won't build
+ ;; because of a weird lambda list type.
+ (lambda _
+ (substitute* "source/keymap.lisp"
+ (("^\\(declaim .* define-key\\)\\)") ""))
+ (substitute* "source/search-buffer.lisp"
+ (("define-key :keymap keymap \"C-s\"") "define-key \"C-s\"")
+ (("\\(update-selection-highlight-hint :follow t :scroll t\\)\\)\\)")
+ "(update-selection-highlight-hint :follow t :scroll t)) :keymap keymap)")))))))
+ (inputs
+ `(("alexandria" ,sbcl-alexandria)
+ ("bordeaux-threads" ,sbcl-bordeaux-threads)
+ ("cl-annot" ,sbcl-cl-annot)
+ ("cl-ansi-text" ,sbcl-cl-ansi-text)
+ ("cl-css" ,sbcl-cl-css)
+ ("cl-json" ,sbcl-cl-json)
+ ("cl-markup" ,sbcl-cl-markup)
+ ("cl-ppcre" ,sbcl-cl-ppcre)
+ ("cl-ppcre-unicode" ,sbcl-cl-ppcre-unicode)
+ ("cl-prevalence" ,sbcl-cl-prevalence)
+ ("closer-mop" ,sbcl-closer-mop)
+ ("dbus" ,cl-dbus)
+ ("dexador" ,sbcl-dexador)
+ ("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" ,sbcl-slime-swank)
+ ("trivia" ,sbcl-trivia)
+ ("trivial-clipboard" ,sbcl-trivial-clipboard)
+ ("unix-opts" ,sbcl-unix-opts)
+ ;; Local deps
+ ("next-gtk-webkit" ,next-gtk-webkit)
+ ("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-hooks" ,sbcl-next-hooks)))
+ (native-inputs
+ `(("trivial-features" ,sbcl-trivial-features)
+ ("trivial-types" ,sbcl-trivial-types)
+ ("prove-asdf" ,sbcl-prove-asdf)))
+ (synopsis "Extensible web-browser in Common Lisp"))))
+
+(define-public sbcl-next
+ (deprecated-package "sbcl-next" next))
HCoop / jackhill / guix / guix.git / blobdiff