From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id kMEGNBj4pl8WFgAA0tVLHw (envelope-from ) for ; Sat, 07 Nov 2020 19:40:08 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 2DvfLxj4pl+SAwAAbx9fmQ (envelope-from ) for ; Sat, 07 Nov 2020 19:40:08 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 700CF94011C for ; Sat, 7 Nov 2020 19:40:08 +0000 (UTC) Received: from localhost ([::1]:59532 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kbU4E-00053n-Ss for larch@yhetil.org; Sat, 07 Nov 2020 14:40:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58396) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kbU3w-00052O-B6 for guix-devel@gnu.org; Sat, 07 Nov 2020 14:39:49 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:36138) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kbU3v-0000Vx-Ob; Sat, 07 Nov 2020 14:39:47 -0500 Received: from host-37-191-236-253.lynet.no ([37.191.236.253]:60694 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kbU3v-0003r5-5H; Sat, 07 Nov 2020 14:39:47 -0500 From: Marius Bakke To: Pierre Neidhardt Subject: Re: branch master updated: gnu: nyxt: Update to 2-pre-release-3. In-Reply-To: <20201020130843.10939.42161@vcs0.savannah.gnu.org> References: <20201020130843.10939.42161@vcs0.savannah.gnu.org> Date: Sat, 07 Nov 2020 20:39:44 +0100 Message-ID: <87ft5lgdmn.fsf@gnu.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: guix-devel@gnu.org Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Spam-Score: -1.11 X-TUID: OT1rGEeaZmU6 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hello Pierre, guix-commits@gnu.org writes: > commit 21e79225352a5e78aa329b6cd213eb553862c363 > Author: Pierre Neidhardt > AuthorDate: Tue Oct 20 15:06:59 2020 +0200 > > gnu: nyxt: Update to 2-pre-release-3. >=20=20=20=20=20 > * 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 .gi= t 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 li= b) "/lib/girepository-1.0")) > + (string-append (assoc-ref inputs li= b) > + "/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 libosic= at.so. > @@ -571,6 +573,7 @@ driven and does not detract you from your daily work.= ") > ("trivial-package-local-nicknames" ,cl-trivial-package-local-nick= names) > ("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 :-) --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFDBAEBCgAtFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl+m+AAPHG1hcml1c0Bn bnUub3JnAAoJEKKgbfKjOlT6+XcIANJk+mOmsd/CKUHxN8i3+oPUrUK2sWBgwtLq Zv8LigdRBmDz36SEP8Ix3J1XR7C6Al72Tl/+DEpVt0Pilaxg/o0YAtpjqyqBlpyJ 1oShumDc8XgzyxEjQ42RnryMHgwheXmdDvFPaPVemK+kLLeyPBQZTtH2bfI6A2Uq eEOH0sEr28BbKXVBdJzzawPP2qDc2dX5TbLM+R24RCn6NoPFLbEsSQSGd98LH0Mt tAdqXlxrkBl+zF5zn8pRuVdlW/U5y6IVomOGmAK0zFNhq4moBxNL35p4ko8mNUCZ xn29HrXJomNYj6n9lncdx/cII/PBRKQ84YzhJghsZr/OAUePVV8= =DYiV -----END PGP SIGNATURE----- --=-=-=--