gnu: nyxt: Update to 2-pre-release-3.

* gnu/packages/web-browsers.scm (nyxt): Update to 2-pre-release-3.
This commit is contained in:
Pierre Neidhardt 2020-10-20 15:06:59 +02:00
parent 1c498b9e42
commit 21e7922535
No known key found for this signature in database
GPG key ID: 9BDCF497A4BBCC7F

View file

@ -461,7 +461,7 @@ (define-public nyxt
(name "nyxt") (name "nyxt")
;; Package the pre-release because latest stable 1.5.0 does not build ;; Package the pre-release because latest stable 1.5.0 does not build
;; anymore. ;; anymore.
(version "2-pre-release-2") (version "2-pre-release-3")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -472,7 +472,7 @@ (define-public nyxt
(commit version))) (commit version)))
(sha256 (sha256
(base32 (base32
"0wqq8ppn0n7js3pxzzb36h0lf3r3gqhs2hi8h85c3n8a54hnbp8q")) "16crhc89hpvzkms5fypq9vdrf7glidqwh7yvy5cdmjdq4v7fkmy4"))
(file-name (git-file-name "nyxt" version)))) (file-name (git-file-name "nyxt" version))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -482,7 +482,8 @@ (define-public nyxt
#:strip-binaries? #f ; Stripping breaks SBCL binaries. #:strip-binaries? #f ; Stripping breaks SBCL binaries.
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-version ; Version is guessed from .git which Guix does not have. ;; Version is guessed from .git which Guix does not have.
(add-after 'unpack 'patch-version
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((version (format #f "~a" ,version)) (let ((version (format #f "~a" ,version))
(file "source/global.lisp")) (file "source/global.lisp"))
@ -515,7 +516,8 @@ (define-public nyxt
":")) ":"))
(gi-path (string-join (gi-path (string-join
(map (lambda (lib) (map (lambda (lib)
(string-append (assoc-ref inputs lib) "/lib/girepository-1.0")) (string-append (assoc-ref inputs lib)
"/lib/girepository-1.0"))
libs) libs)
":")) ":"))
(xdg-path (string-join (xdg-path (string-join
@ -540,6 +542,7 @@ (define-public nyxt
;; See https://github.com/atlas-engineer/nyxt/issues/680. ;; See https://github.com/atlas-engineer/nyxt/issues/680.
`(("alexandria" ,cl-alexandria) `(("alexandria" ,cl-alexandria)
("bordeaux-threads" ,cl-bordeaux-threads) ("bordeaux-threads" ,cl-bordeaux-threads)
("cl-chanl" ,cl-chanl)
("cl-containers" ,cl-containers) ("cl-containers" ,cl-containers)
("cl-css" ,cl-css) ("cl-css" ,cl-css)
("cl-json" ,cl-json) ("cl-json" ,cl-json)
@ -555,7 +558,6 @@ (define-public nyxt
("iolib" ,cl-iolib) ("iolib" ,cl-iolib)
("local-time" ,cl-local-time) ("local-time" ,cl-local-time)
("log4cl" ,cl-log4cl) ("log4cl" ,cl-log4cl)
("lparallel" ,cl-lparallel)
("mk-string-metrics" ,cl-mk-string-metrics) ("mk-string-metrics" ,cl-mk-string-metrics)
("moptilities" ,cl-moptilities) ("moptilities" ,cl-moptilities)
("osicat" ,sbcl-osicat) ; SBCL version needed for libosicat.so. ("osicat" ,sbcl-osicat) ; SBCL version needed for libosicat.so.
@ -571,6 +573,7 @@ (define-public nyxt
("trivial-package-local-nicknames" ,cl-trivial-package-local-nicknames) ("trivial-package-local-nicknames" ,cl-trivial-package-local-nicknames)
("trivial-types" ,cl-trivial-types) ("trivial-types" ,cl-trivial-types)
("unix-opts" ,cl-unix-opts) ("unix-opts" ,cl-unix-opts)
("usocket" ,cl-usocket)
;; WebKitGTK deps ;; WebKitGTK deps
("cl-cffi-gtk" ,cl-cffi-gtk) ("cl-cffi-gtk" ,cl-cffi-gtk)
("cl-webkit" ,cl-webkit) ("cl-webkit" ,cl-webkit)