Hello Pierre,

guix-commits@gnu.org writes:

> commit 21e79225352a5e78aa329b6cd213eb553862c363
> Author: Pierre Neidhardt <mail@ambrevar.xyz>
> AuthorDate: Tue Oct 20 15:06:59 2020 +0200
>
>     gnu: nyxt: Update to 2-pre-release-3.
>     
>     * gnu/packages/web-browsers.scm (nyxt): Update to 2-pre-release-3.
> ---
>  gnu/packages/web-browsers.scm | 13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)

[...]

> @@ -482,7 +482,8 @@ driven and does not detract you from your daily work.")
>         #:strip-binaries? #f             ; Stripping breaks SBCL binaries.
>         #: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)
>               (let ((version (format #f "~a" ,version))
>                     (file "source/global.lisp"))
> @@ -515,7 +516,8 @@ driven and does not detract you from your daily work.")
>                             ":"))
>                      (gi-path (string-join
>                                (map (lambda (lib)
> -                                     (string-append (assoc-ref inputs lib) "/lib/girepository-1.0"))
> +                                     (string-append (assoc-ref inputs lib)
> +                                                    "/lib/girepository-1.0"))
>                                     libs)
>                                ":"))
>                      (xdg-path (string-join
> @@ -540,6 +542,7 @@ driven and does not detract you from your daily work.")
>       ;; See https://github.com/atlas-engineer/nyxt/issues/680.
>       `(("alexandria" ,cl-alexandria)
>         ("bordeaux-threads" ,cl-bordeaux-threads)
> +       ("cl-chanl" ,cl-chanl)
>         ("cl-containers" ,cl-containers)
>         ("cl-css" ,cl-css)
>         ("cl-json" ,cl-json)
> @@ -555,7 +558,6 @@ driven and does not detract you from your daily work.")
>         ("iolib" ,cl-iolib)
>         ("local-time" ,cl-local-time)
>         ("log4cl" ,cl-log4cl)
> -       ("lparallel" ,cl-lparallel)
>         ("mk-string-metrics" ,cl-mk-string-metrics)
>         ("moptilities" ,cl-moptilities)
>         ("osicat" ,sbcl-osicat)         ; SBCL version needed for libosicat.so.
> @@ -571,6 +573,7 @@ driven and does not detract you from your daily work.")
>         ("trivial-package-local-nicknames" ,cl-trivial-package-local-nicknames)
>         ("trivial-types" ,cl-trivial-types)
>         ("unix-opts" ,cl-unix-opts)
> +       ("usocket" ,cl-usocket)
>         ;; WebKitGTK deps
>         ("cl-cffi-gtk" ,cl-cffi-gtk)
>         ("cl-webkit" ,cl-webkit)

This is a friendly reminder to please list all changes to inputs,
arguments etc in the commit message.  It makes resolving merge conflicts
*much* easier.

Due to SBCL changes on the 'staging' branch, there have been a few
changes to the 'nyxt' inputs; and because the changes from 'master' are
not mentioned in the commit messages, I need to manually look at each
commit and note what has changed in order to resolve the conflict.

(feel free to try merging c2396ceb onto 052939c2 to get an idea of what
I'm talking about :-)