From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id ALalFzHVKl+FNwAA0tVLHw (envelope-from ) for ; Wed, 05 Aug 2020 15:50:09 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id SP+aEzHVKl/SZgAAB5/wlQ (envelope-from ) for ; Wed, 05 Aug 2020 15:50:09 +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 B03D9940983 for ; Wed, 5 Aug 2020 15:50:08 +0000 (UTC) Received: from localhost ([::1]:41758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3Lg6-0001wK-7P for larch@yhetil.org; Wed, 05 Aug 2020 11:50:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3Lg2-0001vq-Hu for guix-patches@gnu.org; Wed, 05 Aug 2020 11:50:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40479) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k3Lg2-00050l-5h for guix-patches@gnu.org; Wed, 05 Aug 2020 11:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k3Lg2-0003Xh-0v for guix-patches@gnu.org; Wed, 05 Aug 2020 11:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42695] [PATCH] gnu: sway: Attempt to update to 1.5 Resent-From: Oleg Pykhalov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 05 Aug 2020 15:50:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42695 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: andremegafone@gmail.com (=?UTF-8?Q?Andr=C3=A9?= Alexandre Gomes) Cc: 42695@debbugs.gnu.org Received: via spool by 42695-submit@debbugs.gnu.org id=B42695.159664258913595 (code B ref 42695); Wed, 05 Aug 2020 15:50:01 +0000 Received: (at 42695) by debbugs.gnu.org; 5 Aug 2020 15:49:49 +0000 Received: from localhost ([127.0.0.1]:52025 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k3Lfp-0003XD-3N for submit@debbugs.gnu.org; Wed, 05 Aug 2020 11:49:49 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:46063) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k3Lfk-0003Wv-91 for 42695@debbugs.gnu.org; Wed, 05 Aug 2020 11:49:48 -0400 Received: by mail-lj1-f196.google.com with SMTP id w25so12798729ljo.12 for <42695@debbugs.gnu.org>; Wed, 05 Aug 2020 08:49:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=RTKK9RUXEG56pj0bP1ENbxpwMKweI6zl1qfgMkwe3JA=; b=oBWkfzTyJ+znWmDIcY+tj+yOlUjqVCcTxGscDBHAuVsCweK7VKreSIFleXbcNGDV0W 6mw8O9hv3WlKUwMxmQqHsT1p2a3SohaA0C53tDo4g+6V12Y0d8vEoEfdlPHEi9mQC+nJ l79DwMoHOYayWNh9OfNzn0jECYK8eDzKe+oOwHU49Vzwju5kyEHfDXK/PG4iOhpMZDrG IAzYWgHvHdLghtUbgBLnHKlWVUEXVzix/oW5DV/l6UMvCsR6D5ZZQCNaTiBi/bp+m2bN NvBa1ta8ak2pKMvqPK4e2zgJZoUlRXuuTNPPXsOv0n+rxs2mzc7tsuMkwWCN2hJQycwW PLAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=RTKK9RUXEG56pj0bP1ENbxpwMKweI6zl1qfgMkwe3JA=; b=hfB5mqaSaJG1fYZhseoPf+nFvKna/6txNTcFV2fFaavnKTZc1wJEyV+3o9gfreGg5K 71f838Xseh2jU2NkSoOXiVfM9yQhbLqX0EhLOID51wswGbRYZv67l1fEBbraTSjPjjWG wR/ZuINBwQQlfzwyulybdcHlLXTlABFmrj+YvgVhTJwLS3867yPKmM9e1tS1tVvN35W/ 4fvVS+6+AcGs89sp8mwjiIrKRg2AOfW57oErTS6PllkNYfsNaiQlsRe55u9sDpIM0MEl 1iZQH2IM32E8ZzTdyLWPP0lN3GgqA1UaK7mfOIkmmIiw+q0z5Gs7sp9RSgA7abGn5Pq+ gqtg== X-Gm-Message-State: AOAM532yA7R2eG3pybTBqDNW/9TTP21mLQV0nyVCNq9szXq8OYQ2Rt1g wz6+j4+2xwdgk2p0KwIP/UEIagfY X-Google-Smtp-Source: ABdhPJw/z6bfDWhmmGnyItPceTu1im6zPTJ452b4CmnXTktwbg3wLbI0y2OTegMry19Dmc/ZTrySkg== X-Received: by 2002:a05:651c:1213:: with SMTP id i19mr1746574lja.191.1596642577461; Wed, 05 Aug 2020 08:49:37 -0700 (PDT) Received: from guixsd (ppp91-122-98-213.pppoe.avangarddsl.ru. [91.122.98.213]) by smtp.gmail.com with ESMTPSA id z18sm608159lji.107.2020.08.05.08.49.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Aug 2020 08:49:36 -0700 (PDT) From: Oleg Pykhalov References: <87mu3cuhcn.fsf@gmail.com> <87ft92hc9c.fsf@gmail.com> Date: Wed, 05 Aug 2020 18:49:33 +0300 In-Reply-To: <87ft92hc9c.fsf@gmail.com> ("=?UTF-8?Q?Andr=C3=A9?= Alexandre Gomes"'s message of "Tue, 04 Aug 2020 12:38:23 +0100") Message-ID: <87eeolqeia.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=oBWkfzTy; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -2.01 X-TUID: A94CULMIZqy3 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi, First of all thank you for your work on sway and meson! andremegafone@gmail.com (Andr=C3=A9 Alexandre Gomes) writes: > $ guix build -L ~/repos/guix/gnu/packages sway As I know it's not enough. Intead you could use: =2D-8<---------------cut here---------------start------------->8--- ~/repos/guix/pre-inst-env guix build sway =2D-8<---------------cut here---------------end--------------->8--- Also, you could run a =E2=80=9Cmake -j3=E2=80=9D command before =E2=80=98./= pre-inst-env=E2=80=99 to spot some compilations errors after changing package recipes. > meson.build:1:0: ERROR: Meson version is 0.53.2 but project requires >>=3D0.54.0 > > But I don't understand why, since I update meson as well. Did you set GUIX_PACKAGE_PATH? You could check with: =2D-8<---------------cut here---------------start------------->8--- ./pre-inst-env env | grep GUIX_PACKAGE_PATH =2D-8<---------------cut here---------------end--------------->8--- which should show GUIX_PACKAGE_PATH=3D or show nothing. [=E2=80=A6] > diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm > index 7213c1bd0b..ecb3551b96 100644 > --- a/gnu/packages/build-tools.scm > +++ b/gnu/packages/build-tools.scm > @@ -179,15 +179,16 @@ files and generates build instructions for the Ninj= a build system.") > (define-public meson > (package > (name "meson") > - (version "0.53.2") > - (source (origin > - (method url-fetch) > - (uri (string-append "https://github.com/mesonbuild/meson/" > - "releases/download/" version "/meson-" > - version ".tar.gz")) > - (sha256 > - (base32 > - "07y2hh9dfn1m9g4bsy49nbn3vdmd0b2iwr8bxg19fhqq6c7q73ry"))= )) > + (version "0.55.0") > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/mesonbuild/meson/") It's OK to use =E2=80=98git-fetch=E2=80=99, and we switch to it in favour o= f =E2=80=98url-fetch=E2=80=99 because of GitHub could regenerate tarballs. But I think thats probably not a =E2=80=98meson=E2=80=99 case. Release tarball could differ from Git repository. Did you succeed to build the =E2=80=98git-fetch=E2=80=99 way (via =E2=80=98pre-inst-env=E2=80= =99)? [=E2=80=A6] > -(define-public meson-for-build > - (package > - (inherit meson) > - (name "meson-for-build") > - (source (origin > - (inherit (package-source meson)) > - (patches (search-patches "meson-for-build-rpath.patch")))) > +;; (define-public meson-for-build > +;; (package > +;; (inherit meson) > +;; (name "meson-for-build") > +;; (source (origin > +;; (inherit (package-source meson)) > +;; (patches (search-patches "meson-for-build-rpath.patch")= ))) >=20=20 > - ;; People should probably install "meson", not "meson-for-build". > - (properties `((hidden? . #t))))) > +;; ;; People should probably install "meson", not "meson-for-build". > +;; (properties `((hidden? . #t))))) Why do you comment =E2=80=98meson-for-build=E2=80=99? First of all don't c= omment things which should be removed, because of Git. ;-) And it's used by: =2D-8<---------------cut here---------------start------------->8--- oleg@guixsd ~/src/guix-master$ grep -RF meson-for-build ~/src/guix-master |= grep '.scm' /home/oleg/src/guix-master/guix/build-system/meson.scm: (module-ref modu= le 'meson-for-build))) =2D-8<---------------cut here---------------end--------------->8--- > (define-public premake4 > (package > diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm > index fb33bd7f6d..60e5a9d395 100644 > --- a/gnu/packages/gl.scm > +++ b/gnu/packages/gl.scm > @@ -233,26 +233,16 @@ also known as DXTn or DXTC) for Mesa.") > (define-public mesa > (package > (name "mesa") > - (version "20.0.7") > - > - ;; Mesa 20.0.5 through 20.0.7 has problems with some graphic drivers= , so > - ;; we need this newer version. > - ;; https://gitlab.freedesktop.org/mesa/mesa/-/issues/2882 > - ;; https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4861 > - (replacement mesa-20.0.8) > - > + (version "20.1.4") > (source > (origin > - (method url-fetch) > - (uri (list (string-append "https://mesa.freedesktop.org/archive/" > - "mesa-" version ".tar.xz") > - (string-append "ftp://ftp.freedesktop.org/pub/mesa/" > - "mesa-" version ".tar.xz") > - (string-append "ftp://ftp.freedesktop.org/pub/mesa/" > - version "/mesa-" version ".tar.xz"))) > + (method git-fetch) > + (uri (git-reference > + (url https://gitlab.freedesktop.org/mesa/mesa/) That url should be a string: =2D-8<---------------cut here---------------start------------->8--- error: https://gitlab.freedesktop.org/mesa/mesa/: unbound variable hint: Did you forget a `use-modules' form? =2D-8<---------------cut here---------------end--------------->8--- > + (commit (string-append name "-" version)))) I think we should use hard-coded "mesa-" as in source urls. [=E2=80=A6] > +;; (define mesa-20.0.8 > +;; (package > +;; (inherit mesa) > +;; (version "20.0.8") > +;; (source (origin > +;; (inherit (package-source mesa)) > +;; (uri (list (string-append "https://mesa.freedesktop.org= /archive/" > +;; "mesa-" version ".tar.xz") > +;; (string-append "ftp://ftp.freedesktop.org/pu= b/mesa/" > +;; "mesa-" version ".tar.xz"))) > +;; (sha256 > +;; (base32 > +;; "0v0bfh3ay07s6msxmklvwfaif0q02kq2yhy65fdhys49vw8c1w3c= ")))))) Same thing about commenting unused code. Just remove it. Everything else looks OK, but could you split this big patch by =E2=80=9Cpa= tch per package upgrade=E2=80=9D? Thanks, Oleg. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEcjhxI46s62NFSFhXFn+OpQAa+pwFAl8q1Q0ACgkQFn+OpQAa +pyB/Q//fv2nYvkkiYaxN4ExmEverxU+aya3d0giBUptaZc6IxNOCCBGlURk8k2g Wy1h4PeFH7SDJpehzutPvBsCGEnssJQPATToM5bYqhkQ3cMocl2rmjf1tZlinC8C 3dS19Wp4wAl9Cld96PgM4ZqbcytTE1KYGhbMmYQK+HePGKzhjy/JFunkvJz2sTXA HcLfydF2qbzxMiz9Bj43yYmWKYQoNHPOGE4ip3yeEPrBoWF8rRJBKKK8TZ6Trcwh jO/t42AwscT7sfSRXvYblW/LzdN4+6u/0mB7RMQCePIuAwfLlJKm2NoenPXzOj+2 w4RWU8wZGQnENmRMqu3W/CUj3I2MmR7pLXy+bVeUAqBI2Ey2oY01l72ZldSJ5Xj4 tU6MjSuvLbgyHywPeIlU+yn857e+fGV6p0HK9awYqP2vx2tEVRUJJZ35OizGOvNx BzMMA9oQlY7t40gUuaZKWAwIAJ5s/UxbGAWETDEMSioTw1f5N59L+STCicA0lRBy dVuSuK1wRn4ISMMR4dSZPCZsueRkS47MZDDSg+xX2IJ+u8Dv1SHA8htxSypLExmR C3m3Ss/fQg/ox2dpZceaXDEmZVPIL5Cmh0Ml+ua4Okc0+oW+cfB2vkrjbDpus8GO Wu0MLqZTEXjPbI0K2jpncvQ8ZcVix4mS9ljV50BEDoP8O7XTg6w= =v0sB -----END PGP SIGNATURE----- --=-=-=--