Re: branch master updated: gnu: nyxt: Update to 2-pre-release-3.

Re: branch master updated: gnu: nyxt: Update to 2-pre-release-3.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 3382 bytes --]

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 :-)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 507 bytes --]

Re: branch master updated: gnu: nyxt: Update to 2-pre-release-3.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 727 bytes --]

Marius Bakke <marius@gnu.org> writes:

> 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 :-)

If you happen to be around right now, can you confirm that there were no
changes to nyxt inputs in 573489fbcd68e3a89cc5c9c66693d3689b1b88bf?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 507 bytes --]

Re: branch master updated: gnu: nyxt: Update to 2-pre-release-3.

[Pierre Neidhardt]

[-- Attachment #1: Type: text/plain, Size: 590 bytes --]

Hi Marius!

Sorry about this! :(

> If you happen to be around right now, can you confirm that there were no
> changes to nyxt inputs in 573489fbcd68e3a89cc5c9c66693d3689b1b88bf?

I don't have a Guix checkout at hand now so I can only tell you tomorrow.
Did you manage to fix the merge conflict?
Otherwise go ahead and I'll fix the Nyxt recipe when you are done.

Out of curiosity: how do commit messages help you here?  Is there an
automated way to report the inputs changes from the comment message?

Sorry for the troubles!

-- 
Pierre Neidhardt
https://ambrevar.xyz/

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 511 bytes --]

Re: branch master updated: gnu: nyxt: Update to 2-pre-release-3.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 1405 bytes --]

Pierre Neidhardt <mail@ambrevar.xyz> writes:

> Hi Marius!
>
> Sorry about this! :(
>
>> If you happen to be around right now, can you confirm that there were no
>> changes to nyxt inputs in 573489fbcd68e3a89cc5c9c66693d3689b1b88bf?
>
> I don't have a Guix checkout at hand now so I can only tell you tomorrow.
> Did you manage to fix the merge conflict?

The merge was resolved in 32787d652460871a79f99b63230f92759e2e0de2.

> Otherwise go ahead and I'll fix the Nyxt recipe when you are done.

Great.  I verified that Nyxt builds on 'staging', but have not tried
running it.

> Out of curiosity: how do commit messages help you here?

It can be difficult to tell from the diff alone which inputs are native,
regular, or propagated.

Often when merging, I need to look at the conflicting commits multiple
times.  Having to deduce the changes every time carries a mental
overhead that is eliminated when I can compare the diff against the
commit message.

In this particular case I ended up writing down the changes for each
conflicting Nyxt commit (21e792, c5d9cd, 573489).  The latter was
especially tricky because it changed the indentation, but ultimately I
found that it had no input changes (by comparing line-for-line).

> Is there an automated way to report the inputs changes from the
> comment message?

I'm not sure what you mean, can you elaborate?

> Sorry for the troubles!

No worries.  :-)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 507 bytes --]

Re: branch master updated: gnu: nyxt: Update to 2-pre-release-3.

[zimoun]

Hi Pierre,

On Sun, 08 Nov 2020 at 16:16, Marius Bakke <marius@gnu.org> wrote:

>> Out of curiosity: how do commit messages help you here?
>
> It can be difficult to tell from the diff alone which inputs are native,
> regular, or propagated.

I had similar difficulties when looking at #31108.  It is easier to find
which commit add/remove/replace what by simply reading the commit
message than to read the diff (raw).  And sometimes the diff is not
enough because there is not enough context and I had to open the file at
the specified commit.  It is no extra time when the commiter does and it
saves a lot of time when someone parse the history.  IMHO.

<http://issues.guix.gnu.org/issue/31108>


All the best,
simon

Re: branch master updated: gnu: nyxt: Update to 2-pre-release-3.

[Pierre Neidhardt]

[-- Attachment #1: Type: text/plain, Size: 469 bytes --]

Understood, thanks!

I've just pushed a fix in 98a15c796afcc91894b7400b1d548cd50604db0c, so
Nyxt should be back to its pristine defintion.

Can't wait for staging to merge, the Common Lisp build-system is vastly
improved!

> > Is there an automated way to report the inputs changes from the
> > comment message?
>
> I'm not sure what you mean, can you elaborate?

Never mind, it's all clear now.

Thanks!

-- 
Pierre Neidhardt
https://ambrevar.xyz/

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 511 bytes --]

Re: branch master updated: gnu: nyxt: Update to 2-pre-release-3.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 651 bytes --]

Pierre Neidhardt <mail@ambrevar.xyz> writes:

> I've just pushed a fix in 98a15c796afcc91894b7400b1d548cd50604db0c, so
> Nyxt should be back to its pristine defintion.

Oh my, thanks for catching that.

I did have the lparallel removal in my notes and distinctly remember
adjusting for it, but obviously messed up at some point.  At least I got
the additions right...

I'm not usually this sloppy with merges, promise!  :-)

> Can't wait for staging to merge, the Common Lisp build-system is vastly
> improved!

I've just fixed a 'totem' test failure.  Unless other regressions show
up it should be ready for merge within a few days.  Testers wanted!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 507 bytes --]

Re: branch master updated: gnu: nyxt: Update to 2-pre-release-3.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 484 bytes --]

Marius Bakke <marius@gnu.org> writes:

> Pierre Neidhardt <mail@ambrevar.xyz> writes:
>
>> Can't wait for staging to merge, the Common Lisp build-system is vastly
>> improved!
>
> I've just fixed a 'totem' test failure.  Unless other regressions show
> up it should be ready for merge within a few days.  Testers wanted!

Speaking of the Common Lisp build system on 'staging', the newly-added
'sbcl-static-dispatch' fails to build when merged or cherry-picked.

Can you look into it?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 507 bytes --]

Re: branch master updated: gnu: nyxt: Update to 2-pre-release-3.

[Pierre Neidhardt]

[-- Attachment #1: Type: text/plain, Size: 457 bytes --]

Marius Bakke <marius@gnu.org> writes:

> Speaking of the Common Lisp build system on 'staging', the newly-added
> 'sbcl-static-dispatch' fails to build when merged or cherry-picked.
>
> Can you look into it?

I haven't tested but this could be fixed by the commit I've just pushed
for cl-environments:

9f78a37f52a12474d1eb61f789b159c4ea3134b7

I'll look into static-dispatch more closely later.

-- 
Pierre Neidhardt
https://ambrevar.xyz/

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 511 bytes --]

Re: branch master updated: gnu: nyxt: Update to 2-pre-release-3.

[Pierre Neidhardt]

[-- Attachment #1: Type: text/plain, Size: 296 bytes --]

Looks like static-dispatch works on staging, but there is an issue with
the new build system for the next package I want to add, generic-cl.

I need to ping Guillaume on that and preferably before merging staging.
I'll open an issue just now.

-- 
Pierre Neidhardt
https://ambrevar.xyz/

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 511 bytes --]

Re: branch master updated: gnu: nyxt: Update to 2-pre-release-3.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 671 bytes --]

Pierre Neidhardt <mail@ambrevar.xyz> writes:

> Marius Bakke <marius@gnu.org> writes:
>
>> Speaking of the Common Lisp build system on 'staging', the newly-added
>> 'sbcl-static-dispatch' fails to build when merged or cherry-picked.
>>
>> Can you look into it?
>
> I haven't tested but this could be fixed by the commit I've just pushed
> for cl-environments:
>
> 9f78a37f52a12474d1eb61f789b159c4ea3134b7
>
> I'll look into static-dispatch more closely later.

I can confirm the above commit works.

I had not realized sbcl-static-dispatch failed to build even on 'master'
initially, did you commit it by mistake?  If I'd known I would not have
let it hold up the merge.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 507 bytes --]

Re: branch master updated: gnu: nyxt: Update to 2-pre-release-3.

[Pierre Neidhardt]

[-- Attachment #1: Type: text/plain, Size: 682 bytes --]

Marius Bakke <marius@gnu.org> writes:

> I can confirm the above commit works.

Cool, thanks!

> I had not realized sbcl-static-dispatch failed to build even on 'master'
> initially, did you commit it by mistake?  If I'd known I would not have
> let it hold up the merge.

Weird, it works for me on be0ebf33aa19dcfd36c7a8d22a53344dc3b4a533

--8<---------------cut here---------------start------------->8---
$ /home/ambrevar/projects/guix/pre-inst-env guix build sbcl-static-dispatch
/gnu/store/zaskkx93qakc1qjss7zxzhwklpvyami0-sbcl-static-dispatch-0.3
--8<---------------cut here---------------end--------------->8---

-- 
Pierre Neidhardt
https://ambrevar.xyz/

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 511 bytes --]

Re: branch master updated: gnu: nyxt: Update to 2-pre-release-3.

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 369 bytes --]

Pierre Neidhardt <mail@ambrevar.xyz> writes:

>> I had not realized sbcl-static-dispatch failed to build even on 'master'
>> initially, did you commit it by mistake?  If I'd known I would not have
>> let it hold up the merge.
>
> Weird, it works for me on be0ebf33aa19dcfd36c7a8d22a53344dc3b4a533

It did not work for me until 9f78a37f52a12474d1eb61f789b159c4ea3134b7.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 507 bytes --]

Re: branch master updated: gnu: nyxt: Update to 2-pre-release-3.

[Pierre Neidhardt]

[-- Attachment #1: Type: text/plain, Size: 553 bytes --]

Marius Bakke <marius@gnu.org> writes:

> It did not work for me until 9f78a37f52a12474d1eb61f789b159c4ea3134b7.

Yes, I had made a mistake by pushing the cl-environments update after
static-dispatch, and I hadn't realised the latter didn't work with the
stable version of cl-environments.  Sorry about that.

I have tons of new Common Lisp packages on the backburner but I
understand that it's just too messy to keep master and staging in sync
so I'll hold my horses until staging is merged ;)

-- 
Pierre Neidhardt
https://ambrevar.xyz/

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 511 bytes --]

Re: branch master updated: gnu: nyxt: Update to 2-pre-release-3.

[Pierre Neidhardt]

[-- Attachment #1: Type: text/plain, Size: 373 bytes --]

Oops, I did it again!

Thousand times sorry, right when I pressed "push" I realize that I forgot
to include the arguments change in the commit message of the 'nyxt'
package update.

This time 2 argument phases have changed.  Let me know if you want me to
update staging.

Too much work these days... Sorry again :(

-- 
Pierre Neidhardt
https://ambrevar.xyz/

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 511 bytes --]