From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:18:28 2021 Received: (at submit) by debbugs.gnu.org; 29 Sep 2021 22:18:28 +0000 Received: from localhost ([127.0.0.1]:50559 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhuG-0000W3-La for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:18:28 -0400 Received: from lists.gnu.org ([209.51.188.17]:44854) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhuE-0000Vv-Qz for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:18:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43870) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhuE-0005Rl-Br for guix-patches@gnu.org; Wed, 29 Sep 2021 18:18:26 -0400 Received: from michel.telenet-ops.be ([2a02:1800:110:4::f00:18]:35576) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhuA-0008GK-MU for guix-patches@gnu.org; Wed, 29 Sep 2021 18:18:26 -0400 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by michel.telenet-ops.be with bizsmtp id zyJH2500A0mfAB406yJHid; Thu, 30 Sep 2021 00:18:17 +0200 Message-ID: Subject: [PATCH core-updates 00/38] Clean up TODO(core-updates) From: Maxime Devos To: guix-patches@gnu.org Date: Thu, 30 Sep 2021 00:18:11 +0200 Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-Q7SHRPx0IrIbMYDLNfQF" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953898; bh=UQUBJMx4/pyiTxQqYgRw619Y+JEECs+PEZbLx6bTOMw=; h=Subject:From:To:Date; b=ROkU1emTRDLIyfuSt3P/qxk8/8qXPDJbZSI7eH7c3JQjKUGGu1Ysw584PlUyUG5sp WUH0ittpf1Sv567pAKwwvx7KdzoWdEgW6NBEBKdwNMNKdEf+9IlZ0GaeFLEPpOY6YB 2SayCEkPEJkCEv6arY/qQzLSQGddHR9+sF/KHHb8RrILAjMErxJ2lkk/Mlno9mAZ3c CNYuBSB3suLHdWhVEzaVYvVSHtew3b/hr82ThKmYwnJC4PJAUd5RRYnfTzqoPcD5VT Sq1beUWx6Ate2Ul+Om2XYHvrfdkjV6cElNbjabMM82ETqYwaARmsahIkP90GqUUx5a RPInc7B3EGc8w== Received-SPF: pass client-ip=2a02:1800:110:4::f00:18; envelope-from=maximedevos@telenet.be; helo=michel.telenet-ops.be X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) --=-Q7SHRPx0IrIbMYDLNfQF Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hi guix, This addresses things like ;; TODO(core-updates): make this unconditional `(,@(if (%current-target-system) `(("bash-minimal" ,bash-minimal)) ; for glib-or-gtk-wrap '()) It also introduces a mozilla-build-system, which is like gnu-build-system except it overrides --target and --host to what mozilla software expects and uses it for all Mozilla software I could identify that needs this. I also removed a 'canonical-package' in isc-dhcp's input, because as I understand it, =E2=80=98canonical packages=E2=80=99 aren't supposed to appe= ar in the references, except for gcc:lib and glibc perhaps? (Not 100% sure, but noone suggested using canonical-package when I told people to add bash-minimal to package inputs.) I also added a #:sh argument to wrap-qt-program to address a TODO(core-upda= tes) in guix/lint.scm and for consistency with wrap-program, but didn't test it because of the many rebuilds. I noted #:tests? wasn't respected in some packages I modified, which I fixe= d in a few places. I also removed trailing #t for some packages. avahi and atk appear to (cross-)compile. (I reverted =E2=80=98build/minetest-build-system: Move png-file? to (guix build utils).= =E2=80=99 first to avoid some rebuilds though.) Greetings, Maxime --=-Q7SHRPx0IrIbMYDLNfQF Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYVTmIxccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7vJQAQD2475ka+U0xhwd/fjgAzulssIo c9RzZ0e17KbLlmHLfAEAq3laihropV5YKcWmncPzg6ZCuwiV7PZrjAW1YDswgwQ= =BfJu -----END PGP SIGNATURE----- --=-Q7SHRPx0IrIbMYDLNfQF-- From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:19:45 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:19:45 +0000 Received: from localhost ([127.0.0.1]:50569 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvU-0000YL-W2 for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:45 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36080) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvT-0000Y7-HO for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:44 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKiQb; Thu, 30 Sep 2021 00:19:42 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 01/38] build-system/mozilla: New build system. Date: Thu, 30 Sep 2021 00:19:01 +0200 Message-Id: <20210929221938.17168-1-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953982; bh=tRe/SP6zDpvDlMFKqJda6hJ9JUQl5naYZ7nUKbvvQss=; h=From:To:Cc:Subject:Date; b=AD2Swnyawo9si82BJ8wWeJjnZgmGlvk3FgqZVX4MlkpZNh3NpMr2Cig8dMZLe9FVZ HMEVPNyl+wruZsw3Mnvv9l63lt9z1kg/DiK2BLn2+KM/ErY7yGTibmFFwH3W3AE5F8 c0mcZJZaOpO2L6o2hcBtdgOtA0rfxRGKgwltRJi9cARffZgJVCHZeKBsf7vLniMhTi pXpeHyMjNBeD38Z1ZViS7usFA7MJQ+1R8Fv1Cac/rhdmefO9hhEvcPke8GPmGZ8tnX gB0hdGfSAKKdRmnS89ON0AmTamwUgRL0b0TTsivIwC3x1GtWUblQB1b9ZePjisEy5Q e7yrN57G0EEww== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * guix/build-system/mozilla.scm (lower-mozilla): New procedure. (mozilla-build-system): New variable. * Makefile.am (MODULES): Add it. --- Makefile.am | 1 + guix/build-system/mozilla.scm | 52 +++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 guix/build-system/mozilla.scm diff --git a/Makefile.am b/Makefile.am index 56f60278b7..76166f4eec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -140,6 +140,7 @@ MODULES = \ guix/build-system/font.scm \ guix/build-system/go.scm \ guix/build-system/meson.scm \ + guix/build-system/mozilla.scm \ guix/build-system/minify.scm \ guix/build-system/minetest.scm \ guix/build-system/asdf.scm \ diff --git a/guix/build-system/mozilla.scm b/guix/build-system/mozilla.scm new file mode 100644 index 0000000000..b4141c8177 --- /dev/null +++ b/guix/build-system/mozilla.scm @@ -0,0 +1,52 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Maxime Devos +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix build-system mozilla) + #:use-module (guix build-system gnu) + #:use-module (guix build-system) + #:use-module (guix utils) + #:export (mozilla-build-system)) + +;; +;; Build procedure for packages using Autotools with the Mozillian conventions +;; for --target, --host and --build, which are different from the GNU +;; conventions. +;; +;; Code: + +(define* (lower-mozilla name #:key system target #:allow-other-keys + #:rest arguments) + (define lower (build-system-lower gnu-build-system)) + (if target + (apply lower + (substitute-keyword-arguments arguments + ;; Override --target and --host to what Mozillian configure + ;; scripts expect. + ((#:configure-flags configure-flags ''()) + `(cons* ,(string-append "--target=" target) + ,(string-append "--host=" (nix-system->gnu-triplet system)) + ,configure-flags)))) + (apply lower name arguments))) ; not cross-compiling + +(define mozilla-build-system + (build-system + (name 'mozilla) + (description "The build system for Mozilla software using the Autotools") + (lower lower-mozilla))) + +;;; mozilla.scm ends here base-commit: 0cccc2f52cedd9b0e0646cc4d3ae64a886f2db6b -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:19:46 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:19:46 +0000 Received: from localhost ([127.0.0.1]:50573 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvV-0000YO-Iu for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:46 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36094) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvU-0000Y9-4H for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:44 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKjQf; Thu, 30 Sep 2021 00:19:43 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 02/38] gnu: nspr: Use mozilla-build-system. Date: Thu, 30 Sep 2021 00:19:02 +0200 Message-Id: <20210929221938.17168-2-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953983; bh=vljAjo3/PZeUZYRN1VIkfQoAGE+KBNPQ84xN0OBM6bY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZSrO/U1iwjwjwgPhl5FyixUEOy7M2gEKlOSF3bXwWttfkRJzUoxDbl/uZkN/jjmgx TgNN4Hc7MXk8fqIX19AB2nrWoA1/oElTNr4lOG0f8TaRPCblGJDv4syM/+0kp3oc5X 5/49TICLltmu8bmPoYlomOEjunZHFJmG+X9goSkdoO/QTREOLcIA4fy6mtEc96GjKF yPN/ick58ojbR7AYJCHStqXYSwFPR4yuqB3svoZKEGq3+o5+xb09C8dl2acD3GI6KG f6o9OZcN6z+fMqhT/p5vhQBYhY53WMhkH2OtBKxSIeMwmfOcCT6Skyqzl+RhFjyWQt TVrq0OEE2F5sg== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/nss.scm (nspr)[build-system]: Adjust it. (nspr)[arguments]<#:configure-flags>: Remove now superfluous --target and --host. --- gnu/packages/nss.scm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 381756e387..6196ad692d 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -29,6 +29,7 @@ #:use-module (guix gexp) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (guix build-system mozilla) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) #:use-module (gnu packages bash) @@ -49,7 +50,7 @@ (sha256 (base32 "1j5b2m8cjlhnnv8sq34587avaagkqvh521w4f95miwgvsn3xlaap")))) - (build-system gnu-build-system) + (build-system mozilla-build-system) (inputs ;; TODO(core-updates): Make these inputs unconditional. ;; For 'compile-et.pl' and 'nspr-config'. @@ -72,16 +73,7 @@ (list "--disable-static" "--enable-64bit" (string-append "LDFLAGS=-Wl,-rpath=" - (assoc-ref %outputs "out") "/lib") - ;; Mozilla deviates from Autotools conventions - ;; due to historical reasons. Adjust to Mozilla conventions, - ;; otherwise the Makefile will try to use TARGET-gcc - ;; as a ‘native’ compiler. - ,@(if (%current-target-system) - `(,(string-append "--host=" - (nix-system->gnu-triplet (%current-system))) - ,(string-append "--target=" (%current-target-system))) - '())) + (assoc-ref %outputs "out") "/lib")) ;; Use fixed timestamps for reproducibility. #:make-flags '("SH_DATE='1970-01-01 00:00:01'" ;; This is epoch 1 in microseconds. -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:04 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:04 +0000 Received: from localhost ([127.0.0.1]:50607 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvd-0000ZY-B1 for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:04 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36094) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvV-0000Y9-7c for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:45 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKkQn; Thu, 30 Sep 2021 00:19:44 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 04/38] gnu: icecat: Use mozilla-build-system. Date: Thu, 30 Sep 2021 00:19:04 +0200 Message-Id: <20210929221938.17168-4-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953985; bh=sTdB+hC/jnMw4GG2vc6eHlsT6AH09md3iN1TflsFCgk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UMiAbkjskx+bcaCRrV9zfI87CIom54l8i4K31R1F1pGL1x+Tg4GD4OpQeTCtRg7Tj pZtAaTL0Mlj8zy1ugDCfvzWOARmx5YnsBwh+rO3XkRmMkJMaqmqfDZOy3iz2HhHAXb 02jf66XisZYpMSK5+dMIufJe/cpNlil3pOwpwijJjIF2B7xRXr7sj2TXi2DCAiolxG 48UL5hv/NMleKyhZnTMKChj8/B26cLZ2nD48qKBFT4+KeBISPCj1VMsMd/+2tzSAzL WbBgl5gUcNlAi53zrUi5yqV+F61ja1uGGxO5Z48ei6Fe0uWByOQiu1AZ6kM/VZMTRd wfhqiiwAFkyqA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This doesn't actually have any effect because the 'configure' phase is replaced. * gnu/packages/gnuzilla.scm (icecat)[build-system]: Use mozilla-build-system. --- gnu/packages/gnuzilla.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 9647bb7db5..655b0c04c3 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -884,7 +884,7 @@ from forcing GEXP-PROMISE." (name "icecat") (version %icecat-version) (source icecat-source) - (build-system gnu-build-system) + (build-system mozilla-build-system) (inputs `(("alsa-lib" ,alsa-lib) ("bzip2" ,bzip2) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:06 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:07 +0000 Received: from localhost ([127.0.0.1]:50647 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvo-0000c2-Mh for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:06 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36154) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvW-0000YW-9u for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:46 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKlQs; Thu, 30 Sep 2021 00:19:45 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 05/38] build/minetest-build-system: Move png-file? to (guix build utils). Date: Thu, 30 Sep 2021 00:19:05 +0200 Message-Id: <20210929221938.17168-5-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953985; bh=VVt3ntCLp/UoKgWoBp+TFdwruGuf+mFnPp+kfLWP5Y0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IuYSgdTT2H5PPz6mxdIGKK1JknMtg6UV5IELIcyt+HWVEFioRLLNTyuuirZsNrhog wkj0yy29ymh1gm7nToV+dFyLzVf7CPzoFR54p/S2x9xz3i04aBLGTSHQA4P8X60ntX v9R23NkPRsPNKbK2ciaICTDWLjKFCltXKNJe6/AmTIISap1G+armmkeLhLXue2CSAj jM6zqmr1DcE3VAYC9CCBD3Czb7PxONpPm+ixguYDgnWYOKL4Dv4q/tic1JF1vAcCdT KH6ibdA0IEHBRPX22STAe8n6IR2SajFGsTSfsvTt6Gtt2AjbX/eB+lzBp0sfs4RTh0 IhLim95jTk6Bg== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) It's not really Minetest-specific. It was only placed in (guix build minetest-build-system) to avoid a world rebuild. * guix/build/minetest-build-system.scm (%png-magic-bytes,png-file?): Move to ... * guix/build/utils.scm (%png-magic-bytes,png-file?): ... here. --- guix/build/minetest-build-system.scm | 9 --------- guix/build/utils.scm | 11 +++++++++++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/guix/build/minetest-build-system.scm b/guix/build/minetest-build-system.scm index 477cc3d1d0..5d7d8d2292 100644 --- a/guix/build/minetest-build-system.scm +++ b/guix/build/minetest-build-system.scm @@ -90,15 +90,6 @@ If it is unknown, make an educated guess." #:install-plan (mod-install-plan (apply guess-mod-name arguments)) arguments)) -(define %png-magic-bytes - ;; Magic bytes of PNG images, see ‘5.2 PNG signatures’ in - ;; ‘Portable Network Graphics (PNG) Specification (Second Edition)’ - ;; on . - #vu8(137 80 78 71 13 10 26 10)) - -(define png-file? - ((@@ (guix build utils) file-header-match) %png-magic-bytes)) - (define* (minimise-png #:key inputs native-inputs #:allow-other-keys) "Minimise PNG images found in the working directory." (define optipng (which "optipng")) diff --git a/guix/build/utils.scm b/guix/build/utils.scm index 3beb7da67a..39e581b0fa 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -61,6 +61,8 @@ symbolic-link? call-with-temporary-output-file call-with-ascii-input-file + file-header-match + png-file? elf-file? ar-file? gzip-file? @@ -290,6 +292,15 @@ with the bytes in HEADER, a bytevector." #f ;FILE is a directory (apply throw args)))))) +(define %png-magic-bytes + ;; Magic bytes of PNG images, see ‘5.2 PNG signatures’ in + ;; ‘Portable Network Graphics (PNG) Specification (Second Edition)’ + ;; on . + #vu8(137 80 78 71 13 10 26 10)) + +(define png-file? + (file-header-match %png-magic-bytes)) + (define %elf-magic-bytes ;; Magic bytes of ELF files. See . (u8-list->bytevector (map char->integer (string->list "\x7FELF")))) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:07 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:07 +0000 Received: from localhost ([127.0.0.1]:50649 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvr-0000cs-01 for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:07 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36094) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvW-0000Y9-Db for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:47 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKmQy; Thu, 30 Sep 2021 00:19:46 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 06/38] gnu: mozjs: Make the native-inputs unconditional. Date: Thu, 30 Sep 2021 00:19:06 +0200 Message-Id: <20210929221938.17168-6-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953986; bh=0nUJJabp+zVKDApycT0iSpv9225T9FdSLVDPaaKDKNo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=higD1K18hYyrasrs+bVBpAZW5ZUvqkM2Bidfbqhn0XDaAq/xugfewHJb6Hn5fj+iM YDZbASE/ViFL6dfr6qnhltOuAQcunB/9JD2Tsdp7ltfQREWhYnoLxKRE5AC3Dbb1RO yiekDzlQQfnguQRgnsr4popZQK4d3NIKkb/8A7IloSygrTtmqKpRsP+dGoE95qBKY4 4Y5Fub/s04VAWUF0eaLhCZIL7/JJYdOh31gMtcYDXU6se92BSq7pgIhctjzyWapdgZ weQmC8NYjjzu1a3blsGFmbp7uVkokl7OeEnrxot4/XY9lU2YoexfihbFFRCj4CxE5q UoaSBR0hCj/3A== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/nss.scm (mozjs)[inputs]: Always include 'perl" and 'bash-minimal', even when compiling natively. --- gnu/packages/nss.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 6196ad692d..6315138c89 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -52,12 +52,9 @@ "1j5b2m8cjlhnnv8sq34587avaagkqvh521w4f95miwgvsn3xlaap")))) (build-system mozilla-build-system) (inputs - ;; TODO(core-updates): Make these inputs unconditional. ;; For 'compile-et.pl' and 'nspr-config'. - (if (%current-target-system) - `(("perl" ,perl) ; for 'compile-et.pl' - ("bash-minimal" ,bash-minimal)) ; for 'nspr-config' - '())) + `(("perl" ,perl) ; for 'compile-et.pl' + ("bash-minimal" ,bash-minimal))) ; for 'nspr-config' (native-inputs `(("perl" ,perl))) (arguments -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:07 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:07 +0000 Received: from localhost ([127.0.0.1]:50651 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvr-0000cy-C6 for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:07 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36184) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvX-0000Yn-Ai for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:47 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKmR0; Thu, 30 Sep 2021 00:19:46 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 07/38] gnu: mozjs: Make the quasiquote unconditional. Date: Thu, 30 Sep 2021 00:19:07 +0200 Message-Id: <20210929221938.17168-7-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953986; bh=0/rAoM65eJlMQWUPLBJdJTahIdtfBENf+X7vRhbmmeg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZMneu/HcrCLcdNLAZs87tqiY9AdcsgVlJZ9WFNf1OyADmHQCaKurjRgJHCULsgB3e XshNFnwaPGTPniGhmNfxJQU9ElGz0GHKCVBe1hSI2gdhPZD5/LheYGEvaLHsXkD9fM nrovtaz14NAtK1Buf7yBbTY9ikWRmKtHE721AfmgC+JgtBWgZK1WDIUyZrZYA8Rpwq dkxftiU06tvqylluGO8f2qjqVHGkH8HCjaG+RldXRgO7vSZifrBr89kK5IY0xhmufW 9RXHEXX9wHQJsWASVLNhqxQHHFd5Vla9w/FoFaedGHj0oUOweYpoJIXB4cj1l4hNH5 mF8XTwW9atBaQ== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/nss.scm (mozjs-60)[arguments]<#:configure-flags>: Always use quasiquote instead of quote. --- gnu/packages/gnuzilla.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 655b0c04c3..5273fbddf0 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -370,11 +370,7 @@ in C/C++.") `(#:tests? #f ; FIXME: all tests pass, but then the check phase fails anyway. #:test-target "check-jstests" #:configure-flags - ;; TODO(core-updates): unconditionally use 'quasiquote - ,#~(#$(if (%current-target-system) - #~quasiquote - #~quote) - ("--enable-ctypes" + ,#~`("--enable-ctypes" "--enable-optimize" "--enable-pie" "--enable-readline" @@ -391,7 +387,7 @@ in C/C++.") ;; This is important because without it gjs will segfault during the ;; configure phase. With jemalloc only the standalone mozjs console ;; will work. - "--disable-jemalloc")) + "--disable-jemalloc") #:phases (modify-phases %standard-phases ;; Make sure pkg-config will be found. -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:08 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:08 +0000 Received: from localhost ([127.0.0.1]:50653 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvr-0000d6-Ly for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:07 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36154) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvX-0000YW-ED for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:47 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKnR2; Thu, 30 Sep 2021 00:19:47 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 08/38] gnu: isc-dhcp: Don't use canonical-package. Date: Thu, 30 Sep 2021 00:19:08 +0200 Message-Id: <20210929221938.17168-8-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953987; bh=CGpXVEGPdOA07TT/1tOmXDHEByyTr0XyOyvkuGoF4BY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Y6GnfbNnFs7eS3ETvNpjQiuY+COjY1eXEeJJDk3Ol67pUiK+FTVrLV2kYicUapQPX V3tJFE24PtZDw59QkdSSwAmvWhY7oRbfiFDJf+f/MITog5C7xROWsTeibaX2y/55dK OMw7xSO/D6ZVf9VjrFa9suLiaxJ/tW/R7/KXPILNAZ6jmv6898kWMcz0ENrnO4QPfR wYE0OpVy/F8uLII2N7L8LBp7cyG9k+bkt32LCZ7E7aJ8H82geub8T3ts+0Nm7hBm6U oxGsz3InJ32VvtBTZhxwI2wfAFj0ivH2sooLPWMoxXzY02GAwuJba1RUKaKzqC0oOf 9LkcnEXSRUh9Q== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) As I understand it, canonical-package is only for things that won't end up in the closure, so canonical-package shouldn't be used here. * gnu/packages/admin.scm (isc-dhcp)[inputs]{bash}: Remove 'canonical-package'. --- gnu/packages/admin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index aad8586a71..c535baf1d6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1318,7 +1318,7 @@ connection alive.") ;; TODO(core-updates): simply make this unconditional ,@(if (%current-target-system) ;; for wrap-program - `(("bash" ,(canonical-package bash-minimal))) + `(("bash" ,bash-minimal)) '()) ,@(if (hurd-target?) '() `(("net-tools" ,net-tools) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:08 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:08 +0000 Received: from localhost ([127.0.0.1]:50655 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvr-0000dD-V1 for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:08 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36094) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvX-0000Y9-T5 for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:48 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKnR5; Thu, 30 Sep 2021 00:19:47 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 09/38] gnu: isc-dhcp: Make an input unconditional. Date: Thu, 30 Sep 2021 00:19:09 +0200 Message-Id: <20210929221938.17168-9-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953987; bh=Yk+kDz1RDTVDV4bN5aLyyFuYBedaPc7RlhbPuNasVwI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oxHkSPDItE6Np6Q7A1PSR8TLrOM2x8lDRb8QfjjyfTs1PfS7mMX66ko3UGVcY2KAT K3ackZjTkEFXTxJoYTuDZJhmInGvTpi9v8Hg2vYocMvpk/KFTUyWFeqOlLUdGqhmQi pv/2HoeuYiz1xXnFfeGplDsHv8mim1CeBdSfuUqN3+ReYMdN9h5vkUzyaPRyGfeDH1 2mJt4j7kPlV7EnIxCiERvI3xnutxxPaDECTOusjfX6cy+fMQK3D9f6KnqqkbubfSRu 4riogeFoTBNjTdxDA9C7oGxJ26iy0U8fyZ4urQUzdtCo0K7/BWmQUzGQ+ye46nUKy5 ANRiR+2gked/A== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/admin.scm (isc-dhcp)[inputs]{bash}: Always include this input, even when compiling natively. --- gnu/packages/admin.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c535baf1d6..744692bb6c 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1315,11 +1315,7 @@ connection alive.") ("file" ,file))) (inputs `(("inetutils" ,inetutils) - ;; TODO(core-updates): simply make this unconditional - ,@(if (%current-target-system) - ;; for wrap-program - `(("bash" ,bash-minimal)) - '()) + ("bash" ,bash-minimal) ,@(if (hurd-target?) '() `(("net-tools" ,net-tools) ("iproute" ,iproute))) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:08 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:08 +0000 Received: from localhost ([127.0.0.1]:50657 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvs-0000dK-7D for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:08 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36184) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvY-0000Yn-F7 for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:48 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKoR7; Thu, 30 Sep 2021 00:19:48 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 10/38] gnu: isc-dhcp: Remove unnecessary shebang patching. Date: Thu, 30 Sep 2021 00:19:10 +0200 Message-Id: <20210929221938.17168-10-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953988; bh=UOgLmA0Q2Kcq7Zx/3nOGDBZyxl5ppcEHC40ZKHK3ldI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vSggJ7KGyIt9WQD4DAdfQi7rDo93y6qq7PydvHjOvvWye4nin0sAOuujWrASg1MwD jXcCO5GE5g+66b/XL4Zmo4q5cIAcvWcZUF+LSAF7N3OaV2Eix0o/XpavK5i6p57cNh dDSa6M3Dx7doveodWBUrht/JMkfznoOgQipEyRipfql/KCcF17HPv2ALI/kaKqyqTS eD5jLvvxuHc/mMRikLgeJN5GQ4LweDa33U4qFs5TS097BU33Enaqeb/4BPW6Czt1rJ h5Bi57jJISRuvPD0FpU+YLbtEI61YXroTUM3Qm0sl22pwA3kC9hzzGUdSFbvqAF4r7 V8rFSoK/bvB3w== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/admin.scm (isc-dhcp)[arguments]<#:phases>{post-install}: Remove parts indicated by TODOs. --- gnu/packages/admin.scm | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 744692bb6c..57801200bd 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1267,11 +1267,7 @@ connection alive.") "--owner=root:0" "--group=root:0"))))) (add-after 'install 'post-install - ;; TODO(core-updates): native-inputs isn't required anymore. - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) - inputs outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) ;; Install the dhclient script for GNU/Linux and make sure ;; if finds all the programs it needs. (let* ((out (assoc-ref outputs "out")) @@ -1295,19 +1291,6 @@ connection alive.") (string-append dir "/bin:" dir "/sbin")) (list inetutils net-tools coreutils sed)))) - ;; TODO(core-updates): should not be required anymore, - ;; once has been merged. - ,@(if (%current-target-system) - '((for-each - (lambda (file) - (substitute* file - (((assoc-ref native-inputs "bash")) - (assoc-ref inputs "bash")))) - (list (string-append libexec - "/dhclient-script") - (string-append libexec - "/.dhclient-script-real")))) - '()) #t)))))) (native-inputs -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:13 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:13 +0000 Received: from localhost ([127.0.0.1]:50659 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvs-0000dR-Hr for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:12 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36080) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvU-0000Y7-IK for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:49 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKkQk; Thu, 30 Sep 2021 00:19:44 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 03/38] gnu: mozjs: Use mozilla-build-system. Date: Thu, 30 Sep 2021 00:19:03 +0200 Message-Id: <20210929221938.17168-3-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953984; bh=nt9yZbzYYVKoSncxX9Vm+mRzHq2SC2tPwsrKIWPJz6c=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NX15xAHmt9S3erGHfTsWLbt1aG1xEqZpq4wElm2ahxGZ1NByt9lZguziqKcdRkqeK s08EVVjna9OKp7jdAnWqXWOHz50r1X7MtjooNOjj/ofEeEqv6sJz9MTM+KYksN5LcV 9qWNJJqgyY8WEY7VeWS7x7+rxN7WT8yn1TnSAe+8LMDAfiF4wX8oaL77zq90ARJ/Uv FgYr2U1vGgjYX5zLUn7Fg/S9zd+hS7JQ9gt78bH7gHfRVRmq+VAyvkc6S9JVLStIzB VFo9EBYnKefReSzbpuTgzjmOUuwkQDx4gYoS09OrozESa/LBnhBIGD/R8dQxEXNG3g ++aNoTLWkIvrQ== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Due to the use of 'inherit', all versions of mozjs are adjusted. * gnu/packages/gnuzilla.scm (mozjs)[build-system]: Adjust it. (mozjs)[arguments]<#:configure-flags>: Remove now superfluous --target and --host. --- gnu/packages/gnuzilla.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 5dd90e4e20..9647bb7db5 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -49,6 +49,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system cargo) #:use-module (guix build-system trivial) + #:use-module (guix build-system mozilla) #:use-module (gnu packages admin) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) @@ -108,7 +109,7 @@ (substitute* '("js/src/config/milestone.pl") (("defined\\(@TEMPLATE_FILE)") "@TEMPLATE_FILE")) #t)))) - (build-system gnu-build-system) + (build-system mozilla-build-system) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) @@ -390,15 +391,7 @@ in C/C++.") ;; This is important because without it gjs will segfault during the ;; configure phase. With jemalloc only the standalone mozjs console ;; will work. - "--disable-jemalloc" - ;; Mozilla deviates from Autotools conventions due to historical - ;; reasons. - #$@(if (%current-target-system) - #~(#$(string-append - "--host=" - (nix-system->gnu-triplet (%current-system))) - #$(string-append "--target=" (%current-target-system))) - #~()))) + "--disable-jemalloc")) #:phases (modify-phases %standard-phases ;; Make sure pkg-config will be found. -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:28 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:28 +0000 Received: from localhost ([127.0.0.1]:50661 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwC-0000e8-1X for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:28 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36284) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvb-0000ZS-J1 for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:55 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKqRa; Thu, 30 Sep 2021 00:19:50 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 17/38] gnu: pango: Make 'bash-minimal' input unconditional. Date: Thu, 30 Sep 2021 00:19:17 +0200 Message-Id: <20210929221938.17168-17-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953990; bh=ktj1JZaoYTMgLPKJZdv9+qmGldFJnKHeW0LaxpqkFAk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=kQ62lq0KfJlSxGjozqHlmW4OniR5nXdOiFxcTWaNsPmovmh/ZD3St0WsZG48GlByp 2hs5Hra4wwLkRw4bThi9fIWYGRrgEKFPYsGFAckH46ZNBbcz2gutWRTUpqhQNpyxsg ltkmj0hAh5rWZmsvaow72Oi9k5EiPWqIHTvl6B1hu1cQvTH69l1Qi3+9xE5kn6igrd 59P8R7CKnzagkZ0SUPdwFJnLOU3XeBsJhrJ0P716Dn3Xm1gfLybniVajYRH8spVDjL egVSmEad+EtEvm2JqmJtQ+oE86QFYfwR88xb/TkO0VYxIY6xFq4epYbTaFI4JbYU0W KqCVxMFfXBEJA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/gtk.scm (pango)[inputs]{bash-minimal}: Make it unconditional. --- gnu/packages/gtk.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 219971a40e..4f8b87ea48 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -377,10 +377,7 @@ applications.") ("libxft" ,libxft) ("libxrender" ,libxrender))) (inputs - ;; TODO(core-updates): Unconditionally add "bash-minimal" - `(,@(if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) ; for glib-or-gtk-wrap - '()) + `(("bash-minimal" ,bash-minimal) ; for glib-or-gtk-wrap ("zlib" ,zlib))) (native-inputs `(("glib" ,glib "bin") ; glib-mkenums, etc. -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:28 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:28 +0000 Received: from localhost ([127.0.0.1]:50663 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwC-0000eA-BJ for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:28 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36272) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvb-0000ZR-8X for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:55 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKqRX; Thu, 30 Sep 2021 00:19:50 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 16/38] gnu: libdatrie: Make input labels match the package name. Date: Thu, 30 Sep 2021 00:19:16 +0200 Message-Id: <20210929221938.17168-16-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953990; bh=4yd+s7qOzNY4jvD+JkiKndZ53enYGgJXb94YjUZ+wW4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dTSIYTonAxp9vHMJiWUFxRb2Y4FfoLiylfThoeUkt4TgT4DvwFsN13wUN9SRdzMXN vU/zDQA5GIe2KqdEcz149ArkT/NGfnM/TnYH75eB7ZvSv+Jjk/bsZuiatBx4waaqVR zuEHtH2YK6dp/QiqHn23K6x2g3FwEoMX2D2KZWUlyaxBcrJbYj1eyULZwlkmchbvzH Gk5nu3hWeS2GXMXy6DuP5oxxHQryxMF4x4adMerkdGaH1fp/qtfC3FgemIX2R41JAQ aQg/07vOP9GQ+UeKqxSbmfx8PjzPn/aWhxEtbcEp50CXyAPAHAnxj8CCnJbtGTjYgv 98hWEKP34YAZA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/gtk.scm (libthai)[native-inputs]{datrie}: Rename to ... (libthai)[native-inputs]{libdatrie}: ... this. (libthai)[propagated-inputs]{datrie}: Rename to ... (libthai)[propagated-inputs]{libdatrie}: ... this. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 5ae4aeb66c..219971a40e 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -326,9 +326,9 @@ representing trie. Trie is a kind of digital search tree.") (native-inputs `(("doxygen" ,doxygen) ("pkg-config" ,pkg-config) - ("datrie" ,libdatrie))) ; for 'trietool' + ("libdatrie" ,libdatrie))) ; for 'trietool' (propagated-inputs - `(("datrie" ,libdatrie))) + `(("libdatrie" ,libdatrie))) (synopsis "Thai language support library") (description "LibThai is a set of Thai language support routines aimed to ease developers’ tasks to incorporate Thai language support in their -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:28 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:28 +0000 Received: from localhost ([127.0.0.1]:50665 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwC-0000eH-Jf for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:28 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36080) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhva-0000Y7-64 for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:56 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKpRR; Thu, 30 Sep 2021 00:19:49 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 14/38] gnu: cairo: Make 'bash-minimal' input unconditional. Date: Thu, 30 Sep 2021 00:19:14 +0200 Message-Id: <20210929221938.17168-14-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953989; bh=AoP7EFEkBqf/10RXlN2FSXxy1mZ9MufxZhlFnexqNAY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=rxhLcVa8FFNa75LE5edt8yED5SOuCX+rkMBpuaTqGFiLo/KOqzy97Hayswwn2PYLH 3+D5g3HQahfLGglID6IS6l3UjmWsv9W+YhNGwL9aTHcIUAF/fC+blR42jkUUAyf4eA QKe03Yle607q70n6otpERB8zPw9PSByvKj7jq0YXOuoafyy8mluvqjxdeQRyenC2rY raobW7YMe1NJpm4wUl45S304mXKpPfHhGoiyYoiIDgHYUTM0+6xKlU5ex4AMTM80vu TfU+37+J0frVrEgZDqM8eMIlkxo2vx7GAmFDIQl8i4ccsVmpYP3mwv0dHY7AYsfjPR finnRDaU+qR9w== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/gtk.scm (cairo)[inputs]{bash-minimal}: Make this input unconditional. --- gnu/packages/gtk.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 9868b11e48..aa5b48dac8 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -182,10 +182,7 @@ tools have full access to view and control running applications.") ("pkg-config" ,pkg-config) ("python" ,python-wrapper))) (inputs - ;; TODO(core-updates): make this unconditional - `(,@(if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) ; for glib-or-gtk-wrap - '()) + `(("bash-minimal" ,bash-minimal) ; for glib-or-gtk-wrap ("drm" ,libdrm) ("ghostscript" ,ghostscript) ("libspectre" ,libspectre) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:29 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:29 +0000 Received: from localhost ([127.0.0.1]:50667 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwC-0000eP-Rm for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:29 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36256) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhva-0000ZP-TK for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:56 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKqRT; Thu, 30 Sep 2021 00:19:50 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 15/38] gnu: libthai: Make 'datrie' input unconditional. Date: Thu, 30 Sep 2021 00:19:15 +0200 Message-Id: <20210929221938.17168-15-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953990; bh=q8lxOUm0nF2OShhS6pl5Fb76fruHGy2Ng/U1snK2Dg4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=K01//TX06hxJQy43xVJTUE613T6fg3vJiyTNTAwdqkKvd0h/E9pW5/vz/QTIQyeaD rJKc4HCtN3XfB8IGmAua3AlYINFuNkMEiIFDl3JsM90IZ/mRJ1M+IN42nvmkQqjkuU uJKQMGIow8GRpwBZylsIIShp4oG+TXMhx0Ve2BcSRBkWmFYJmZaLCA+W+Y0L76O+y+ FVb/0yADvbI+PfQaHOMTSxZfzSY2S9vXOphLRP8kjClkTUSZzCdtJodbqgz9Hcts5y NX1EpQZWW6nr+U/DJp96TFl8kUoE02q8koQ3ArwRTfhvoU8Mzxj6X9f3USQz+XaSyZ zTMrgoEURImyQ== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/gtk.scm (libthai)[native-inputs]{datrie}: Make this input unconditional. --- gnu/packages/gtk.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index aa5b48dac8..5ae4aeb66c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -326,10 +326,7 @@ representing trie. Trie is a kind of digital search tree.") (native-inputs `(("doxygen" ,doxygen) ("pkg-config" ,pkg-config) - ;; TODO(core-updates): Make this input unconditional. - ,@(if (%current-target-system) - `(("datrie" ,libdatrie)) ; for 'trietool' - '()))) + ("datrie" ,libdatrie))) ; for 'trietool' (propagated-inputs `(("datrie" ,libdatrie))) (synopsis "Thai language support library") -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:29 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:29 +0000 Received: from localhost ([127.0.0.1]:50669 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwD-0000eW-3X for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:29 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36296) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvb-0000ZT-Um for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:56 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKrRd; Thu, 30 Sep 2021 00:19:51 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 18/38] gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs. Date: Thu, 30 Sep 2021 00:19:18 +0200 Message-Id: <20210929221938.17168-18-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953991; bh=F2lxH8w2Q2islWBG4l7ocoP+OtDE0r33U+tqgDhoqvk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=pk9fNValHzJx+yFzuKATNWdRlWcyxMJqqcx7mVFUBuiwLKjZx5K0WmjPqz5dxv9Bl 9nw8vLrejtPzpyzRHPoN+mFXOeMkX2tdYAOGvVWquYloTWbWhRa5vxoC4mi10U32N5 ewEjWqUc4gUnYwbYs8I1G1n14UpPpHLB7nppoHL/7tN24ECHvnRzPmTwyyIXLHMrck 0O/egni1WOHeF87tL60ojzB5iTbWsCHvVwIfBIK8hvsfp4UieV/v/nqM2pf4tYdiCM /rMwYn4RA8Ka7k1IIvfA8hTDqMdu6YiQXGf3OWi7BOOHJrYUr0sdO2xl7pKj3x5cAA 0HxCUuv6bE0xQ== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/gtk.scm (gdk-pixbuf)[arguments]<#:phases>{patch-docbook}: Unconditionally look in (or native-inputs inputs) for docbook-xsl and docbook-xml. --- gnu/packages/gtk.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 4f8b87ea48..fd7feab69b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -623,23 +623,17 @@ highlighting and other features typical of a source code editor.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-docbook - ;; TODO(core-updates): Unconditionally look in (or native-inputs inputs) - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) - inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (with-directory-excursion "docs" (substitute* "meson.build" (("http://docbook.sourceforge.net/release/xsl/current/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xsl") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xsl") "/xml/xsl/docbook-xsl-1.79.2/"))) (substitute* (find-files "." "\\.xml$") (("http://www.oasis-open.org/docbook/xml/4\\.3/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xml") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xml") "/xml/dtd/docbook/")))) #t)) (add-before 'configure 'disable-failing-tests -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:29 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:29 +0000 Received: from localhost ([127.0.0.1]:50671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwD-0000ed-I7 for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:29 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36154) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvZ-0000YW-33 for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:55 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKoRB; Thu, 30 Sep 2021 00:19:48 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 11/38] gnu: isc-dhcp: Remove trailing #t. Date: Thu, 30 Sep 2021 00:19:11 +0200 Message-Id: <20210929221938.17168-11-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953988; bh=A9VLAeR+reKgwipy3W/twWU4asR3YGGGZgnXpB4vWDs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=PDI+YouJ3dBbA5Vf/UueI8hMAkHYTUWz/M39iKLFSPdvdHxTjVTo054o9YrkuB+a/ kB0gCz5PWFymBqxMRcUSkZznLvFtXEVQwXZmAWAea+xW+KnnWc3BDlDSbdmQUP5kAx fJnMyaK5e2NvofYU2vP9o7Ns3iMG9vdjPt4+lljCiF4uKYQvTbhlangpJ93c6Z70wa kPkzooZdHgEAhlwixx1fY0atEHGdjGgwCbbe0bE8f3DWhm1Rz5YsOYklJXgOV+tkHs foGtpvHGhQgE7sPZU3o/G+l534TVJQt8uvAdC0/o1SPxg6qOUzulDhvwOx70HM4KGT aqxXtfBQTqJsw== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) They aren't required anymore on core-updates. * gnu/packages/admin.scm (isc-dhcp)[arguments]<#:phases>: Remove trailing #t. --- gnu/packages/admin.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 57801200bd..78b37c04d7 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1218,8 +1218,7 @@ connection alive.") (("^RELEASETYPE=.*") (format #f "RELEASETYPE=~a\n" ,bind-release-type)) (("^RELEASEVER=.*") - (format #f "RELEASEVER=~a\n" ,bind-release-version))) - #t)) + (format #f "RELEASEVER=~a\n" ,bind-release-version))))) ,@(if (%current-target-system) '((add-before 'configure 'fix-bind-cross-compilation (lambda _ @@ -1290,8 +1289,7 @@ connection alive.") ,(map (lambda (dir) (string-append dir "/bin:" dir "/sbin")) - (list inetutils net-tools coreutils sed)))) - #t)))))) + (list inetutils net-tools coreutils sed)))))))))) (native-inputs `(("perl" ,perl) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:30 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:30 +0000 Received: from localhost ([127.0.0.1]:50673 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwD-0000el-PD for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:29 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36308) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvc-0000ZW-O7 for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:56 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKsRh; Thu, 30 Sep 2021 00:19:52 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 20/38] gnu: gdk-pixbuf: Use target predicates. Date: Thu, 30 Sep 2021 00:19:20 +0200 Message-Id: <20210929221938.17168-20-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953992; bh=bahdBuGrJkWxiJ6oxwD00WLPRJyU7JZkJUZeihA96uQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=LoAwC30Hwt+FCdZSh5haS6SHxau4uu+KuOJXjs2deC4RoNk3EQAwLePgwmFiPvMMs LMtVvcFaR+9P59rKOCxPfh+w9rV5vYVrD2NV29HETZTIVnDRjLUUtXX1HtVJwwcN44 AAPbhrXS3cmpVR0fpewpJF5HWfyNwS6DpQ3enZjK/1esmQzHPr+JHtC1POCReFTTMA ohvZNyRU98YEybbKKTuw5QpxEAc3HV8+C42Mt+wVbkmiHgB1LME+SCuVhQhZFpfssK Xr3mB8YXCr/eX+Ue6XFP6fTGPRoZf8gAkBjmoAgs2+UN/LHrQWjCcJ5UGvak/8f9Jo iy1lT0uDfIPTw== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This seems a little tidier to me. * gnu/packages/gtk.scm (gdk-pixbuf)[arguments]<#:phases>{check}: Use target-arm? instead of string=?. --- gnu/packages/gtk.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index bbef514dd7..691e207165 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -643,8 +643,7 @@ highlighting and other features typical of a source code editor.") "")) #t)) ;; The slow tests take longer than the specified timeout. - ,@(if (any (cute string=? <> (%current-system)) - '("armhf-linux" "aarch64-linux")) + ,@(if (target-arm? (%current-system)) '((replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:30 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:30 +0000 Received: from localhost ([127.0.0.1]:50675 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwE-0000et-0Z for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:30 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36302) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvc-0000ZV-BE for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:57 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKrRf; Thu, 30 Sep 2021 00:19:51 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 19/38] gnu: gdk-pixbuf: Respect #:tests?. Date: Thu, 30 Sep 2021 00:19:19 +0200 Message-Id: <20210929221938.17168-19-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953991; bh=ezOEB3mOxWogaCDVd/yx9NcbSH9Peuf6TXHbjRp9krQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FJ0J5ssVPXfmMWiOTJaE31Fuqa2Eus49RK3iVIJhZJwoJ6s1IQuH//3OipJ8wSNAn G/pwkZBWwyYSosfR0QUkpGmmW9zs2+CsRW8SDXRV+5HK71d5WRqpWuTAHf1vnfrRPT FY9Knm0zu1JkG11TY0cYishGT8axmw5mwWv4C+ynBgLZ7FhtWEHgWP43bGTOZReCpc aEK5gvyj2IlFNV+F7IWQV2bpM2SOOZ18ntvkXmjL3j//SJFLAzf0inmQWwUGXfhz4F TJfCwJ5g/3/L8uhZipsL2/XRVMRbYHG7c2gRYRppjirKyEFoHB3RT+nCzYIG8+QrHm mJ0gyYUzNO0ng== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/gtk.scm (gdk-pixbuf)[arguments]<#:phases>{check}: Don't run the tests if the value for #:tests? is false. --- gnu/packages/gtk.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index fd7feab69b..bbef514dd7 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -646,8 +646,9 @@ highlighting and other features typical of a source code editor.") ,@(if (any (cute string=? <> (%current-system)) '("armhf-linux" "aarch64-linux")) '((replace 'check - (lambda _ - (invoke "meson" "test" "--timeout-multiplier" "5")))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "meson" "test" "--timeout-multiplier" "5"))))) '())))) (propagated-inputs `( ;; Required by gdk-pixbuf-2.0.pc -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:30 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:30 +0000 Received: from localhost ([127.0.0.1]:50677 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwE-0000f0-9b for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:30 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhve-0000Za-L1 for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:57 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKtRl; Thu, 30 Sep 2021 00:19:53 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 21/38] gnu: gdk-pixbuf: Make 'bash-minimal' input unconditional. Date: Thu, 30 Sep 2021 00:19:21 +0200 Message-Id: <20210929221938.17168-21-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953994; bh=eqaU5MEUL+3CrzJYaZsrAg+J8Evf9NbzkISRjVxgenc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=BtiGiiqIRhrbde61wVolBH1BkMZEndzEkuZtaX0XIUGLUAZ8Af7AraE1Fh42mVhhO UtjhzI1ncraI86QXkhQ8RFircrzAAjdcxnOSptOorRe+fhX4g+CzNESZl5GzzFCniv DV968fzYFY46V9xuh2dYSkhyf3Hsfaw0QHwtTk4A97FJEG2Vm48i6Is74ZkZHcHY6O 7iTHOyNvJibaDSISetl02XdmQ1OebB+k5eGWKqothnZEHor73Xoi6FsRomXTRKuAvN keU4Eu65+WfYAPRstnoSfyiOortnqMYw3r/UT6QrrpbasQzvdZtCXluBK3MdadIedS 3cBZ3lII7q49g== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/gtk.scm (gdk-pixbuf)[inputs]{bash-minimal}: Make it unconditional. --- gnu/packages/gtk.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 691e207165..cfc4c61235 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -657,9 +657,7 @@ highlighting and other features typical of a source code editor.") ;; Used for testing and required at runtime. ("shared-mime-info" ,shared-mime-info))) (inputs - `(,@(if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) ; for glib-or-gtk-wrap - '()) + `(("bash-minimal" ,bash-minimal) ; for glib-or-gtk-wrap ("jasper" ,jasper) ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:30 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:30 +0000 Received: from localhost ([127.0.0.1]:50679 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwE-0000f7-Hw for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:30 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvf-0000Zc-Dp for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:57 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKuRq; Thu, 30 Sep 2021 00:19:54 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 23/38] gnu: at-spi2-core: Make 'bash-minimal' input unconditional. Date: Thu, 30 Sep 2021 00:19:23 +0200 Message-Id: <20210929221938.17168-23-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953994; bh=lFr77h45AV8XOGO9Vabr7KSuMtKAqd7YAhbFyPGf/BY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fYSSZCXMVjSzci7b3/aJmZPsYJ//mADYK90wwkpafn2SNiY3FW08lNsfC1zhX72Fp 6GUXGYAvcKCerX+KAbuUDJxE+gzN4EceAkPWWmTe0n/W6im9QXigvpCvDJDlTpeoIS bNsq1bLapoKruzbqdeOcgP3fQOHqfRMQO8MDHrwXAfp5dQdg9ynyxxj0dAieMs9p8t MyAWfzg8gg/knatBaB1ewUH0Xj8N8mqCZcj6WWuG+CygsRaO75Pym4GGy1yPgpMzbL httcjQXPNpFKAj26s+qySVK0V24a1Bdmc6UdS6nzT2yZrGyGGJiWzLmV/1tTjwm1Xt kX5Jp3JHIxnRQ== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/gtk.scm (at-spi2-core)[inputs]{bash-minimal}: Make it unconditional. --- gnu/packages/gtk.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f37dfaf89d..adb4d847a4 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -778,10 +778,7 @@ scaled, composited, modified, saved, or rendered.") (invoke "dbus-launch" "ninja" "test"))) (delete 'check)))) (inputs - ;; TODO(core-updates): Make this input unconditional. - (if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) - '())) + `(("bash-minimal" ,bash-minimal))) (propagated-inputs ;; atspi-2.pc refers to all these. `(("dbus" ,dbus) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:31 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:31 +0000 Received: from localhost ([127.0.0.1]:50681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwE-0000fE-Qh for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:31 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36154) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvf-0000YW-P5 for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:57 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKvRx; Thu, 30 Sep 2021 00:19:55 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 25/38] gnu: at-spi2-core: Unconditionally lookup docbook in native-inputs. Date: Thu, 30 Sep 2021 00:19:25 +0200 Message-Id: <20210929221938.17168-25-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953995; bh=A/vKhXVf1Ixg8MY6muVmQzAsOO348cwUUuDUpPpNf1Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=PFupcMYc9BwBolypOECkXRloCAHfcLdjCnoKSWtL8dxChQ+iq38nbKPx+/Dru3AGF JEkZeanUWam6NKC0cH+pdc+63+H+2QoFPnoLYFf1izLqq9WXuk0HMiTXEgVlU+qYvq n/b8bVyrhmPl/Gdm/GAtDyF+hyQQLM8+VeyN7l/L3L2F+lteCOjLkksgdDJ7N89mHe 4SCHCzYVSHd58xc0Nf/6cmsDBU0hOcmzfpH/82WvdB9alCwd35zsaj4tFIm5FVDf4N 0Qi+D25ceEK/6eJ13rFLeXQ3heQon/YBydcFO8AjlbNfy55bJe7O6rOOtaSgXuXcgi 9HAQalgyeQK4A== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/gtk.scm (at-spi2-core)[arguments]<#:phases>{patch-docbook-sgml}: Unconditionally look in (or native-inputs inputs) for docbook-xml. --- gnu/packages/gtk.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index d829218305..634a0125d8 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -740,15 +740,10 @@ scaled, composited, modified, saved, or rendered.") (lambda* (#:key outputs #:allow-other-keys) (mkdir-p (string-append (assoc-ref outputs "doc") "/share")) #t)) - ;; TODO(core-updates): Unconditionally use (or native-inputs inputs) (add-after 'unpack 'patch-docbook-sgml - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (let* ((xmldoc - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) + (string-append (assoc-ref (or native-inputs inputs) "docbook-xml") "/xml/dtd/docbook"))) (substitute* "doc/libatspi/libatspi-docs.sgml" -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:31 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:31 +0000 Received: from localhost ([127.0.0.1]:50683 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwF-0000fM-4D for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:31 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36370) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvf-0000Zk-PI for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:57 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKvRt; Thu, 30 Sep 2021 00:19:55 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 24/38] gnu: at-spi2-core: Respect #:tests?. Date: Thu, 30 Sep 2021 00:19:24 +0200 Message-Id: <20210929221938.17168-24-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953995; bh=A6rnq+a0re+OfjLRoJUFtSXcubJL0JXDXPQUHbxTqaM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JSmoFChdoDAoY+ensfC2i8NxWod+1uffRyEL1J16T+Qwa4chdwZWxllxg8pq9OUCJ GQBxzG70iWvW02IIWM9OpXdQHup5stOw6BAHVep3osKW61wNYYfN+opWZmSJcj31Fb v5xi/JbXFky32URgdA5vuUbCJav8mkZoBirzmzQU+8lVlGalCflYa7U0jVpqqa06C6 7ovkRgl+qQf+gqVD39zra8dtl3/PGZnfNytY8EVfqcSSvTe4Yl0y6ewXkEfE/WChtK O5ALxceyoRFbkksE/aUpxoPzuwzn/PTng5sYsYNyZQWsh4wmh0cjyGbAejroVcDGUa BHrfAwkb+EyKw== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/gtk.scm (at-spi2-core)[arguments]<#:phases>{check}: Don't run tests if the value of #:tests? if false. --- gnu/packages/gtk.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index adb4d847a4..d829218305 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -768,14 +768,15 @@ scaled, composited, modified, saved, or rendered.") (string-append out "/share/gtk-doc"))) #t)))) (add-after 'install 'check - (lambda _ + (lambda* (#:key tests? #:allow-other-keys) (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME ;; Run test-suite under a dbus session. (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service (string-append %output "/share")) ;; Don't fail on missing '/etc/machine-id'. (setenv "DBUS_FATAL_WARNINGS" "0") ; - (invoke "dbus-launch" "ninja" "test"))) + (when tests? + (invoke "dbus-launch" "ninja" "test")))) (delete 'check)))) (inputs `(("bash-minimal" ,bash-minimal))) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:31 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:31 +0000 Received: from localhost ([127.0.0.1]:50685 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwF-0000fT-EH for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:31 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36272) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvg-0000ZR-8D for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:58 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKvRz; Thu, 30 Sep 2021 00:19:55 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 26/38] gnu: at-spi2-core: Remove trailing #t. Date: Thu, 30 Sep 2021 00:19:26 +0200 Message-Id: <20210929221938.17168-26-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953996; bh=uUPMAiwwDtFSAIo0y7cm/dPux3B/PijjMbez9VInIaM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tDQ1oz5WIx0P6/ZEYZugt4TINiIvCQxuS8cJHiS1/euarIbAb5XB1UmgHx0Z9GMj9 WjqkEUz9WR6GgMVfaMKMUI8IgGrbOS1esEDW9PMtdoeqraga2Fa5kNJiTCV2L9NxNL bf0g3Np+YnwK0fY1qWjqgqsW6FG8Q0dNkfUaKH2oiZM7yB8brcSRsklZN6r9MFp31d JSNrg4yJ+9dCvzHTCY6gRpHk2B+Mck3RvN07UdbZ4RbqXXCfialCr/4k0kjBH0F5Ji vD/tRJZyMuRgPh56iEVUOPwSNV0ZaCxp8FmmUV/mtCS6QDKNU5o6Dwxa+L1Zq77ahT NAZuBIyqJ21Xg== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/gtk.scm (at-spi2-core)[arguments]<#:phases>: Remove trailing #t. --- gnu/packages/gtk.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 634a0125d8..842a46a846 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -734,12 +734,11 @@ scaled, composited, modified, saved, or rendered.") ;; Ensure that the cross-references point to the "doc" output. (substitute* "doc/libatspi/meson.build" (("docpath =.*") - (string-append "docpath = '" (assoc-ref outputs "doc") "/share/gtk-doc/html'\n"))) - #t)) + (string-append "docpath = '" (assoc-ref outputs "doc") + "/share/gtk-doc/html'\n"))))) (add-before 'install 'prepare-doc-directory (lambda* (#:key outputs #:allow-other-keys) - (mkdir-p (string-append (assoc-ref outputs "doc") "/share")) - #t)) + (mkdir-p (string-append (assoc-ref outputs "doc") "/share")))) (add-after 'unpack 'patch-docbook-sgml (lambda* (#:key native-inputs inputs #:allow-other-keys) (let* ((xmldoc @@ -748,8 +747,7 @@ scaled, composited, modified, saved, or rendered.") "/xml/dtd/docbook"))) (substitute* "doc/libatspi/libatspi-docs.sgml" (("http://.*/docbookx\\.dtd") - (string-append xmldoc "/docbookx.dtd"))) - #t))) + (string-append xmldoc "/docbookx.dtd")))))) ,@(if (%current-target-system) '() '((add-after 'install 'move-documentation @@ -760,8 +758,7 @@ scaled, composited, modified, saved, or rendered.") (string-append out "/share/gtk-doc") (string-append doc "/share/gtk-doc")) (delete-file-recursively - (string-append out "/share/gtk-doc"))) - #t)))) + (string-append out "/share/gtk-doc"))))))) (add-after 'install 'check (lambda* (#:key tests? #:allow-other-keys) (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:32 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:32 +0000 Received: from localhost ([127.0.0.1]:50687 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwF-0000fa-Q0 for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:32 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36344) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvg-0000Zb-DJ for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:58 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKuRn; Thu, 30 Sep 2021 00:19:54 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 22/38] gnu: gdk-pixbuf: Remove trailing #t. Date: Thu, 30 Sep 2021 00:19:22 +0200 Message-Id: <20210929221938.17168-22-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953994; bh=9p9EtODfdsYaAYzctsNrasoK0EEY0Y58lAHN6fF6ANQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=uLS12zU8HHnSpaXap6Z6eEAp1u30xauUL/EKw3vXebdKCjNel1llI9QTMTMNx3d5u Ls5S70dT0i3e66dCv5DPfhe+BKwcMbu0zOhznC7SvJ1DGF89W6AJfs5ogCtJsN58AY yN/NXRVUeWOCHI5j3iqnZF1hzitxJZTFaqP/97PoDctG6KiaMQMaJAe1hEuZ36Sz35 6n6ZaBKKz6OgLNhYTF80Mi4J1cBkmn66s6COHPhpr98uTtL8rsKfjbObRMD2Ii1ddU 5SRO52F8+se4R9LRDFBFszoTp04L7o5fl/H9LxNONiuL1tMKrD4zbhxLucgPnIxr/M FNrhIqtWxlk+g== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/gtk.scm (gdk-pixbuf)[arguments]<#:phases>: Remove the trailing #t. --- gnu/packages/gtk.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index cfc4c61235..f37dfaf89d 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -634,14 +634,12 @@ highlighting and other features typical of a source code editor.") (("http://www.oasis-open.org/docbook/xml/4\\.3/") (string-append (assoc-ref (or native-inputs inputs) "docbook-xml") - "/xml/dtd/docbook/")))) - #t)) + "/xml/dtd/docbook/")))))) (add-before 'configure 'disable-failing-tests (lambda _ (substitute* "tests/meson.build" (("\\[ 'pixbuf-fail', \\['conform', 'slow'\\], \\],") - "")) - #t)) + "")))) ;; The slow tests take longer than the specified timeout. ,@(if (target-arm? (%current-system)) '((replace 'check -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:32 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:32 +0000 Received: from localhost ([127.0.0.1]:50689 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwG-0000fi-48 for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:32 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36284) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvg-0000ZS-Ll for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:58 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKwS3; Thu, 30 Sep 2021 00:19:56 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 27/38] gnu: avahi: Make 'bash-minimal' input unconditional. Date: Thu, 30 Sep 2021 00:19:27 +0200 Message-Id: <20210929221938.17168-27-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953996; bh=4z53cwgt0+rqfiFPlApNnz24oZuES5mst2PwRQiKIxQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HNkC/Mtm2ygDgHeAb8pAZUqvjFkAnH/4G3GPIhi3jR8PqnlibAb8GupOYWw0QZMxn Qttaglcf35/R7im6CMr7e/sATxFoN/kQO0aQl9eUObIkmGx3KzTQ6O1iXAENy41f3u yh/PeAIh4S7s18/+1Y9B6HGBM87SSYaEJ3ikDa0nVi/F7EU7cw68P0gsRhrOJKTcOR Kb66nuvMAkrxpYUuY6pqkbd1b4BeGaKw6CRa8aj7Jk5NVNU7hiEq7WZ5imu0SP7Uak 87DDGRcF/tcxom5R9v+1frqtbH5JY82fkolmmyR60L1Brk11tnTjBlNuUNfQqYc4cE 7rOldF+DSXFIw== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/avahi.scm (avahi)[inputs]{bash-minimal}: Make it unconditional. --- gnu/packages/avahi.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm index 7dcaa17a76..20c0f2708e 100644 --- a/gnu/packages/avahi.scm +++ b/gnu/packages/avahi.scm @@ -91,10 +91,7 @@ (find-files (string-append #$output "/etc/avahi"))))))) '()))) (inputs - ;; TODO(core-updates): Make this input unconditional. - `(,@(if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) - '()) + `(("bash-minimal" ,bash-minimal) ("dbus" ,dbus) ("expat" ,expat) ("gdbm" ,gdbm) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:32 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:32 +0000 Received: from localhost ([127.0.0.1]:50691 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwG-0000fp-Ca for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:32 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36080) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvg-0000Y7-WB for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:19:58 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKwS7; Thu, 30 Sep 2021 00:19:56 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 28/38] gnu: avahi: Make the 'patch-more-shebangs' phase unconditional. Date: Thu, 30 Sep 2021 00:19:28 +0200 Message-Id: <20210929221938.17168-28-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953996; bh=BnOMBYoP+/dZYJVHLmM8tNuSfhnP2UiBb/JMajdkVAw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bQgM45+je+tGl953TzbGQTRSS/52c7n0DVqMkDaXq1abrIWawklSVZXuJKie++ona M3Qt3ZJsd8ba+UI8GWDC3j2ej4lW2coR2RDAlhc/sA/aAUTwDLJpKLrxehsiu9v9al 2wm3FeEQ/UreIzyR4MeiXFeZX5e+xHqL4aaPAb+kbbOitF4zNFBub96sa+otpxKgN0 VdvSEG4ugxV2rS0HKmSfxUQj3cHOPal9929O9YD+qLo62NgcsscclwPukLC+QRbtBW GOXsZ4897VmVzohuu/L5OpQ2njEQUv563GN2IPjn+tIQye2/HFSe/fr7NbYeKQShAD p4O3RVgtPZ52A== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/avahi.scm (avahi)[arguments]<#:phases>{patch-more-shebangs}: Make it unconditional. --- gnu/packages/avahi.scm | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm index 20c0f2708e..797e35e7eb 100644 --- a/gnu/packages/avahi.scm +++ b/gnu/packages/avahi.scm @@ -75,21 +75,18 @@ ,@(if (%current-target-system) '("ac_cv_prog_have_pkg_config=yes") '())) - ;; TODO(core-updates): Make this unconditional. - ,@(if (%current-target-system) - `(#:modules ((srfi srfi-26) - (guix build utils) - (guix build gnu-build-system)) - #:phases - ,#~(modify-phases %standard-phases - (add-after 'patch-shebangs 'patch-more-shebangs - (lambda* (#:key inputs #:allow-other-keys) - (define path - `(,(dirname (search-input-file inputs "bin/sh")))) - (for-each - (cut patch-shebang <> path) - (find-files (string-append #$output "/etc/avahi"))))))) - '()))) + #:modules ((srfi srfi-26) + (guix build utils) + (guix build gnu-build-system)) + #:phases + ,#~(modify-phases %standard-phases + (add-after 'patch-shebangs 'patch-more-shebangs + (lambda* (#:key inputs #:allow-other-keys) + (define path + `(,(dirname (search-input-file inputs "bin/sh")))) + (for-each + (cut patch-shebang <> path) + (find-files (string-append #$output "/etc/avahi")))))))) (inputs `(("bash-minimal" ,bash-minimal) ("dbus" ,dbus) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:32 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:33 +0000 Received: from localhost ([127.0.0.1]:50693 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwG-0000fw-LL for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:32 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36094) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvZ-0000Y9-Gd for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:02 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKpRE; Thu, 30 Sep 2021 00:19:49 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 12/38] gnu: gobject-introspection: Move things to native-inputs. Date: Thu, 30 Sep 2021 00:19:12 +0200 Message-Id: <20210929221938.17168-12-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953989; bh=eThyqZx1j58+TnVqKMEs4M8T54v78kMtximnREY6a9w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=qP1lvCa6HSt547pKyuSS+95uP7kWKMoA49mambCADJwQ2Bj6y3k81akYezXNbeRNa bPiHkQBq7MzjR9fzuPTd8QgcWLb8ymSQDvGe7x1oXQ4qYTI8RJwtKS3xMISukEGwt1 W+qjjLrtzt3l63poKJwiNfKqEWw5prWwIiO+kQ5E37PsFWMAvWAf+XAgO+bps6SSs8 KZQrWAx6sqLNyDyBpgfWOEaEKRxvq+DnRajG6UfiNgnHUBGEv5wXLwd5d0T4hMvUcc sR/mtzO67oqWMetRLh8bJ7lBZyiTsKFpGG6je07OviH6/Lvwf88d1h6hBYemPo1TWf OKS3DvQk49xGA== X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/glib.scm (gobject-introspection)[native-inputs]: Make 'bison' and 'flex' inputs unconditional ... (gobject-introspection)[inputs]: ... and unconditionally remove them here. --- gnu/packages/glib.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index bdcc108ac1..cbaece6cf1 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -486,18 +486,12 @@ be used when cross-compiling." (native-inputs `(("glib" ,glib "bin") ("pkg-config" ,pkg-config) - ;; TODO(core-updates): Unconditionally place "flex" and "bison" - ;; in 'native-inputs'. - ,@(if (%current-target-system) - `(("bison" ,bison) - ("flex" ,flex)) - '()))) + ("bison" ,bison) + ("flex" ,flex))) (inputs `(,@(if (%current-target-system) `(("python" ,python)) - `(("bison" ,bison) - ("flex" ,flex) - ("python" ,python-wrapper))) + `(("python" ,python-wrapper))) ("zlib" ,zlib))) (propagated-inputs `(("glib" ,glib) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:33 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:33 +0000 Received: from localhost ([127.0.0.1]:50695 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwG-0000g3-Tm for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:33 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36308) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvi-0000ZW-4b for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:03 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKxSL; Thu, 30 Sep 2021 00:19:57 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 31/38] gnu: json-glib: Unconditionally lookup docbook in native-inputs. Date: Thu, 30 Sep 2021 00:19:31 +0200 Message-Id: <20210929221938.17168-31-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953997; bh=RriO5a8YOCmfeZKTUQhZ+SktKBPPQdjUsMMdvni4RAA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=bqeoIlm8jfVI/7QT/m08IvQnjJhrc6a3bjBZKa2hhFkNevZ2cgSR9i2KYGym3jsp7 dqz9XKKR4y5gPkG74vrj/oL1i6G+GHqiaybQ1na+foN1PncM5hWcjZO5DDRylUvpg9 u8l0TslTkgZ1hfifub9vZDnLvHC1vvxORDJbS3PyTglsCTw7TGTcCxAGYpeMFT91va 2LNSPDaBKni8mkkpKKc5zTrXKeLb03CaN/9OMc9vWhZAsO9kCPEUXIVHJ8xBLtJf1N 4pMpCqt7UbkgKw1LgWUIN+EGTRqLWG37lRrGHCjo0cybdwjV/ZiWNcCeynIuzedNVB KkRD6SaCieGHA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/gnome.scm (json-glib)[arguments]<#:phases>{patch-docbook}: Unconditionally look in (or native-inputs inputs) for docbook-xml and docbook-xsl. --- gnu/packages/gnome.scm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 497713cddc..57d9a9be79 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4607,24 +4607,17 @@ configuration storage systems.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-docbook - ;; TODO(core-updates): Use (or native-inputs inputs) - ;; unconditionally. - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (with-directory-excursion "doc" (substitute* (find-files "." "\\.xml$") (("http://www.oasis-open.org/docbook/xml/4\\.3/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) + (string-append (assoc-ref (or native-inputs inputs) "docbook-xml") "/xml/dtd/docbook/"))) (substitute* "meson.build" (("http://docbook.sourceforge.net/release/xsl/current/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xsl") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xsl") "/xml/xsl/docbook-xsl-1.79.2/")))) #t)) ;; When cross-compiling, there are no docs to move. -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:34 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:34 +0000 Received: from localhost ([127.0.0.1]:50697 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwH-0000gB-7O for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:33 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36302) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvi-0000ZV-Jf for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:03 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKySR; Thu, 30 Sep 2021 00:19:58 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 32/38] gnu: json-glib: Make 'bash-minimal' input unconditional. Date: Thu, 30 Sep 2021 00:19:32 +0200 Message-Id: <20210929221938.17168-32-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953998; bh=Stbf5m9+hWyHtGLI3hQkXNQ/MbTmV1dVYAw2rhyI4Fc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XvCaJLuuwXIIMqHcfmtCJftyj917gVQKOec49G/7pKKUjY/9OiP7X77MGwPjBuRcw JCdri95d4YfIyExi0oBsSF6+KSSGWAB76eSBivDFRMG/YqWc3P4zanQatFFtFAGP3s wcEULXHBJhX8hynpWOq9ApJjBn7NmSAGTy8yPw5JlV26CKel5F3WjmBDeGGgABMBL4 yXFvKnDioMInj7+ToW72MDeCJnoWpDDXFTileu7fa+siPKwjfCrIVh2CUgP3aV4TyF 0bkpAhO8mpNdTny2I3O4cnKyTqCQWm0fgBLLRGWnvF2O/CQ43eCqkJ9iCXdWFYL0Ym 3tv2cbF8a/JPg== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/gnome.scm (json-glib)[inputs]{bash-minimal}: Make it unconditional. --- gnu/packages/gnome.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 57d9a9be79..b00a02b81f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4645,10 +4645,7 @@ configuration storage systems.") ("pkg-config" ,pkg-config) ("xsltproc" ,libxslt))) (inputs - ;; TODO(core-updates): Make this input unconditional. - (if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) - '())) + `(("bash-minimal" ,bash-minimal))) (propagated-inputs `(("glib" ,glib))) ;according to json-glib-1.0.pc (home-page "https://wiki.gnome.org/Projects/JsonGlib") -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:34 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:34 +0000 Received: from localhost ([127.0.0.1]:50699 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwH-0000gI-V5 for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:34 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvj-0000Za-1X for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:04 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKyST; Thu, 30 Sep 2021 00:19:58 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 33/38] gnu: heimdal: Make some parts of phases unconditional. Date: Thu, 30 Sep 2021 00:19:33 +0200 Message-Id: <20210929221938.17168-33-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953998; bh=C741vQZeiyfLswNMZ93oGojZZxOECaQbr8Dy+JElW1w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=QmlrXX3m/Bnzep0djOUAC5/bdjVpTYnpxrLCR47avQMzy10CbJ4jkTIefIiyVMO3v 5vin+a1IfNfHzW4RsmLe5lLvO/juFC258vtZHf4q+Z5AVVjB3tcz4wJCq/x/8BrjGD tfu7OZ1pl/BeBse/4Oofp2n9RsLzhVq26aLFL8+ytizWeypNDuf1FzG3T3x7bn0N7V SCQbevor4lCL2c+3ey4wnq4lcqs0NLAE1UApzjpV/dC7F1CfjJmgnj8ai0jU/BeZk2 /qK0QaYXFX6gRS+D/iJYFcUUX1x4nNY4TWqnCoMPt2EgXP4+tAAMN/uhqviDt4SoyL McennXzraNdOw== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/kerberos.scm (heimdal)[arguments]<#:phases>{pre-configure}: Make the '(%current-target-system)' branches unconditional. --- gnu/packages/kerberos.scm | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 82609ce66e..6bfb758900 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -237,14 +237,7 @@ After installation, the system administrator should generate keys using #~())) #:phases (modify-phases %standard-phases (add-before 'configure 'pre-configure - ;; TODO(core-updates): Unconditionally use the - ;; %current-target-system branch. - (,(if (%current-target-system) - 'lambda* - 'lambda) - ,(if (%current-target-system) - '(#:key inputs #:allow-other-keys) - '_) + (lambda* (#:key inputs #:allow-other-keys) ,@(if (%current-target-system) `((substitute* "configure" ;; The e2fsprogs input is included for libcom_err, @@ -256,22 +249,17 @@ After installation, the system administrator should generate keys using (("ac_cv_prog_COMPILE_ET=\\$\\{with_cross_tools\\}compile_et") "ac_cv_PROG_COMPILE_ET=compile_et"))) '()) - ,@(if (%current-target-system) - '((substitute* '("appl/afsutil/pagsh.c" "appl/su/su.c") - (("/bin/sh") - (search-input-file inputs "bin/sh")) - ;; Use the cross-compiled bash instead of the - ;; native bash (XXX shouldn't _PATH_BSHELL point - ;; to a cross-compiled bash?). - (("_PATH_BSHELL") - (string-append - "\"" (search-input-file inputs "bin/sh") "\""))) - (substitute* '("tools/Makefile.in") - (("/bin/sh") (which "sh")))) - '((substitute* '("appl/afsutil/pagsh.c" - "tools/Makefile.in") - (("/bin/sh") (which "sh"))) - #t)))) + (substitute* '("appl/afsutil/pagsh.c" "appl/su/su.c") + (("/bin/sh") + (search-input-file inputs "bin/sh")) + ;; Use the cross-compiled bash instead of the + ;; native bash (XXX shouldn't _PATH_BSHELL point + ;; to a cross-compiled bash?). + (("_PATH_BSHELL") + (string-append + "\"" (search-input-file inputs "bin/sh") "\""))) + (substitute* '("tools/Makefile.in") + (("/bin/sh") (which "sh"))))) (add-before 'check 'pre-check (lambda _ ;; For 'getxxyyy-test'. -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:34 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:34 +0000 Received: from localhost ([127.0.0.1]:50701 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwI-0000gQ-AY for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:34 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36296) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvh-0000ZT-PZ for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:05 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKxSC; Thu, 30 Sep 2021 00:19:57 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 30/38] gnu: wayland: Unconditionally lookup docbook in native-inputs. Date: Thu, 30 Sep 2021 00:19:30 +0200 Message-Id: <20210929221938.17168-30-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953997; bh=bW0Vj0kgmMa3iTcQKOmwUtI5MJrCmDnhfcB3/zQzyWU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Cc9vKcOLGxPP+7kueQTlCq1wve8UqtsELkgkvwRo4B2yE18xTEL7jx/81JCdext8M F5MEGavDHyfTMS/TVVBfxKIlISzbaLAds4DN426q3c/i4O8ampGAp+uZ8paZCG3QUd +lzIWJmUIvT01bo+o4TBk4WPvqCV6XaTJMWXhXGsibzQlD1lywWIxZiaeyKA3xWP2S jmp6mmp4pSZ2gwftM7abUNaJnZWmN6+g1782CHov6AMFb/2bLQCDc0/9bEf/HswHcJ 0Ik7EJun/bMOs5cs+kiXpBX+hr1uaOI8Hi1aB9EG/Ezn2st5bpbuNCbgPLswQTfPBf tGetJMKHPdwWg== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/freedesktop.scm (wayland)[arguments]<#:phases>{patch-docbook-sgml}: Unconditionally look in (or native-inputs inputs) for docbook-xml and docbook-xml-4.2. --- gnu/packages/freedesktop.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 9bcf2d8d3e..0f04a38c00 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -975,22 +975,16 @@ Python.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-docbook-xml - ;; TODO(core-updates): Use 'native-inputs' unconditionally - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) - inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (with-directory-excursion "doc" (substitute* (find-files "." "\\.xml$") (("http://www.oasis-open.org/docbook/xml/4\\.5/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xml") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xml") "/xml/dtd/docbook/")) (("http://www.oasis-open.org/docbook/xml/4\\.2/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xml-4.2") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xml-4.2") "/xml/dtd/docbook/")))) #t)) (add-after 'install 'move-doc -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:34 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:35 +0000 Received: from localhost ([127.0.0.1]:50703 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwI-0000gX-LH for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:34 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvj-0000Zc-CC for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:05 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKzSV; Thu, 30 Sep 2021 00:19:59 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 34/38] gnu: heimdal: Make 'bash-minimal' input unconditional. Date: Thu, 30 Sep 2021 00:19:34 +0200 Message-Id: <20210929221938.17168-34-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953999; bh=CzzgOdv7zv61ImbiAbcUKnTxA9omOQCetOkaZtSVMvI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=YZhU4MmG8NIUxGJSeTA8vS004Ke0erMc/6BOnbn9yeBMHh/nfw9czDV6D4QrBmtww 51ge4heXC4ZYU9A3XLC1F5QJlYh3xBdog8KRXAamweokGsKiQEbBFQ+fEPVaHUvtY2 W4taHPHGxs22pqq7JkOJ62N6pztNEs0CtCahKP5N5PVhWc6jyuMVw6FHPTdcbhYjOS 1YbEdE7NnV1rxGJPqkFGsXIqfgdHfV4tRlNq6gBby/omwnUI3aZkoo1O5/i/JRp7Ei M6CLEVhmDZ7hGlc7uleB9y7WWPe9Gr1BARlzZZxxQPJ/zOTLWbSNDZw3U2Cqj3Gibk 7cFS1GnMkKFpA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/kerberos.scm (heimdal)[inputs]{bash-minimal}: Make it unconditional. --- gnu/packages/kerberos.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 6bfb758900..739b0169dc 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -280,10 +280,7 @@ After installation, the system administrator should generate keys using `(("perl" ,perl)) '()))) (inputs `(("readline" ,readline) - ;; TODO(core-updates): Make this input unconditional. - ,@(if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) - '()) + ("bash-minimal" ,bash-minimal) ("bdb" ,bdb) ("e2fsprogs" ,e2fsprogs) ;for libcom_err ("sqlite" ,sqlite))) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:35 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:35 +0000 Received: from localhost ([127.0.0.1]:50705 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwI-0000ge-U3 for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:35 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36184) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvZ-0000Yn-RY for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:05 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKpRH; Thu, 30 Sep 2021 00:19:49 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 13/38] gnu: gobject-introspection: Use python instead of python-wrapper. Date: Thu, 30 Sep 2021 00:19:13 +0200 Message-Id: <20210929221938.17168-13-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953989; bh=Hmn536RufB5zH0RqRtgI/COEZzeOJletEsjLLXC9Zjg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Y3Yry6B5CrcsZOWJSW/PPFMd7b/sxlW+i0USjmJ9Oer8F13LCZeeUQhB7nB6fIeGh YMNMqjLLTnUx3e5pOquGMYWjsTcUBCth7rRDHs68EVvLjw8o/txorgxcKpMuXMEFG+ 9ZdnmZZsKCORUbwvsMBvSnr92t7cXmr+hiVunhEaNBjYw5kYUvVJys9b1YWRkW48Fo p7vY26Cz9ILI5VmkMvtaQak53WI/Fhb9uUT897GTogGMSp1d3EfAUYMZ2DZu/qG7oU Gd92AY7KQoOp3k8feUYC6+6QYxluYosW4m2g27D/MQfYJM3mlOJzDtRpveV8EVfMAL 7tODnAinsNPQg== X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 'python' is a tiny bit simpler than 'python-wrapper', and is already used when cross-compiling. Use it unconditionally. * gnu/packages/glib.scm (gobject-introspection)[inputs]{python}: Use 'python' even when compiling natively. --- gnu/packages/glib.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index cbaece6cf1..8117d7904d 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -489,9 +489,7 @@ be used when cross-compiling." ("bison" ,bison) ("flex" ,flex))) (inputs - `(,@(if (%current-target-system) - `(("python" ,python)) - `(("python" ,python-wrapper))) + `(("python" ,python) ("zlib" ,zlib))) (propagated-inputs `(("glib" ,glib) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:35 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:35 +0000 Received: from localhost ([127.0.0.1]:50707 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwJ-0000gl-6J for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:35 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36154) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvj-0000YW-Nn for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:05 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKzSX; Thu, 30 Sep 2021 00:19:59 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 35/38] gnu: libcap: Unconditionally use #$output. Date: Thu, 30 Sep 2021 00:19:35 +0200 Message-Id: <20210929221938.17168-35-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953999; bh=7FMrRAI+hoHB0h97dajzGW7URSZ1oTv6RBsTX85rGSo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=p9jmWXmjS+oW9T+mwjx288wh9M6LXDZpEb4OxYAOwFFcXi89GdCOCApudM4LupheX LQbu4KRKeiyjVewAo7Ksp2WpYh2UVgskSaQBIIid5OoyfTYFoAUiLqpbfQhBIdFo5B SoFJS8T/2FiAiyH1lNSPqITskCn/X8KyQ7m4F8Cz+rlv5K0ltCRDYl12WYMSLGfpPp WlHvRu7JV/UILzz6yQOagbfL5ALHl9bm5jEnoHKWhd1l0MATUb4GaQsYcQKlwYR3li GcsQBGEYEdCCnJ9TK/QFDm+MVwBfJYmqUWxCvods+dBxP2z+7jwpokpNMRNrTaR7rQ zeuzCx30Wopnw== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/linux.scm (libcap)[arguments]<#:phases>{configure}: Unconditionally use #$output instead of %output. --- gnu/packages/linux.scm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b771f65d92..3c8b4546af 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3004,12 +3004,7 @@ configuration (iptunnel, ipmaddr).") (substitute* "Make.Rules" (("LDFLAGS \\?= #-g") (string-append "LDFLAGS ?= -Wl,-rpath=" - ;; TODO(core-updates): Use #$output - ;; unconditionally. - #$(if (%current-target-system) - #~#$output - '%output) - "/lib")))))) + #$output "/lib")))))) #:test-target "test" #:make-flags (list "lib=lib" -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:35 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:35 +0000 Received: from localhost ([127.0.0.1]:50709 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwJ-0000gt-FS for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:35 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36370) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvk-0000Zk-48 for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:06 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKzSZ; Thu, 30 Sep 2021 00:19:59 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 36/38] gnu: libproxy: Respect #:tests?. Date: Thu, 30 Sep 2021 00:19:36 +0200 Message-Id: <20210929221938.17168-36-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953999; bh=jLhUhiWEFDu103zRABAn2hfAkw+BkNTRdpZgjkuZskM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=U+POeWrBxKRmv1elcONhj5S8duZLQWyrTKQQBo3FK70HzXISYCrFMYsJUqZaRM4XD QOzR9Pp2MPUKBhm4xIYfXYCluVXVsr3qTTtkSRTquQ0ZdSYOlU01vsE9uaT3CHT0t7 g8ZnDcTU0uURfbJa97uUPpLFpVEAS+/faJjYaM8CP7v9V5c9R7qLydXAS5n3NtT95e 2f5FXqVMhGTbPEQJWxrMJLwtPrQjoz0XucSj5VwyqNlWxUP40nnhI0dO8/PFe50mYH 5dSqDRrsAWwgAdkZQiG1ubJwr4ItYkaT3ke9WnBdd11P/5PBT4RPjXA84KZUb8sC7v TUGXjeEf9F+qg== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/networking.scm (libproxy)[arguments]<#:phases>{check}: Don't run the tests if the value for #:tests? is false. --- gnu/packages/networking.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index c426c95e71..d6a2b6bb6b 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2251,16 +2251,12 @@ sockets in Perl.") `(("dbus" ,dbus) ("zlib" ,zlib))) (arguments - `(#:phases + '(#:phases (modify-phases %standard-phases (replace 'check - ;; TODO(core-updates): Make this unconditional. - ,(if (%current-target-system) - '(lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "ctest" "-E" "url-test"))) - '(lambda _ - (invoke "ctest" "-E" "url-test"))))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "ctest" "-E" "url-test"))))))) (synopsis "Library providing automatic proxy configuration management") (description "Libproxy handles the details of HTTP/HTTPS proxy configuration for applications across all scenarios. Applications using -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:36 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:36 +0000 Received: from localhost ([127.0.0.1]:50711 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwJ-0000h0-PR for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:36 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36272) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvk-0000ZR-GG for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:06 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yL0Sb; Thu, 30 Sep 2021 00:20:00 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 37/38] build/qt-utils: Allow overriding the shell interpreter used. Date: Thu, 30 Sep 2021 00:19:37 +0200 Message-Id: <20210929221938.17168-37-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632954000; bh=v8dpSt+yBNsMIXNs2uxccAIAWbz/Ch1xmzKzziL1T9E=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=s9ntng9iMEpfEUML5ij+zcfk5IVBk1uqG8rfc0oilNGiWGIQzyD58g1zE088d8sSv unB8SmgTVxOra1MIpMc+vMciJjNw3sbztx8kD3ohc4HD+HhX0EO/dQBhrRscEnfK1Y WUCWFiT5pp0rgXNrEqNXy2Lrl/fSEvr+N9VQzJU7jZqYwdxr+d9IVlwQDIGF689VTH Da666SolVjqS8GgcIdCOWum3Zxe9rN1kZru54hpVrQt652SDKmfhBOXIgp172h2Ak1 TBfhWnpf1qPvyQ7yWCGoi0QMf83AKOF9PDVFkaWl+UahQ8lgDwLQBE7SxJOhnhQJmu CL9Pqh+cf7HIg== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * guix/build/qt-utils.scm (wrap-qt-program*): Add #:sh argument and pass it to 'wrap-program'. (wrap-qt-program): Likewise, but pass it to 'wrap-qt-program*' instead. (wrap-all-qt-programs): Likewise, but pass it to 'wrap-qt-program' instead. --- guix/build/qt-utils.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm index c2b80cab7d..97145a116d 100644 --- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -90,7 +90,7 @@ '("QTWEBENGINEPROCESS_PATH" = regular "/lib/qt5/libexec/QtWebEngineProcess")))) -(define* (wrap-qt-program* program #:key inputs output-dir +(define* (wrap-qt-program* program #:key sh inputs output-dir qt-wrap-excluded-inputs) (define input-directories @@ -105,9 +105,9 @@ (cons output-dir input-directories) output-dir))) (when (not (null? vars-to-wrap)) - (apply wrap-program program vars-to-wrap)))) + (apply wrap-program program #:sh sh vars-to-wrap)))) -(define* (wrap-qt-program program-name #:key inputs output +(define* (wrap-qt-program program-name #:key (sh (which "bash")) inputs output (qt-wrap-excluded-inputs %qt-wrap-excluded-inputs)) "Wrap the specified programm (which must reside in the OUTPUT's \"/bin\" directory) with suitably set environment variables. @@ -115,10 +115,11 @@ directory) with suitably set environment variables. This is like qt-build-systems's phase \"qt-wrap\", but only the named program is wrapped." (wrap-qt-program* (string-append output "/bin/" program-name) + #:sh sh #:output-dir output #:inputs inputs #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs)) -(define* (wrap-all-qt-programs #:key inputs outputs +(define* (wrap-all-qt-programs #:key (sh (which "bash")) inputs outputs (qt-wrap-excluded-outputs '()) (qt-wrap-excluded-inputs %qt-wrap-excluded-inputs) #:allow-other-keys) @@ -144,6 +145,7 @@ add a dependency of that output on Qt." ((output . output-dir) (unless (member output qt-wrap-excluded-outputs) (for-each (cut wrap-qt-program* <> + #:sh sh #:output-dir output-dir #:inputs inputs #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs) (find-files-to-wrap output-dir)))))) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:36 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:36 +0000 Received: from localhost ([127.0.0.1]:50713 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwK-0000h7-3z for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:36 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36344) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvk-0000Zb-RA for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:06 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yL0Se; Thu, 30 Sep 2021 00:20:00 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 38/38] lint: check-wrapper-inputs: Remove mentions of core-updates. Date: Thu, 30 Sep 2021 00:19:38 +0200 Message-Id: <20210929221938.17168-38-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632954000; bh=P1BKDHo+NzXFnTkGv7/kqZyiXCiO/gVMh2GTNAfUmWc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=u9y052hOZs3F2gCnzeopr7BKo2D6yiwns/7BEPW669XcFCjJG/ZhYs2C92ATzVJe5 3g0ysE7YwngT7o9RS09p2CjGKiBLe1bbcnXZYLEUhoJBqa8z2tsfHz9Nc681qO34my 3e6kcoIJuji7Xo48j9bq20CjFCjYGV5Qh7voRs0h79Qg8OPCU/WQWVP/wVr/Mb4oHe JOqBXSg6XcTzQGHUx73BlW1X2FtfekRGvJfRCuVIUwjDWDuqURqZ4f6nkYrrU85+sk KhWeetnoOpk26twt7PUAvl/Fi3DFOfBolUkSWpUTQJOsl5HIhG6FZWeMeBoWlIiYc1 dPftEWTrwFYYg== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) The #:sh argument of 'wrap-program' and 'wrap-qt-program' is now in the current branch, so some comments aren't relevant anymore. * guix/lint.scm (check-wrapper-inputs)[check-procedure-body]: Remove mentions of core-updates. --- guix/lint.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/guix/lint.scm b/guix/lint.scm index 217a0d6696..2a703f9b6d 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -552,13 +552,10 @@ or \"bash-minimal\" is not in its inputs. 'wrap-script' is not supported." (define (check-procedure-body body) (match body ;; Explicitely setting an interpreter is acceptable, - ;; #:sh support is added on 'core-updates'. - ;; TODO(core-updates): remove mention of core-updates. (('wrap-program _ '#:sh . _) '()) (('wrap-program _ . _) (list (report-wrap-program-error package 'wrap-program))) ;; Wrapper of 'wrap-program' for Qt programs. - ;; TODO #:sh is not yet supported but probably will be. (('wrap-qt-program _ '#:sh . _) '()) (('wrap-qt-program _ . _) (list (report-wrap-program-error package 'wrap-qt-program))) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 29 18:20:36 2021 Received: (at 50905) by debbugs.gnu.org; 29 Sep 2021 22:20:36 +0000 Received: from localhost ([127.0.0.1]:50715 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhwK-0000hF-ER for submit@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:36 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:36256) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mVhvh-0000ZP-Bn for 50905@debbugs.gnu.org; Wed, 29 Sep 2021 18:20:10 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id zyKh2500E0mfAB401yKxS9; Thu, 30 Sep 2021 00:19:57 +0200 From: Maxime Devos To: 50905@debbugs.gnu.org Subject: [PATCH 29/38] gnu: freedesktop: Unconditionally use alternatives to % variables. Date: Thu, 30 Sep 2021 00:19:29 +0200 Message-Id: <20210929221938.17168-29-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> References: <20210929221938.17168-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1632953997; bh=9bXXNf5sim3mWFDknGYsD4UkcW172PltQqj2lChp1sg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XeS6ovTH6V1GbszCLUvG4JO3NYZQDC3PrR651t4FMF6lVgICi4sXNGfPa7g2guSAt 0NXeUAEwaNzM0nQDgs0f/6tw2Z2F+H7ILQT8p9y9YkcUxXtfm5FGhXCZFxCSVekPel QsQ3ZJ2pSOlPT2c8KU4sc8Z0ZqXiQ3mFodDo+PHskp6zJbgbaCOs5s+e5h0Jwn4ydn aWoumvRRYVrbfmAMrPjN8CNalBg4Z8a70pDmgroZHrorwUb/K0pLtVuSo/mAZSMHrR +eI9qiyViSyqGVhnt6Gr6tanI3lip4jyMYm7g+AWadFigOR/jickNWiZFIg9yBgiqS b99rKfbnPr84Q== X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/freedesktop.scm (elogind)[arguments]<#:configure-flags>: Use #$output and this-package-input instead of %outputs and %build-inputs. --- gnu/packages/freedesktop.scm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 550253bc34..9bcf2d8d3e 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -583,20 +583,12 @@ the freedesktop.org XDG Base Directory specification.") (build-system meson-build-system) (arguments `(#:configure-flags - ;; TODO(core-updates): Use #$output unconditionally. - ,#~(let* ((out #$(if (%current-target-system) - #~#$output - #~(assoc-ref %outputs "out"))) + ,#~(let* ((out #$output) (sysconf (string-append out "/etc")) (libexec (string-append out "/libexec/elogind")) (dbuspolicy (string-append out "/etc/dbus-1/system.d")) - ;; TODO(core-updates): use this-package-input unconditionally. - (shadow #$(if (%current-target-system) - (this-package-input "shadow") - #~(assoc-ref %build-inputs "shadow"))) - (shepherd #$(if (%current-target-system) - (this-package-input "shepherd") - #~(assoc-ref %build-inputs "shepherd"))) + (shadow #$(this-package-input "shadow")) + (shepherd #$(this-package-input "shepherd")) (halt-path (string-append shepherd "/sbin/halt")) (kexec-path "") ;not available in Guix yet (nologin-path (string-append shadow "/sbin/nologin")) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 05:53:08 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 09:53:08 +0000 Received: from localhost ([127.0.0.1]:54719 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWFE4-0008Sn-Ga for submit@debbugs.gnu.org; Fri, 01 Oct 2021 05:53:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWFE0-0008SG-47 for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 05:53:07 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:38772) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWFDu-0006WK-7a; Fri, 01 Oct 2021 05:52:58 -0400 Received: from 2a01cb000492e90078753f5c96c7583f.ipv6.abo.wanadoo.fr ([2a01:cb00:492:e900:7875:3f5c:96c7:583f]:44074 helo=meije) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWFDt-0003cd-VM; Fri, 01 Oct 2021 05:52:58 -0400 From: Mathieu Othacehe To: Maxime Devos Subject: Re: bug#50905: [PATCH core-updates 00/38] Clean up TODO(core-updates) References: <20210929221938.17168-1-maximedevos@telenet.be> Date: Fri, 01 Oct 2021 09:52:55 +0000 In-Reply-To: <20210929221938.17168-1-maximedevos@telenet.be> (Maxime Devos's message of "Thu, 30 Sep 2021 00:19:01 +0200") Message-ID: <87ee95oyvc.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 50905 Cc: 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello Maxime, > +(define mozilla-build-system > + (build-system > + (name 'mozilla) > + (description "The build system for Mozilla software using the Autotools") > + (lower lower-mozilla))) This new build system should be documented in the "Build systems" section of the documentation. Otherwise, the series looks fine and I'll probably apply it once the above comment is fixed. Thanks, Mathieu From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:23:28 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:23:28 +0000 Received: from localhost ([127.0.0.1]:56896 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJRg-0005Yu-JP for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:23:28 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:40648) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJRe-0005Yk-3A for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:23:26 -0400 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by baptiste.telenet-ops.be with bizsmtp id 0ePQ2600C0mfAB401ePQTW; Fri, 01 Oct 2021 16:23:24 +0200 Message-ID: <4634ad659e6d149c09bd34890f3614d7172a754a.camel@telenet.be> Subject: Re: bug#50905: [PATCH core-updates 00/38] Clean up TODO(core-updates) From: Maxime Devos To: Mathieu Othacehe Date: Fri, 01 Oct 2021 16:23:18 +0200 In-Reply-To: <87ee95oyvc.fsf_-_@gnu.org> References: <20210929221938.17168-1-maximedevos@telenet.be> <87ee95oyvc.fsf_-_@gnu.org> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-8r1SOtNMngX5q14e7ekE" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098205; bh=/tGeMP1oXgWfKKKHFLJuUnxAOCN0lfXICpbg/iFu88c=; h=Subject:From:To:Cc:Date:In-Reply-To:References; b=kf6td6LoKfh21CeKtYgry41D3Tg1XMK1ejOCYRjOypjsnIwMeNUegIReTU2BiEeVx dWHdoDkYcExQXqExRXdSeM8AMdSUD7q7oCmxRGMDN0WeJMDFGXwTWnse1c3O+E+Dyw 6F22zhA117VeOFt0D19WsTVkrjIlrAh1z/EAACx0Ci2yC1gdFNNUKHXpyjqOQrgu1s EG5DpCJrzue0rMotlXVDvC4kYHFe46Ca2saSkQGZnb57N931UPjGVodUaQQd7Gibma CqdkoKBl63QtdKlbjRjtbs+bIGZkGx0j9CY3X0Palr1P6nXb8hfhUF7K41q2z7WnKJ XuquwtqOedf4Q== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-8r1SOtNMngX5q14e7ekE Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Mathieu Othacehe schreef op vr 01-10-2021 om 09:52 [+0000]: > Hello Maxime, >=20 > > +(define mozilla-build-system > > + (build-system > > + (name 'mozilla) > > + (description "The build system for Mozilla software using the Auto= tools") > > + (lower lower-mozilla))) >=20 > This new build system should be documented in the "Build systems" > section of the documentation. >=20 > Otherwise, the series looks fine and I'll probably apply it once the > above comment is fixed. I sent a v2, wherein the =E2=80=98gnu: icecat: Use mozilla-build-system.=E2= =80=99 documents the build system in doc/guix.texi. Greetings, Maxime. --=-8r1SOtNMngX5q14e7ekE Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYVcZ1hccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7gyaAP40DJ61SmSUY56BQyXQZydiPhAF nE32IriZZ6H/BjwbmgEAwOhruFXXpqVWPQ14ia2/E06EJjN0FQ8vDOHbLWeqgQU= =TD+H -----END PGP SIGNATURE----- --=-8r1SOtNMngX5q14e7ekE-- From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:12 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:12 +0000 Received: from localhost ([127.0.0.1]:56899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTL-0005bd-Ue for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:12 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33302) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ4-0005Tb-ER for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:49 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMnKP; Fri, 01 Oct 2021 16:21:47 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 02/38] gnu: nspr: Use mozilla-build-system. Date: Fri, 1 Oct 2021 16:21:04 +0200 Message-Id: <20211001142140.17027-2-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098107; bh=vljAjo3/PZeUZYRN1VIkfQoAGE+KBNPQ84xN0OBM6bY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vIB4bQskyDta7JLnGujuJddvA/RTaNfn7qJFqXH6fY9PRVjnqlC1jNKDGFhoYyyBV KNzO3pwV+Uue6Q9VvExJ+9YJXWnhe4SZbJaXLXy5bY5emttOe4KwaFMpLDt6Og8WyM /63UGVPiY+zUnjB1TGl75/WOJdtGVn/2EMge7yOBW5iX8+vJ1YoINC/pMeCnb8IAOD twaLUhteOajjUDav3c73rh5MZ/0sTiSuENQXFS0J8Eqg6EOvRa6L+eChLJSRSuW3VX VERYh/A+aCGA5XMAhUv4d4MSN5S1CWiOgxLrwXmIQuCFk0DuVJiAINollFxaudZCEe FkWNGTWxY/K3w== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/nss.scm (nspr)[build-system]: Adjust it. (nspr)[arguments]<#:configure-flags>: Remove now superfluous --target and --host. --- gnu/packages/nss.scm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 381756e387..6196ad692d 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -29,6 +29,7 @@ #:use-module (guix gexp) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (guix build-system mozilla) #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages) #:use-module (gnu packages bash) @@ -49,7 +50,7 @@ (sha256 (base32 "1j5b2m8cjlhnnv8sq34587avaagkqvh521w4f95miwgvsn3xlaap")))) - (build-system gnu-build-system) + (build-system mozilla-build-system) (inputs ;; TODO(core-updates): Make these inputs unconditional. ;; For 'compile-et.pl' and 'nspr-config'. @@ -72,16 +73,7 @@ (list "--disable-static" "--enable-64bit" (string-append "LDFLAGS=-Wl,-rpath=" - (assoc-ref %outputs "out") "/lib") - ;; Mozilla deviates from Autotools conventions - ;; due to historical reasons. Adjust to Mozilla conventions, - ;; otherwise the Makefile will try to use TARGET-gcc - ;; as a ‘native’ compiler. - ,@(if (%current-target-system) - `(,(string-append "--host=" - (nix-system->gnu-triplet (%current-system))) - ,(string-append "--target=" (%current-target-system))) - '())) + (assoc-ref %outputs "out") "/lib")) ;; Use fixed timestamps for reproducibility. #:make-flags '("SH_DATE='1970-01-01 00:00:01'" ;; This is epoch 1 in microseconds. -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:12 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:12 +0000 Received: from localhost ([127.0.0.1]:56901 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTM-0005bf-7Y for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:12 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33316) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ4-0005Td-EP for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:50 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMnKc; Fri, 01 Oct 2021 16:21:47 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 04/38] gnu: icecat: Use mozilla-build-system. Date: Fri, 1 Oct 2021 16:21:06 +0200 Message-Id: <20211001142140.17027-4-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098107; bh=sTdB+hC/jnMw4GG2vc6eHlsT6AH09md3iN1TflsFCgk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fYRECn5cZ7a7D//ONIxYKJl1cWfdFoaPhkrVsXidJKCW4R0qxWMvDfGYIEcEnSMgU fVhNaDpCyh0c8Xn/IdtUZ6OShnWwKk8KVyMjs7BdR+nvZI5JKRjH8ewMUnE0aXf57U hyxzAGQwxgIpmrZIPaEe1pQ0iBi/VtAh6PGYx4tCGJfZoYfMx5FVwIh/ckaYRiJMdG FFmaabqHlKja8cfo6N+DgJ2nPmXw4rmBU9k8H578cEtxHaqSCeh4JS997ELVzIurxT kWnfB/cz2c37eafEdewW/lKpPn4FEccJwN8ZBogorYpX5PWmEoDElIHHv2pV0hD3AW MBYBWGjhy1TYw== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This doesn't actually have any effect because the 'configure' phase is replaced. * gnu/packages/gnuzilla.scm (icecat)[build-system]: Use mozilla-build-system. --- gnu/packages/gnuzilla.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 9647bb7db5..655b0c04c3 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -884,7 +884,7 @@ from forcing GEXP-PROMISE." (name "icecat") (version %icecat-version) (source icecat-source) - (build-system gnu-build-system) + (build-system mozilla-build-system) (inputs `(("alsa-lib" ,alsa-lib) ("bzip2" ,bzip2) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:12 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:12 +0000 Received: from localhost ([127.0.0.1]:56903 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTM-0005bm-Ea for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:12 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33342) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ4-0005Tf-Dd for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:50 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMnKp; Fri, 01 Oct 2021 16:21:47 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 06/38] gnu: mozjs: Make the native-inputs unconditional. Date: Fri, 1 Oct 2021 16:21:08 +0200 Message-Id: <20211001142140.17027-6-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098107; bh=0nUJJabp+zVKDApycT0iSpv9225T9FdSLVDPaaKDKNo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NUCvHZcQjSRoKMoBjEYnxj1YK0A1jAp80EtOFdYV770LQj0768zldoGgg42WOrtxL 8JOQIiw8zSHUYPxjP+s3Q9AtdtfbGeHGEMWIODG4JlfroMSS8m1UK9DDDV8ZQvPYHH XoX/4KDDtgUYt+B/BRIvsJu1WtgsxlD/vk0C6hL3KNHl4zEwvyHK+yxwx9Ld6odv5T 7x+dX+qnp9eiHvcr2/mKHwER32LhkUO0CWdVRQcJdSFtrDMiq049Au2C94Ic0FPJ6l +AxSmJ/Ml3D8zr0sNd7r/jcsd2mDSWnJ9C9b1lUfj3x6PQv2y5ySEO8kgBjw1GODO5 lT7Z8cLqBM8xA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/nss.scm (mozjs)[inputs]: Always include 'perl" and 'bash-minimal', even when compiling natively. --- gnu/packages/nss.scm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index 6196ad692d..6315138c89 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -52,12 +52,9 @@ "1j5b2m8cjlhnnv8sq34587avaagkqvh521w4f95miwgvsn3xlaap")))) (build-system mozilla-build-system) (inputs - ;; TODO(core-updates): Make these inputs unconditional. ;; For 'compile-et.pl' and 'nspr-config'. - (if (%current-target-system) - `(("perl" ,perl) ; for 'compile-et.pl' - ("bash-minimal" ,bash-minimal)) ; for 'nspr-config' - '())) + `(("perl" ,perl) ; for 'compile-et.pl' + ("bash-minimal" ,bash-minimal))) ; for 'nspr-config' (native-inputs `(("perl" ,perl))) (arguments -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:12 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:12 +0000 Received: from localhost ([127.0.0.1]:56905 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTM-0005bt-Lm for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:12 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33358) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ4-0005Ti-Ls for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:51 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMnL1; Fri, 01 Oct 2021 16:21:48 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 08/38] gnu: isc-dhcp: Don't use canonical-package. Date: Fri, 1 Oct 2021 16:21:10 +0200 Message-Id: <20211001142140.17027-8-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098108; bh=CGpXVEGPdOA07TT/1tOmXDHEByyTr0XyOyvkuGoF4BY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EWdeVnE/vifIxCNpdt+mHEFQ1lUgF5NQ1DQ8kOmQGxADz4OdptKIUx9kCjMVsXyuh AmBArB+O5xw8LE36zVa57hV1Ap2FX6C3jpIewQIwmv8FSlrr/IEX1uRH4y1n6bI5ms uayOUxR8X4/W+BAH+DXuqGt10VOzFdW/zUvVgxBDPdcmWqyc0MfG7HKy7TTnsvYCoE l6RhGe3E3egf55CX5iCZhwgls0B7zN/9IQC+5RVUkhGV9rtk6bv5KiQO1DnHDj1fq2 DftHSyFWgy7bvY9o24/BE3nZRf0Lj0bR5ZR9nEDRa1OTXd7q2nU22bcguvOH24gffy cNfcW5yoQR6fA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) As I understand it, canonical-package is only for things that won't end up in the closure, so canonical-package shouldn't be used here. * gnu/packages/admin.scm (isc-dhcp)[inputs]{bash}: Remove 'canonical-package'. --- gnu/packages/admin.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index aad8586a71..c535baf1d6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1318,7 +1318,7 @@ connection alive.") ;; TODO(core-updates): simply make this unconditional ,@(if (%current-target-system) ;; for wrap-program - `(("bash" ,(canonical-package bash-minimal))) + `(("bash" ,bash-minimal)) '()) ,@(if (hurd-target?) '() `(("net-tools" ,net-tools) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:13 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:13 +0000 Received: from localhost ([127.0.0.1]:56907 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTM-0005c0-SW for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:13 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ4-0005Th-Hi for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:51 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMnKv; Fri, 01 Oct 2021 16:21:47 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 07/38] gnu: mozjs: Make the quasiquote unconditional. Date: Fri, 1 Oct 2021 16:21:09 +0200 Message-Id: <20211001142140.17027-7-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098107; bh=0/rAoM65eJlMQWUPLBJdJTahIdtfBENf+X7vRhbmmeg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=aX8HiHzLdbYG7xosOS2INskPKrAn78DNN5yV3M6mwTXBJA74WQT0v/aD/isnOYoeo zwypri3cJMZ64i9W3aQd1AG3H8ZePN6SYYANX6+yUGpZ4SO+yaBxMXf5HNsf3XpnC9 pTEYoUloX8fAUOB92hcaqtmd3XxfOjHROKVnqm8i47axg7ZoWTbKlX+sf+e08M4bMo gTYxmRsCQjYorvTLrjfupVHCWF2kpYZyGrpMcKLUHx7cLxIsnLSwkdRyqprxL1i2LH zijdD+tcAho/p3hh1mcYV6wiBE3inTHx1GZBtLzAnk7dibWLL2mrY+hgXD8ubCWEpW CFhqbPc/bCBeA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/nss.scm (mozjs-60)[arguments]<#:configure-flags>: Always use quasiquote instead of quote. --- gnu/packages/gnuzilla.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 655b0c04c3..5273fbddf0 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -370,11 +370,7 @@ in C/C++.") `(#:tests? #f ; FIXME: all tests pass, but then the check phase fails anyway. #:test-target "check-jstests" #:configure-flags - ;; TODO(core-updates): unconditionally use 'quasiquote - ,#~(#$(if (%current-target-system) - #~quasiquote - #~quote) - ("--enable-ctypes" + ,#~`("--enable-ctypes" "--enable-optimize" "--enable-pie" "--enable-readline" @@ -391,7 +387,7 @@ in C/C++.") ;; This is important because without it gjs will segfault during the ;; configure phase. With jemalloc only the standalone mozjs console ;; will work. - "--disable-jemalloc")) + "--disable-jemalloc") #:phases (modify-phases %standard-phases ;; Make sure pkg-config will be found. -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:13 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:13 +0000 Received: from localhost ([127.0.0.1]:56909 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTN-0005c8-3n for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:13 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33304) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ4-0005Ta-ET for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:51 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMmK0; Fri, 01 Oct 2021 16:21:47 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 01/38] build-system/mozilla: New build system. Date: Fri, 1 Oct 2021 16:21:03 +0200 Message-Id: <20211001142140.17027-1-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098107; bh=w34kHtGWnBZ5MxjxizImitn0skaztKbb1wU8Y5diKMo=; h=From:To:Cc:Subject:Date; b=QC5RAO9aHIP7zCP1nZJjIb21iFxGWCXHMVAPPfJDbyiDLWjOszt7M2o14hFrCo9A/ EQpB8u0fWD8c0KRX5KjsneuCBGRbvtTF1I3XhNkSERTdU0O60Ccpvq60+A7HV+P1Uk A0tGL3XcIhmtnQEhEPghUjeR/aIWzK5lYVhEXoLnHXs0KH+y9Aoubg4xVgu5lhelll EG6ft1/BlHDXmfiX3IZmEC6wl2HaM4iWJSTSV+ZbFLopC+iuzbjlELAGSXewrBgk88 lnl7MKHBRXYv5+5TCoA9OPHwqE/EBEgA+v32WnOsF0A99y5KtDNlxMVVdY3glrN8P4 DT3W7N6QAGeGw== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * guix/build-system/mozilla.scm (lower-mozilla): New procedure. (mozilla-build-system): New variable. * Makefile.am (MODULES): Add it. * doc/guix.texi (Build Systems): Document it. --- Makefile.am | 1 + doc/guix.texi | 9 ++++++ guix/build-system/mozilla.scm | 52 +++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 guix/build-system/mozilla.scm diff --git a/Makefile.am b/Makefile.am index 56f60278b7..76166f4eec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -140,6 +140,7 @@ MODULES = \ guix/build-system/font.scm \ guix/build-system/go.scm \ guix/build-system/meson.scm \ + guix/build-system/mozilla.scm \ guix/build-system/minify.scm \ guix/build-system/minetest.scm \ guix/build-system/asdf.scm \ diff --git a/doc/guix.texi b/doc/guix.texi index 830a230bd0..996526eb83 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8000,6 +8000,15 @@ directory, the parameter @code{#:javascript-files} can be used to specify a list of file names to feed to the minifier. @end defvr +@defvr {Scheme Variable} mozilla-build-system +This variable is exported by @code{(guix build-system mozilla)}. It +sets the @code{--target} and @code{--host} configuration flags to what +software developed by Mozilla expects -- due to historical reasons, +Mozilla software expects @code{--host} to be the system that is +cross-compiled from and @code{--target} to be the system that is +cross-compiled to, contrary to the standard Autotools conventions. +@end defvr + @defvr {Scheme Variable} ocaml-build-system This variable is exported by @code{(guix build-system ocaml)}. It implements a build procedure for @uref{https://ocaml.org, OCaml} packages, which consists diff --git a/guix/build-system/mozilla.scm b/guix/build-system/mozilla.scm new file mode 100644 index 0000000000..b4141c8177 --- /dev/null +++ b/guix/build-system/mozilla.scm @@ -0,0 +1,52 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Maxime Devos +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix build-system mozilla) + #:use-module (guix build-system gnu) + #:use-module (guix build-system) + #:use-module (guix utils) + #:export (mozilla-build-system)) + +;; +;; Build procedure for packages using Autotools with the Mozillian conventions +;; for --target, --host and --build, which are different from the GNU +;; conventions. +;; +;; Code: + +(define* (lower-mozilla name #:key system target #:allow-other-keys + #:rest arguments) + (define lower (build-system-lower gnu-build-system)) + (if target + (apply lower + (substitute-keyword-arguments arguments + ;; Override --target and --host to what Mozillian configure + ;; scripts expect. + ((#:configure-flags configure-flags ''()) + `(cons* ,(string-append "--target=" target) + ,(string-append "--host=" (nix-system->gnu-triplet system)) + ,configure-flags)))) + (apply lower name arguments))) ; not cross-compiling + +(define mozilla-build-system + (build-system + (name 'mozilla) + (description "The build system for Mozilla software using the Autotools") + (lower lower-mozilla))) + +;;; mozilla.scm ends here base-commit: 0cccc2f52cedd9b0e0646cc4d3ae64a886f2db6b -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:13 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:13 +0000 Received: from localhost ([127.0.0.1]:56911 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTN-0005cF-Hz for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:13 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33326) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ4-0005Te-EK for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:51 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMnKi; Fri, 01 Oct 2021 16:21:47 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 05/38] build/minetest-build-system: Move png-file? to (guix build utils). Date: Fri, 1 Oct 2021 16:21:07 +0200 Message-Id: <20211001142140.17027-5-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098107; bh=VVt3ntCLp/UoKgWoBp+TFdwruGuf+mFnPp+kfLWP5Y0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MufgqSwJg6CtKaDs5QTJDgN7fFb5qURLElMUFmVgkmRKrikXNq2XNsnc6iP0qrdpF VDK4+3U+D8JDPBKOeSaYvovPdneLds5u+w6oYKvBMA6cFNVA4ackk3nxTFWSRkN4mX Dk3IfDKK/Sib47CmqkCEc+PWCY+WOrzT+zHvBA8boUHX9omSvKLsYZTpfNiE2QrzY+ z8rhTqJO4lDR1uHlCoJmf3G9MHlGTp3mMJnTulM1E3seimwxZUzNsL3eNIC/luTQwv 4A1uxAvmN/7H1JAizYqL8uR6ybZhcCUfoqjZMSKpGnTr0SdpUXEaIAEyHEhi98+/mX 5kWB+t0z1aVIA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) It's not really Minetest-specific. It was only placed in (guix build minetest-build-system) to avoid a world rebuild. * guix/build/minetest-build-system.scm (%png-magic-bytes,png-file?): Move to ... * guix/build/utils.scm (%png-magic-bytes,png-file?): ... here. --- guix/build/minetest-build-system.scm | 9 --------- guix/build/utils.scm | 11 +++++++++++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/guix/build/minetest-build-system.scm b/guix/build/minetest-build-system.scm index 477cc3d1d0..5d7d8d2292 100644 --- a/guix/build/minetest-build-system.scm +++ b/guix/build/minetest-build-system.scm @@ -90,15 +90,6 @@ If it is unknown, make an educated guess." #:install-plan (mod-install-plan (apply guess-mod-name arguments)) arguments)) -(define %png-magic-bytes - ;; Magic bytes of PNG images, see ‘5.2 PNG signatures’ in - ;; ‘Portable Network Graphics (PNG) Specification (Second Edition)’ - ;; on . - #vu8(137 80 78 71 13 10 26 10)) - -(define png-file? - ((@@ (guix build utils) file-header-match) %png-magic-bytes)) - (define* (minimise-png #:key inputs native-inputs #:allow-other-keys) "Minimise PNG images found in the working directory." (define optipng (which "optipng")) diff --git a/guix/build/utils.scm b/guix/build/utils.scm index 3beb7da67a..39e581b0fa 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -61,6 +61,8 @@ symbolic-link? call-with-temporary-output-file call-with-ascii-input-file + file-header-match + png-file? elf-file? ar-file? gzip-file? @@ -290,6 +292,15 @@ with the bytes in HEADER, a bytevector." #f ;FILE is a directory (apply throw args)))))) +(define %png-magic-bytes + ;; Magic bytes of PNG images, see ‘5.2 PNG signatures’ in + ;; ‘Portable Network Graphics (PNG) Specification (Second Edition)’ + ;; on . + #vu8(137 80 78 71 13 10 26 10)) + +(define png-file? + (file-header-match %png-magic-bytes)) + (define %elf-magic-bytes ;; Magic bytes of ELF files. See . (u8-list->bytevector (map char->integer (string->list "\x7FELF")))) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:14 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:14 +0000 Received: from localhost ([127.0.0.1]:56913 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTN-0005cM-Qt for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:13 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33366) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ4-0005Tj-PG for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:51 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMoL5; Fri, 01 Oct 2021 16:21:48 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 09/38] gnu: isc-dhcp: Make an input unconditional. Date: Fri, 1 Oct 2021 16:21:11 +0200 Message-Id: <20211001142140.17027-9-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098108; bh=Yk+kDz1RDTVDV4bN5aLyyFuYBedaPc7RlhbPuNasVwI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RZz7SeW+dKoPy0A+K3mgE0UMRvko0iCYJQsAjYeUrMHrmIu4llG/uwB7WGJ6BegE9 AdNVANuYxIgWLnkQXU2+409EykK3wDkBdHCialBpB1c2D7dICCHLu5SR+7eh+mBond muL8Rh8TtN+ch6bp7xkVQnlVHfk34jZ72GLfKK6p6Am6k8I/7XMrM8JnylSb6xplYE qfjQXcApF0KwawMbKv5nQwgj1VW2GexVqW2JLU7Wfq4rTe+UW4Eux1j3SRD7QsDEco Qbu8kwyfo8meR2mOpS55xgXamz5s9ziUZ25i5qro/PaM1oMvP+5VxnnCXFI03qpLOr byH9I4UvTvm5Q== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/admin.scm (isc-dhcp)[inputs]{bash}: Always include this input, even when compiling natively. --- gnu/packages/admin.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index c535baf1d6..744692bb6c 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1315,11 +1315,7 @@ connection alive.") ("file" ,file))) (inputs `(("inetutils" ,inetutils) - ;; TODO(core-updates): simply make this unconditional - ,@(if (%current-target-system) - ;; for wrap-program - `(("bash" ,bash-minimal)) - '()) + ("bash" ,bash-minimal) ,@(if (hurd-target?) '() `(("net-tools" ,net-tools) ("iproute" ,iproute))) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:14 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:14 +0000 Received: from localhost ([127.0.0.1]:56915 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTO-0005cT-14 for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:14 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33386) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ5-0005Tl-38 for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:52 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMoLF; Fri, 01 Oct 2021 16:21:48 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 11/38] gnu: isc-dhcp: Remove trailing #t. Date: Fri, 1 Oct 2021 16:21:13 +0200 Message-Id: <20211001142140.17027-11-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098108; bh=A9VLAeR+reKgwipy3W/twWU4asR3YGGGZgnXpB4vWDs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dLMJYx5178k65TFbpbXsLfgCiGdv7yHv5fvsLu8JhlWOFSG5d7vrQn2afFkyGsCSv 6tPEvH1+S5TYbYU1Y46BUthzUlW50gXG6xXaA/8pXLT3eW1EDLvFjMIXTxfUPbdp4Q HGXzq4vNuPNwFPdp6Actefn5HQlF7BAiteFDdqHwD/keQTI4Tsesqu9Bs599V6WM0c /LKFvA5zUhr3C6Ufh2hITJcWjFw/2tWWQyKl5/B4I+xy+oAuEbPQTDvIQnmG3Zffef iScCuZKPT3cbAKcuXEe29IsVz987gCLIQTrxkaM7MVmGLKgsZfhdSW0qhy5/knBK3J 7JZwEZC5dCIPQ== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) They aren't required anymore on core-updates. * gnu/packages/admin.scm (isc-dhcp)[arguments]<#:phases>: Remove trailing #t. --- gnu/packages/admin.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 57801200bd..78b37c04d7 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1218,8 +1218,7 @@ connection alive.") (("^RELEASETYPE=.*") (format #f "RELEASETYPE=~a\n" ,bind-release-type)) (("^RELEASEVER=.*") - (format #f "RELEASEVER=~a\n" ,bind-release-version))) - #t)) + (format #f "RELEASEVER=~a\n" ,bind-release-version))))) ,@(if (%current-target-system) '((add-before 'configure 'fix-bind-cross-compilation (lambda _ @@ -1290,8 +1289,7 @@ connection alive.") ,(map (lambda (dir) (string-append dir "/bin:" dir "/sbin")) - (list inetutils net-tools coreutils sed)))) - #t)))))) + (list inetutils net-tools coreutils sed)))))))))) (native-inputs `(("perl" ,perl) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:14 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:14 +0000 Received: from localhost ([127.0.0.1]:56917 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTO-0005cb-7v for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:14 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33394) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ5-0005Tm-7H for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:52 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMoLM; Fri, 01 Oct 2021 16:21:48 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 12/38] gnu: gobject-introspection: Move things to native-inputs. Date: Fri, 1 Oct 2021 16:21:14 +0200 Message-Id: <20211001142140.17027-12-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098108; bh=eThyqZx1j58+TnVqKMEs4M8T54v78kMtximnREY6a9w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UmzNTIk+QEigj3/YjkoC7GsM7vtHY/tP673XnateJiEp1FbWFpV5G1EjT7iS8+G2i UGhUUOl0v0sJY0se3y6UXRq0VarVCBveZJV0qIfPNtvMuogyIlTdly7lq35Om9zqmQ bCIMajLSiOAZyIUJPQwQl/jmIC73bbG8Z3gu72Cg4osaShdKvnfZFNJP9vAtnK8xoe LIJiD0FbCuOofyuLfBV6ALjhanv3yShbMFGcUn+iX1dNnC/2ks3zqhyKkPSktrxHlI esvXx+klvbCR2vY0PgJdsiFZOexMF0JIzc1PRBMDWgYqMMNQkhwkDdPIJawdabUKGc 6Nh/K9woKzfQQ== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/glib.scm (gobject-introspection)[native-inputs]: Make 'bison' and 'flex' inputs unconditional ... (gobject-introspection)[inputs]: ... and unconditionally remove them here. --- gnu/packages/glib.scm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index bdcc108ac1..cbaece6cf1 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -486,18 +486,12 @@ be used when cross-compiling." (native-inputs `(("glib" ,glib "bin") ("pkg-config" ,pkg-config) - ;; TODO(core-updates): Unconditionally place "flex" and "bison" - ;; in 'native-inputs'. - ,@(if (%current-target-system) - `(("bison" ,bison) - ("flex" ,flex)) - '()))) + ("bison" ,bison) + ("flex" ,flex))) (inputs `(,@(if (%current-target-system) `(("python" ,python)) - `(("bison" ,bison) - ("flex" ,flex) - ("python" ,python-wrapper))) + `(("python" ,python-wrapper))) ("zlib" ,zlib))) (propagated-inputs `(("glib" ,glib) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:14 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:14 +0000 Received: from localhost ([127.0.0.1]:56919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTO-0005ci-FP for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:14 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33378) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ4-0005Tk-Tp for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:52 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMoL8; Fri, 01 Oct 2021 16:21:48 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 10/38] gnu: isc-dhcp: Remove unnecessary shebang patching. Date: Fri, 1 Oct 2021 16:21:12 +0200 Message-Id: <20211001142140.17027-10-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098108; bh=UOgLmA0Q2Kcq7Zx/3nOGDBZyxl5ppcEHC40ZKHK3ldI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=VH2CqoYuAfFyCGUYFSM6sYVERsQhAKpcSe4MGS7XHEENTDiBU11HvMwVW2uoDRTuf OwgKcvQWCTW4Wn6NfOVpvkuZCT6kDsROQzohxFe2JIkF+jAT2CvCfXeAqKzgQkqoJF dEzDx5jc4WOc7C327uhymPwKYy7HnmKJILEJen+ZEhNG/GtNYNtNUNh2NdZ0SCZjou TPZrkYamcZmATS6LrCyzWP4kMj88gB/rmRES4wKcfu494utZqaPnzdA69nWhJk4DIz 7BY+TXsWPUYpwI+a00mKhmRsJ9CUq7XXu5bEOd+IgHfSIiGtk+GueHWFjhJ5Dxo+6i nivcDzDYN0yDg== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/admin.scm (isc-dhcp)[arguments]<#:phases>{post-install}: Remove parts indicated by TODOs. --- gnu/packages/admin.scm | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 744692bb6c..57801200bd 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1267,11 +1267,7 @@ connection alive.") "--owner=root:0" "--group=root:0"))))) (add-after 'install 'post-install - ;; TODO(core-updates): native-inputs isn't required anymore. - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) - inputs outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) ;; Install the dhclient script for GNU/Linux and make sure ;; if finds all the programs it needs. (let* ((out (assoc-ref outputs "out")) @@ -1295,19 +1291,6 @@ connection alive.") (string-append dir "/bin:" dir "/sbin")) (list inetutils net-tools coreutils sed)))) - ;; TODO(core-updates): should not be required anymore, - ;; once has been merged. - ,@(if (%current-target-system) - '((for-each - (lambda (file) - (substitute* file - (((assoc-ref native-inputs "bash")) - (assoc-ref inputs "bash")))) - (list (string-append libexec - "/dhclient-script") - (string-append libexec - "/.dhclient-script-real")))) - '()) #t)))))) (native-inputs -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:14 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:15 +0000 Received: from localhost ([127.0.0.1]:56921 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTO-0005cp-NV for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:14 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33408) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ5-0005Tn-BR for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:52 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMoLS; Fri, 01 Oct 2021 16:21:48 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 13/38] gnu: gobject-introspection: Use python instead of python-wrapper. Date: Fri, 1 Oct 2021 16:21:15 +0200 Message-Id: <20211001142140.17027-13-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098108; bh=Hmn536RufB5zH0RqRtgI/COEZzeOJletEsjLLXC9Zjg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=h7t1V/4wC0F3JRxweVsLg70oWHikmeHHIzKQdCeAoeSXenMHV+/y5BW98jeCS0qSn ij/Jrei5OC/P5/wXqcak4bKqj49hT7fjVabm9cKdBENoZ/zjpXUpFvp05VVcxZuKqB QJaphYEw7vGirkXQw87dVcWHBb/sXYi/j9PYtRZfxIblcM8DXqYTPVb9KtZF1jlDra 1v4FbX07pRO3RREMcb0GSRy1DKUGyvMovfKZLV8+udc8kxX02NhPvU+7SxbuLsmjYi a5X0dSZcd95hiuJD4SJNPKhfF883ZvgCXxzri2YlXpYmkL5r+QAgQOqQsS/rK4JF6d rQUfXjV3vZoCA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) 'python' is a tiny bit simpler than 'python-wrapper', and is already used when cross-compiling. Use it unconditionally. * gnu/packages/glib.scm (gobject-introspection)[inputs]{python}: Use 'python' even when compiling natively. --- gnu/packages/glib.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index cbaece6cf1..8117d7904d 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -489,9 +489,7 @@ be used when cross-compiling." ("bison" ,bison) ("flex" ,flex))) (inputs - `(,@(if (%current-target-system) - `(("python" ,python)) - `(("python" ,python-wrapper))) + `(("python" ,python) ("zlib" ,zlib))) (propagated-inputs `(("glib" ,glib) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:15 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:15 +0000 Received: from localhost ([127.0.0.1]:56923 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTO-0005cw-Tp for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:15 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33420) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ5-0005To-Fb for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:52 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMoLV; Fri, 01 Oct 2021 16:21:48 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 14/38] gnu: cairo: Make 'bash-minimal' input unconditional. Date: Fri, 1 Oct 2021 16:21:16 +0200 Message-Id: <20211001142140.17027-14-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098108; bh=AoP7EFEkBqf/10RXlN2FSXxy1mZ9MufxZhlFnexqNAY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EATEkHCF8+9bQr1UfGymKKKs+3R6pT2Y8SM2iXC/BWE8Xzn8Dd2MtCi2NqyaUOge8 pcB6Sxn4JzxSXzeK3JAzcxDQ5VLDaBfDIctBWU9XIjsLtkmrqiG/YxQf3sbGsdKNcY DiGCn/j3RzhxeX9r02xP4s8lhZ+wl8HXNGuq7Vp3zaFQBeU1IPJ/cAaZBnR/heoHOu bBvh1kHtrBEfJdRAdCHXDWy7Wt/PP+pYL/MtROCzzyZYkjbVSCoV3CWYfqDHeA08b5 z1VxisLW23lmvdy9/VCVvG+RJz64twxOLlDcNWstCIk36JDcyyLTSeo3XKmEuXhoRF qajh2ui+G96mA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/gtk.scm (cairo)[inputs]{bash-minimal}: Make this input unconditional. --- gnu/packages/gtk.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 9868b11e48..aa5b48dac8 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -182,10 +182,7 @@ tools have full access to view and control running applications.") ("pkg-config" ,pkg-config) ("python" ,python-wrapper))) (inputs - ;; TODO(core-updates): make this unconditional - `(,@(if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) ; for glib-or-gtk-wrap - '()) + `(("bash-minimal" ,bash-minimal) ; for glib-or-gtk-wrap ("drm" ,libdrm) ("ghostscript" ,ghostscript) ("libspectre" ,libspectre) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:15 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:15 +0000 Received: from localhost ([127.0.0.1]:56925 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTP-0005d4-6g for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:15 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ5-0005Tq-K1 for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:52 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMoLZ; Fri, 01 Oct 2021 16:21:48 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 15/38] gnu: libthai: Make 'datrie' input unconditional. Date: Fri, 1 Oct 2021 16:21:17 +0200 Message-Id: <20211001142140.17027-15-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098108; bh=q8lxOUm0nF2OShhS6pl5Fb76fruHGy2Ng/U1snK2Dg4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=lf1ZgNFZEGEc+E0r0WVqiy50QwvkRumRgaAdBfq5k1aIq644HOtBK6L3oiMEw+v4W fG37fq092AvZYoiH1c/bj89llRHUrYm3Rgqv0BGQ4H45P6ZMJurZVA1sgdk7TBzs91 oTjbESQa2JGx0sM55Zz7vYCiYTGdr1jfC5+lc40/QO5L0dTMSgiEBg901UnG3hbXyI q5embvV/X/Zi61QrPzA8byJGAycF7CeYXqU4B8Y80fmZJ3bbEK+zX5C0aB55OBnKv4 8ySwKi3N2n7tky59SmRWExrZC3g2UxpmbVT9T0GhBLfekv+m8savHApBMNyVCoJngH xfw2a9/PZJVpA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/gtk.scm (libthai)[native-inputs]{datrie}: Make this input unconditional. --- gnu/packages/gtk.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index aa5b48dac8..5ae4aeb66c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -326,10 +326,7 @@ representing trie. Trie is a kind of digital search tree.") (native-inputs `(("doxygen" ,doxygen) ("pkg-config" ,pkg-config) - ;; TODO(core-updates): Make this input unconditional. - ,@(if (%current-target-system) - `(("datrie" ,libdatrie)) ; for 'trietool' - '()))) + ("datrie" ,libdatrie))) ; for 'trietool' (propagated-inputs `(("datrie" ,libdatrie))) (synopsis "Thai language support library") -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:15 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:15 +0000 Received: from localhost ([127.0.0.1]:56927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTP-0005dB-DM for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:15 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33454) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ5-0005Tr-Ot for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:53 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMpLe; Fri, 01 Oct 2021 16:21:49 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 16/38] gnu: libdatrie: Make input labels match the package name. Date: Fri, 1 Oct 2021 16:21:18 +0200 Message-Id: <20211001142140.17027-16-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098109; bh=4yd+s7qOzNY4jvD+JkiKndZ53enYGgJXb94YjUZ+wW4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=lpjZeSgrzy8mxFXpUUfxDa2mYJBq+wothgDqKDqSsD/Ii+xKZmdFj0Mdge/dikbyS nMOxz6JhRUjlZ99aYS0v4CRM7eklNHFxVRJnkmd6IEhBiYooTgCEFCYE8rNF41qiLL Pjb2MXGv2Tt0zlN2vPivRRCxO+F8EavePnTSeWIrF1XSLOVmFZJs2mW3Do04m0AFfB Dfsnz5fXAwBOvLtNW69dOMYfpJTC8hsOT19VQfICkBRo2/cXh15SYkYXHWd2rPl2YJ +cRIilcuaHic2rf+flw7Eddm2jW0FSgLt5UpNRyYezu+k528CI4wF/sKy/HH3brqzu 208vThPSOViuw== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/gtk.scm (libthai)[native-inputs]{datrie}: Rename to ... (libthai)[native-inputs]{libdatrie}: ... this. (libthai)[propagated-inputs]{datrie}: Rename to ... (libthai)[propagated-inputs]{libdatrie}: ... this. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 5ae4aeb66c..219971a40e 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -326,9 +326,9 @@ representing trie. Trie is a kind of digital search tree.") (native-inputs `(("doxygen" ,doxygen) ("pkg-config" ,pkg-config) - ("datrie" ,libdatrie))) ; for 'trietool' + ("libdatrie" ,libdatrie))) ; for 'trietool' (propagated-inputs - `(("datrie" ,libdatrie))) + `(("libdatrie" ,libdatrie))) (synopsis "Thai language support library") (description "LibThai is a set of Thai language support routines aimed to ease developers’ tasks to incorporate Thai language support in their -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:15 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:15 +0000 Received: from localhost ([127.0.0.1]:56929 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTP-0005dI-KF for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:15 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33462) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ5-0005Ts-T8 for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:53 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMpLi; Fri, 01 Oct 2021 16:21:49 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 17/38] gnu: pango: Make 'bash-minimal' input unconditional. Date: Fri, 1 Oct 2021 16:21:19 +0200 Message-Id: <20211001142140.17027-17-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098109; bh=ktj1JZaoYTMgLPKJZdv9+qmGldFJnKHeW0LaxpqkFAk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=nhEaef1I3SiSAR+Uqr4NY/Q5U9keIY14D9LvP3wYlWEnJE1i5LX25bvSx9qrEQl+B dSCMuRIJ/5HOq/rcBh4ZQ0uHovbzBDm9dtxDcanePY8rJlxK4ID7x+08pqWHaG+mbo rAW49tsA4EONXewJu6oB343NBv1LjxTJF3pZeIY64hSR+qzBDZX9Pxcau8loyy0YoH JjR5VqVfWfQxIFefVvaRsqSLkNOEUhkCziLGDoL45AhHdCLvge8xOZ0SQrVCiJ9S1F zcCz4PbGVJqxPxxfjiuQKFl6qKtlDRCnwTZ2po6WKx5GEIfNi1R4e7i1/w38THGMn2 GAj+deuji4GvA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/gtk.scm (pango)[inputs]{bash-minimal}: Make it unconditional. --- gnu/packages/gtk.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 219971a40e..4f8b87ea48 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -377,10 +377,7 @@ applications.") ("libxft" ,libxft) ("libxrender" ,libxrender))) (inputs - ;; TODO(core-updates): Unconditionally add "bash-minimal" - `(,@(if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) ; for glib-or-gtk-wrap - '()) + `(("bash-minimal" ,bash-minimal) ; for glib-or-gtk-wrap ("zlib" ,zlib))) (native-inputs `(("glib" ,glib "bin") ; glib-mkenums, etc. -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:16 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:16 +0000 Received: from localhost ([127.0.0.1]:56931 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTP-0005dP-QQ for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:15 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33484) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ6-0005Tu-5A for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:53 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMpLo; Fri, 01 Oct 2021 16:21:49 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 19/38] gnu: gdk-pixbuf: Respect #:tests?. Date: Fri, 1 Oct 2021 16:21:21 +0200 Message-Id: <20211001142140.17027-19-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098109; bh=ezOEB3mOxWogaCDVd/yx9NcbSH9Peuf6TXHbjRp9krQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=un5JKgmRNxImHmZsMmxjy9FAZHvNtZkc4NFx5XQJuy3Je+MheAubBFigEm/liRj2W SWQFlvn0GwdHFhDJOKxyTd7k9TceY7fjF4rx6vnPQBVO5DJuR9BATGEWsXIAGawWAi 5t/TnY1vDbECrJ3rZdniEMfh0+dabvyFtPlcAycSTwxVyZfOreKineM8Upw4d6RvFw SqGBXtd7+wj54yvWtGZPzWoXZfqtmleXxQQVC80mhbxXaT0VXMQmVamnbbua/V95H6 eaeBHnebfJKRUcIEvj0A55lQmjvnTkW66dqhmQ72PoZ5M0UEnjAZffyWlzptGJJkEf M2hCBzu73EFiw== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/gtk.scm (gdk-pixbuf)[arguments]<#:phases>{check}: Don't run the tests if the value for #:tests? is false. --- gnu/packages/gtk.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index fd7feab69b..bbef514dd7 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -646,8 +646,9 @@ highlighting and other features typical of a source code editor.") ,@(if (any (cute string=? <> (%current-system)) '("armhf-linux" "aarch64-linux")) '((replace 'check - (lambda _ - (invoke "meson" "test" "--timeout-multiplier" "5")))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "meson" "test" "--timeout-multiplier" "5"))))) '())))) (propagated-inputs `( ;; Required by gdk-pixbuf-2.0.pc -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:16 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:16 +0000 Received: from localhost ([127.0.0.1]:56933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTQ-0005dW-0c for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:16 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ6-0005Tt-0L for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:53 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMpLl; Fri, 01 Oct 2021 16:21:49 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 18/38] gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs. Date: Fri, 1 Oct 2021 16:21:20 +0200 Message-Id: <20211001142140.17027-18-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098109; bh=F2lxH8w2Q2islWBG4l7ocoP+OtDE0r33U+tqgDhoqvk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UMW+88zo9NAoaNlclAlMUmKdVPG+4c2emyuiGJkGMP09DRpWzNXeVXmM3y3DSKKga /F5ilVg3PXjj2NxN1koDtDX8ovxkoFRYwh0Yzq68jMMhbsO9gYw2rPrUSue6otmCO4 6bGBhJE7xEoGEM+PaiDPoqPhOVixS8uvZqC1kSUogn1XXkdU4a5TJ8D+sI2vbCKZwR IYqNu/6f8ufsSbgr1xJ71mLRxQLxBjkJSzzdNofpaLwox6GxdGFsm/uLStQrO0ggiq QWd2Jp3BOHvuCUC/a++EslazRosXnpL8cmxAT2r/WlRJRs4km8VkQMs8Y9Kl/WywzI p/RFFT5OcBAxw== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/gtk.scm (gdk-pixbuf)[arguments]<#:phases>{patch-docbook}: Unconditionally look in (or native-inputs inputs) for docbook-xsl and docbook-xml. --- gnu/packages/gtk.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 4f8b87ea48..fd7feab69b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -623,23 +623,17 @@ highlighting and other features typical of a source code editor.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-docbook - ;; TODO(core-updates): Unconditionally look in (or native-inputs inputs) - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) - inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (with-directory-excursion "docs" (substitute* "meson.build" (("http://docbook.sourceforge.net/release/xsl/current/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xsl") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xsl") "/xml/xsl/docbook-xsl-1.79.2/"))) (substitute* (find-files "." "\\.xml$") (("http://www.oasis-open.org/docbook/xml/4\\.3/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xml") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xml") "/xml/dtd/docbook/")))) #t)) (add-before 'configure 'disable-failing-tests -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:16 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:16 +0000 Received: from localhost ([127.0.0.1]:56935 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTQ-0005de-AN for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:16 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33492) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ6-0005Tv-9Q for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:53 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMpLr; Fri, 01 Oct 2021 16:21:49 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 20/38] gnu: gdk-pixbuf: Use target predicates. Date: Fri, 1 Oct 2021 16:21:22 +0200 Message-Id: <20211001142140.17027-20-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098109; bh=bahdBuGrJkWxiJ6oxwD00WLPRJyU7JZkJUZeihA96uQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=uwaUrVueExHJeu0v4WaKQDVCynR+FK1DxrkwuQuDLx+6+DFRhZd0NMVlEhPrFFhWQ cdedSRh1leRNTaNA5/ZUMvN90Ax3iNOxKH5zu3TM+U0QxRIYiIGpc/Hl4yg56NdcFR EyfAduMdnfj691WIP+DO7WVRFoVOLowCvt/nHR7zo6xcZBRXgWhcmHHl5M84uhEOF5 7u4qgdjXAuO8WPPJyMqVdo7XP20Qrgvq68a1F2WsGwrz2vfo2b58BUHQ1t0fNA5HWs oTxRpcG2fzTrlc/JrDSEOSaUg6cgodvdaqWgvcOYty9A5lWdRgPOPs7Oz31YiQjGUJ /rLSXjTstv7aA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) This seems a little tidier to me. * gnu/packages/gtk.scm (gdk-pixbuf)[arguments]<#:phases>{check}: Use target-arm? instead of string=?. --- gnu/packages/gtk.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index bbef514dd7..691e207165 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -643,8 +643,7 @@ highlighting and other features typical of a source code editor.") "")) #t)) ;; The slow tests take longer than the specified timeout. - ,@(if (any (cute string=? <> (%current-system)) - '("armhf-linux" "aarch64-linux")) + ,@(if (target-arm? (%current-system)) '((replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:16 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:16 +0000 Received: from localhost ([127.0.0.1]:56937 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTQ-0005dl-Gr for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:16 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33302) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ6-0005Tb-9k for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:53 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMpM6; Fri, 01 Oct 2021 16:21:50 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 23/38] gnu: at-spi2-core: Make 'bash-minimal' input unconditional. Date: Fri, 1 Oct 2021 16:21:25 +0200 Message-Id: <20211001142140.17027-23-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098110; bh=lFr77h45AV8XOGO9Vabr7KSuMtKAqd7YAhbFyPGf/BY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RzpBtCDsANg5VktBM8aGAr4hQzLa4fVQ7VTWEVVIwhchAljMdC4vlKHcmbgfhHDFq LRnQD4fRlZTO4ufBPXHCCVJefMCXh/z4A8fKuedW6InIZrgNNyvAVuv8Fah78EDKgi D7I+ka5et825VTn2+GzXrHwFR2WNPtp7QD9XitDGW2ubq4ZdTZCeYLQnhzTLfS0vz0 lxZUyiDNaE8QX9B7noKCe3q5h9u5U3II3EabEhye2yUo4rVFi2jRE3Zy6NLIu4KdM/ Tm9CbD7y0YFlAMHqONp7kh1Y01jJndoZhSEWjV9+AFa+O0rtRNKAxqU1NYpEGWlciL CoS+7YAkcnxaQ== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/gtk.scm (at-spi2-core)[inputs]{bash-minimal}: Make it unconditional. --- gnu/packages/gtk.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f37dfaf89d..adb4d847a4 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -778,10 +778,7 @@ scaled, composited, modified, saved, or rendered.") (invoke "dbus-launch" "ninja" "test"))) (delete 'check)))) (inputs - ;; TODO(core-updates): Make this input unconditional. - (if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) - '())) + `(("bash-minimal" ,bash-minimal))) (propagated-inputs ;; atspi-2.pc refers to all these. `(("dbus" ,dbus) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:16 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:17 +0000 Received: from localhost ([127.0.0.1]:56939 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTQ-0005ds-O6 for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:16 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33316) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ6-0005Td-I6 for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:54 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMqMH; Fri, 01 Oct 2021 16:21:50 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 25/38] gnu: at-spi2-core: Unconditionally lookup docbook in native-inputs. Date: Fri, 1 Oct 2021 16:21:27 +0200 Message-Id: <20211001142140.17027-25-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098110; bh=A/vKhXVf1Ixg8MY6muVmQzAsOO348cwUUuDUpPpNf1Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=e6JCYD1sQ/eSMVmzxoZohTjbArDj5PsKSsfJW8l6ZmYWXh0IiJ4TwX+dVPA2rLdEj ZZ90ZHqlbtIl4+/D4gQYNVORmxNK+7nkq+MYg6lPb2qAvSl6FVUXm7XuSqRmdQVVp2 /mNlqzaBtkd1zO6AgruOjMXyPnFFtoSbBZhm+VeFWARGi+Q8VCbo3eddMbx6MsnwEd OUWRK83a4+1K3MIe+szUI83ZZBCxngYiqrZAqt/QYaJlCVfXiP6OqDg4lg95MTMNcj L6ddt2CAQB8WKaRgJuWEOXhvHKkwKsE2Cajg1Qp5u/PL+jsRZ6EnCcmNE4EEgwtIvC dCNN97BBk9htw== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/gtk.scm (at-spi2-core)[arguments]<#:phases>{patch-docbook-sgml}: Unconditionally look in (or native-inputs inputs) for docbook-xml. --- gnu/packages/gtk.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index d829218305..634a0125d8 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -740,15 +740,10 @@ scaled, composited, modified, saved, or rendered.") (lambda* (#:key outputs #:allow-other-keys) (mkdir-p (string-append (assoc-ref outputs "doc") "/share")) #t)) - ;; TODO(core-updates): Unconditionally use (or native-inputs inputs) (add-after 'unpack 'patch-docbook-sgml - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (let* ((xmldoc - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) + (string-append (assoc-ref (or native-inputs inputs) "docbook-xml") "/xml/dtd/docbook"))) (substitute* "doc/libatspi/libatspi-docs.sgml" -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:17 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:17 +0000 Received: from localhost ([127.0.0.1]:56941 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTQ-0005dz-Vi for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:17 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33342) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ6-0005Tf-VZ for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:54 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMqMV; Fri, 01 Oct 2021 16:21:50 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 28/38] gnu: avahi: Make the 'patch-more-shebangs' phase unconditional. Date: Fri, 1 Oct 2021 16:21:30 +0200 Message-Id: <20211001142140.17027-28-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098110; bh=BnOMBYoP+/dZYJVHLmM8tNuSfhnP2UiBb/JMajdkVAw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=rtc2iZ04bQcwyqtdk2cESFz5IRwE1FZYzkG0az2jRJC8bmC9Saapx+PNvore3nhUN cVZ1mxUaklJy7FsYtQQVeCEgFodD7SAhSSR1WFOi54YbC+dSl4kQ9Evn5rOgUA84jb gmDH13DAMry9ktME0daSE7LZW64p78us8ZwB8Fy47UUCVl9VqvXTSLBh7J3O/SFdGn DbWOreq23zvvevHgP2Ao5mTgtYRiBU7eIwhEcFiUFd/8nPAbZyXTm1nhVzsSoaloEj RhaX/BRw5HIvVe/nGgMguDW0ZRTwbPnzgS0+fVWvb4TsWwNNm0tls3Q7m/QFRtq2kZ hnmZ1/XL5+0iw== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/avahi.scm (avahi)[arguments]<#:phases>{patch-more-shebangs}: Make it unconditional. --- gnu/packages/avahi.scm | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm index 20c0f2708e..797e35e7eb 100644 --- a/gnu/packages/avahi.scm +++ b/gnu/packages/avahi.scm @@ -75,21 +75,18 @@ ,@(if (%current-target-system) '("ac_cv_prog_have_pkg_config=yes") '())) - ;; TODO(core-updates): Make this unconditional. - ,@(if (%current-target-system) - `(#:modules ((srfi srfi-26) - (guix build utils) - (guix build gnu-build-system)) - #:phases - ,#~(modify-phases %standard-phases - (add-after 'patch-shebangs 'patch-more-shebangs - (lambda* (#:key inputs #:allow-other-keys) - (define path - `(,(dirname (search-input-file inputs "bin/sh")))) - (for-each - (cut patch-shebang <> path) - (find-files (string-append #$output "/etc/avahi"))))))) - '()))) + #:modules ((srfi srfi-26) + (guix build utils) + (guix build gnu-build-system)) + #:phases + ,#~(modify-phases %standard-phases + (add-after 'patch-shebangs 'patch-more-shebangs + (lambda* (#:key inputs #:allow-other-keys) + (define path + `(,(dirname (search-input-file inputs "bin/sh")))) + (for-each + (cut patch-shebang <> path) + (find-files (string-append #$output "/etc/avahi")))))))) (inputs `(("bash-minimal" ,bash-minimal) ("dbus" ,dbus) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:20 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:21 +0000 Received: from localhost ([127.0.0.1]:56943 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTR-0005e6-6i for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:20 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33310) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ4-0005Tc-EG for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:54 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMnKW; Fri, 01 Oct 2021 16:21:47 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 03/38] gnu: mozjs: Use mozilla-build-system. Date: Fri, 1 Oct 2021 16:21:05 +0200 Message-Id: <20211001142140.17027-3-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098107; bh=nt9yZbzYYVKoSncxX9Vm+mRzHq2SC2tPwsrKIWPJz6c=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hazTuodZLvvk0/muUJeA0IK27/smhUcHPuGT8FuMqvDDNF5qcXpMSDQ3hDTlAf9N/ 1e0kRJoFQVikosjQJlcX2vyYRRGdFpJcaShZ3HNqiFEavHBy5EGKTAkHjmvQadnb39 X94VWSya0nfP9TyK386DvDQfODx6sfAqUBdCMhFpKHlMNle8zUhq0KmLLwBMmHzcjc 4rns6AnQqHkmFWsTJImsbFdEG/x0Z7Pij/P0odhDPRVrZ/U5TS+cJox18EfpmKOg/6 ejFo9ooXCKg733boi4mSLuvNC9mMuET5ma8VZZlOndhgnU5VcPtQN9v6H9D9+EeZmr Ng0hj/Pss3uAQ== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Due to the use of 'inherit', all versions of mozjs are adjusted. * gnu/packages/gnuzilla.scm (mozjs)[build-system]: Adjust it. (mozjs)[arguments]<#:configure-flags>: Remove now superfluous --target and --host. --- gnu/packages/gnuzilla.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 5dd90e4e20..9647bb7db5 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -49,6 +49,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system cargo) #:use-module (guix build-system trivial) + #:use-module (guix build-system mozilla) #:use-module (gnu packages admin) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) @@ -108,7 +109,7 @@ (substitute* '("js/src/config/milestone.pl") (("defined\\(@TEMPLATE_FILE)") "@TEMPLATE_FILE")) #t)))) - (build-system gnu-build-system) + (build-system mozilla-build-system) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) @@ -390,15 +391,7 @@ in C/C++.") ;; This is important because without it gjs will segfault during the ;; configure phase. With jemalloc only the standalone mozjs console ;; will work. - "--disable-jemalloc" - ;; Mozilla deviates from Autotools conventions due to historical - ;; reasons. - #$@(if (%current-target-system) - #~(#$(string-append - "--host=" - (nix-system->gnu-triplet (%current-system))) - #$(string-append "--target=" (%current-target-system))) - #~()))) + "--disable-jemalloc")) #:phases (modify-phases %standard-phases ;; Make sure pkg-config will be found. -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:21 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:21 +0000 Received: from localhost ([127.0.0.1]:56945 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTU-0005eK-VP for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:21 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33358) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ7-0005Ti-D2 for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:54 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMrMj; Fri, 01 Oct 2021 16:21:51 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 31/38] gnu: json-glib: Unconditionally lookup docbook in native-inputs. Date: Fri, 1 Oct 2021 16:21:33 +0200 Message-Id: <20211001142140.17027-31-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098111; bh=RriO5a8YOCmfeZKTUQhZ+SktKBPPQdjUsMMdvni4RAA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KH++Vultam/UrLFMIIGR7rH6xo6/Q0CXTdJuorHE7r+sBe8oR6MiHOhDHG6KguqLu xSdVUwAPEgtVxfr8f8TkkvYd7ZorLbLIyd5GRFumzWbEAgu+CPT5XBrK8SsrtabNki RRS9FXp6Mht6VDrQKmI9nqoC1qharbALVIZdf+4QpFdTBqEEyyhM/zvCFlLD4M5eq9 Np9gmuPuLc/VCY5arLnQtUDsgZAzJbGkSUrI1fwYO10i2DNGmxFL8+IBmTpQbi3Tnl MJGExaQc3NsUJMIaJlPLzYeLbG0kxrWltCk+8fAJRSHDRaVGtsVxvZrWWkMFJno1JI 3gxXOi8dtJLvg== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/gnome.scm (json-glib)[arguments]<#:phases>{patch-docbook}: Unconditionally look in (or native-inputs inputs) for docbook-xml and docbook-xsl. --- gnu/packages/gnome.scm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 497713cddc..57d9a9be79 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4607,24 +4607,17 @@ configuration storage systems.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-docbook - ;; TODO(core-updates): Use (or native-inputs inputs) - ;; unconditionally. - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (with-directory-excursion "doc" (substitute* (find-files "." "\\.xml$") (("http://www.oasis-open.org/docbook/xml/4\\.3/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) + (string-append (assoc-ref (or native-inputs inputs) "docbook-xml") "/xml/dtd/docbook/"))) (substitute* "meson.build" (("http://docbook.sourceforge.net/release/xsl/current/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xsl") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xsl") "/xml/xsl/docbook-xsl-1.79.2/")))) #t)) ;; When cross-compiling, there are no docs to move. -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:21 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:21 +0000 Received: from localhost ([127.0.0.1]:56947 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTV-0005eR-B6 for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:21 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ7-0005Th-Ko for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:55 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMrMr; Fri, 01 Oct 2021 16:21:51 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 33/38] gnu: heimdal: Make some parts of phases unconditional. Date: Fri, 1 Oct 2021 16:21:35 +0200 Message-Id: <20211001142140.17027-33-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098111; bh=C741vQZeiyfLswNMZ93oGojZZxOECaQbr8Dy+JElW1w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Xk/OsmiT2KIRH19Dzh3+sdvPHVokltJMLuR4TY85ICrGb3dApvtJ2Dh/Fu8dkOHiE yDD8MfG9HanbVBLKfQUoAy7rDjTWlrgIS6Ly4Wk8Crz3v/GZ0fmHROfEpCq+eFc0pQ G/A/ei778zyloKnjkRw66g92ucYHtiQrNyRJhf2UpLsDwYNmRoDLQ8z1PjJzWuGpv9 msob0S9s6IAk4B/tJd0KbRsZD0R1O31SSHhJvJoiB/5cThkzrHQIGrcr9FG8y8VJeh rW0kjZCJs57FbbIZFetiMiXO+t1A25TbGagx4R48Ta5Zim0q0M7PUyT/N95K3yZ/Tx ZDny2+aO6p39g== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/kerberos.scm (heimdal)[arguments]<#:phases>{pre-configure}: Make the '(%current-target-system)' branches unconditional. --- gnu/packages/kerberos.scm | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 82609ce66e..6bfb758900 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -237,14 +237,7 @@ After installation, the system administrator should generate keys using #~())) #:phases (modify-phases %standard-phases (add-before 'configure 'pre-configure - ;; TODO(core-updates): Unconditionally use the - ;; %current-target-system branch. - (,(if (%current-target-system) - 'lambda* - 'lambda) - ,(if (%current-target-system) - '(#:key inputs #:allow-other-keys) - '_) + (lambda* (#:key inputs #:allow-other-keys) ,@(if (%current-target-system) `((substitute* "configure" ;; The e2fsprogs input is included for libcom_err, @@ -256,22 +249,17 @@ After installation, the system administrator should generate keys using (("ac_cv_prog_COMPILE_ET=\\$\\{with_cross_tools\\}compile_et") "ac_cv_PROG_COMPILE_ET=compile_et"))) '()) - ,@(if (%current-target-system) - '((substitute* '("appl/afsutil/pagsh.c" "appl/su/su.c") - (("/bin/sh") - (search-input-file inputs "bin/sh")) - ;; Use the cross-compiled bash instead of the - ;; native bash (XXX shouldn't _PATH_BSHELL point - ;; to a cross-compiled bash?). - (("_PATH_BSHELL") - (string-append - "\"" (search-input-file inputs "bin/sh") "\""))) - (substitute* '("tools/Makefile.in") - (("/bin/sh") (which "sh")))) - '((substitute* '("appl/afsutil/pagsh.c" - "tools/Makefile.in") - (("/bin/sh") (which "sh"))) - #t)))) + (substitute* '("appl/afsutil/pagsh.c" "appl/su/su.c") + (("/bin/sh") + (search-input-file inputs "bin/sh")) + ;; Use the cross-compiled bash instead of the + ;; native bash (XXX shouldn't _PATH_BSHELL point + ;; to a cross-compiled bash?). + (("_PATH_BSHELL") + (string-append + "\"" (search-input-file inputs "bin/sh") "\""))) + (substitute* '("tools/Makefile.in") + (("/bin/sh") (which "sh"))))) (add-before 'check 'pre-check (lambda _ ;; For 'getxxyyy-test'. -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:29 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:29 +0000 Received: from localhost ([127.0.0.1]:56949 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTV-0005eY-Lh for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:29 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33304) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ7-0005Ta-Ou for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:55 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMrMw; Fri, 01 Oct 2021 16:21:51 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 34/38] gnu: heimdal: Make 'bash-minimal' input unconditional. Date: Fri, 1 Oct 2021 16:21:36 +0200 Message-Id: <20211001142140.17027-34-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098111; bh=CzzgOdv7zv61ImbiAbcUKnTxA9omOQCetOkaZtSVMvI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ju2npogMIA8KRrz6SA0YIrG+BdNimgtYL0Z1r3WGEEFd4oSwCEQpiY+xR+58lDzKb ckOfP17+FYUIWdPp0so2XW958XbMNxeDhwBELQe9j5SXih0s5rJTcfXUYAlPlCu94V cEG1VyH3YzVNWkUXj8Ft5wIkI7LF56/bD8inxtrVb5WfkOFmtYDUZcoAa0oEenXgl2 +Q+pyeolY7x5I+GVxLHp5nDKGkLZyv3H+xsMQTjXyZLBluIF8sWGPIANj+Yyh45KgQ 7aiUZV7StR4AFLp/BRA891RMpn1gFqrM2b0Tkv01sxzC1J2LYvJm6n4ijKA4/qQoHP coV8wtmK1GyJA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/kerberos.scm (heimdal)[inputs]{bash-minimal}: Make it unconditional. --- gnu/packages/kerberos.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/kerberos.scm b/gnu/packages/kerberos.scm index 6bfb758900..739b0169dc 100644 --- a/gnu/packages/kerberos.scm +++ b/gnu/packages/kerberos.scm @@ -280,10 +280,7 @@ After installation, the system administrator should generate keys using `(("perl" ,perl)) '()))) (inputs `(("readline" ,readline) - ;; TODO(core-updates): Make this input unconditional. - ,@(if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) - '()) + ("bash-minimal" ,bash-minimal) ("bdb" ,bdb) ("e2fsprogs" ,e2fsprogs) ;for libcom_err ("sqlite" ,sqlite))) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:29 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:29 +0000 Received: from localhost ([127.0.0.1]:56951 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTd-0005em-Hm for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:29 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33326) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ7-0005Te-Te for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:55 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMrN1; Fri, 01 Oct 2021 16:21:51 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 35/38] gnu: libcap: Unconditionally use #$output. Date: Fri, 1 Oct 2021 16:21:37 +0200 Message-Id: <20211001142140.17027-35-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098111; bh=7FMrRAI+hoHB0h97dajzGW7URSZ1oTv6RBsTX85rGSo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jOexRw5mjDURFfFPeSbNTtg3pLPhm0JFjKKdNbFWu7+Luwlni1zEAx1qnz6dhDK0M cBGOp6x8E9OWA7CoPTLoVKWk+hvZsg3Kku7nxPSpSTunlOJo81XDUB1Ddp5wlipDIA BDg5sBR46GFIqem3GFY0XKfLGFBW99QkWNIqvNWQIL/9K3S7dN9ZOQcWWC2HMuLGfz iSA2YhaE5l8At6pfOC7XA8T2Y+Q/9I+HF78ue3ZG5irYh23p+Ni42AUwlv15B05UZm PTIM4jjt2RX9U6hBDj+4yCy0Etw/inpSnx4hU/8HhVLnMXFR2tyZJWmWmq845Z1jyT qyoEiKbpNMwnA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/linux.scm (libcap)[arguments]<#:phases>{configure}: Unconditionally use #$output instead of %output. --- gnu/packages/linux.scm | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b771f65d92..3c8b4546af 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -3004,12 +3004,7 @@ configuration (iptunnel, ipmaddr).") (substitute* "Make.Rules" (("LDFLAGS \\?= #-g") (string-append "LDFLAGS ?= -Wl,-rpath=" - ;; TODO(core-updates): Use #$output - ;; unconditionally. - #$(if (%current-target-system) - #~#$output - '%output) - "/lib")))))) + #$output "/lib")))))) #:test-target "test" #:make-flags (list "lib=lib" -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:30 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:30 +0000 Received: from localhost ([127.0.0.1]:56953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTd-0005eu-QB for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:29 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33366) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ8-0005Tj-2A for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:55 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMrN4; Fri, 01 Oct 2021 16:21:51 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 36/38] gnu: libproxy: Respect #:tests?. Date: Fri, 1 Oct 2021 16:21:38 +0200 Message-Id: <20211001142140.17027-36-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098111; bh=jLhUhiWEFDu103zRABAn2hfAkw+BkNTRdpZgjkuZskM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jHUs9QYqvGW75jLVJ9CezkF1f/yzRN9HWft9lE6pWm8cZjpXX3gSSXnNln8bViRa9 qe0FhdO/zE0TFNn6fXhLR9i8v8Dl7Yq7Tjiodn+E0/O9tp/ELFhCl60dRMS9ex0m0J OXXgT2Ca1ie+iFro/GqIizhubiEzwC2QDRnfC5InXSwf39rDbpV/vTUYOxDdPdt/W5 9Ys09G3gZFrxItyxjv6EhbyZM11CK0dcx+eWiRE2FhdXLDuBHk5GscwoQbUxaoLMPN X44IshF30tGZDbYFqg7fCnk+H2pQFKFzNEMtFvKXaJsc3ybLyEnp9Cm7KVvqyOszo1 ntE9frrI0sLXA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/networking.scm (libproxy)[arguments]<#:phases>{check}: Don't run the tests if the value for #:tests? is false. --- gnu/packages/networking.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index c426c95e71..d6a2b6bb6b 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -2251,16 +2251,12 @@ sockets in Perl.") `(("dbus" ,dbus) ("zlib" ,zlib))) (arguments - `(#:phases + '(#:phases (modify-phases %standard-phases (replace 'check - ;; TODO(core-updates): Make this unconditional. - ,(if (%current-target-system) - '(lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "ctest" "-E" "url-test"))) - '(lambda _ - (invoke "ctest" "-E" "url-test"))))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "ctest" "-E" "url-test"))))))) (synopsis "Library providing automatic proxy configuration management") (description "Libproxy handles the details of HTTP/HTTPS proxy configuration for applications across all scenarios. Applications using -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:25:30 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:30 +0000 Received: from localhost ([127.0.0.1]:56955 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTe-0005f1-1A for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:30 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33386) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ8-0005Tl-Bc for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:55 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMrNB; Fri, 01 Oct 2021 16:21:52 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 38/38] lint: check-wrapper-inputs: Remove mentions of core-updates. Date: Fri, 1 Oct 2021 16:21:40 +0200 Message-Id: <20211001142140.17027-38-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098112; bh=P1BKDHo+NzXFnTkGv7/kqZyiXCiO/gVMh2GTNAfUmWc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=d7OFh3/zMsRzwEv7QkZ/mR4bKHsVY5disSysLwltZb2aKRf9C6Pv+2A3MpCbthvx6 XzlN6BrY0KfLgefguUlxW01+o6zeG7pCAFQ/HbcAWW0GzF310OSLAs3cRUs5YuXd8B 9K6RVwH9KujSJQy0X6RcDfO40F2999gpMajQqHtOmDElwiDvjpN2p/1C3x7xFedwkx BFqSYaNMDVt40qpx5UkfhRvVIAc2S1h1TJp4K7dj7Zw+mTQB07TO9dc2ivx304+q+2 n04BH+ZK705Uqaxd0UaznhaWMDXQmb56h9aIXb5bbvh3gzMAQS6wGNMRIphn32/v0u 6VcKQtap5ipgg== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) The #:sh argument of 'wrap-program' and 'wrap-qt-program' is now in the current branch, so some comments aren't relevant anymore. * guix/lint.scm (check-wrapper-inputs)[check-procedure-body]: Remove mentions of core-updates. --- guix/lint.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/guix/lint.scm b/guix/lint.scm index 217a0d6696..2a703f9b6d 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -552,13 +552,10 @@ or \"bash-minimal\" is not in its inputs. 'wrap-script' is not supported." (define (check-procedure-body body) (match body ;; Explicitely setting an interpreter is acceptable, - ;; #:sh support is added on 'core-updates'. - ;; TODO(core-updates): remove mention of core-updates. (('wrap-program _ '#:sh . _) '()) (('wrap-program _ . _) (list (report-wrap-program-error package 'wrap-program))) ;; Wrapper of 'wrap-program' for Qt programs. - ;; TODO #:sh is not yet supported but probably will be. (('wrap-qt-program _ '#:sh . _) '()) (('wrap-qt-program _ . _) (list (report-wrap-program-error package 'wrap-qt-program))) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:27:37 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:27:37 +0000 Received: from localhost ([127.0.0.1]:57002 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJVh-0005li-6P for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:27:37 -0400 Received: from leibniz.telenet-ops.be ([195.130.137.77]:47686) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJVf-0005lS-JJ for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:27:36 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by leibniz.telenet-ops.be (Postfix) with ESMTPS id 4HLXNt48vLzMqhHW for <50905@debbugs.gnu.org>; Fri, 1 Oct 2021 16:21:50 +0200 (CEST) Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMqMS; Fri, 01 Oct 2021 16:21:50 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 27/38] gnu: avahi: Make 'bash-minimal' input unconditional. Date: Fri, 1 Oct 2021 16:21:29 +0200 Message-Id: <20211001142140.17027-27-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098110; bh=4z53cwgt0+rqfiFPlApNnz24oZuES5mst2PwRQiKIxQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=b0LGSMM9jApNiqDMXNUDS+MdJu4Q8/F/8AZKYnLraJ4Xfn6q+FF2L7BpNNeCs/ujg Jen9KfMF4Ezu6W0RVygPvXj+dtSenTSCD8kBhM/UYAxgyJjLNML88g4scaYaFjsU7v pFzJ1xaOpbqk/AK3ZzJdxNoclMgHSzTzt8TyKlZajwHTinp+7vUunWbe1FePwO/VMo es89JGGs5kSFxYozymF0VrD5nGPpFYp0TAsH9P9wUHJcTwZyYhsyfX8AR+6nf3Zpm7 moE268XRziRECbhmQEs3AhL62kQx6ytrIPgdSfsoXXfSMKZT4ejFMQ/jEtnyPV5rwz UYxC4sNJ6thYQ== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/avahi.scm (avahi)[inputs]{bash-minimal}: Make it unconditional. --- gnu/packages/avahi.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm index 7dcaa17a76..20c0f2708e 100644 --- a/gnu/packages/avahi.scm +++ b/gnu/packages/avahi.scm @@ -91,10 +91,7 @@ (find-files (string-append #$output "/etc/avahi"))))))) '()))) (inputs - ;; TODO(core-updates): Make this input unconditional. - `(,@(if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) - '()) + `(("bash-minimal" ,bash-minimal) ("dbus" ,dbus) ("expat" ,expat) ("gdbm" ,gdbm) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:27:37 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:27:37 +0000 Received: from localhost ([127.0.0.1]:57004 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJVh-0005lv-JD for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:27:37 -0400 Received: from leibniz.telenet-ops.be ([195.130.137.77]:47544) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJVf-0005lP-JL for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:27:36 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by leibniz.telenet-ops.be (Postfix) with ESMTPS id 4HLXNs5kKYzMqhGT for <50905@debbugs.gnu.org>; Fri, 1 Oct 2021 16:21:49 +0200 (CEST) Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMpLu; Fri, 01 Oct 2021 16:21:49 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 21/38] gnu: gdk-pixbuf: Make 'bash-minimal' input unconditional. Date: Fri, 1 Oct 2021 16:21:23 +0200 Message-Id: <20211001142140.17027-21-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098109; bh=eqaU5MEUL+3CrzJYaZsrAg+J8Evf9NbzkISRjVxgenc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fhLl575i/wcFHdZcAB4E7a5E1xm95/yLZqbDlNJof4CqhJrdkwvtSEbER0jZC312M ezQN1wC32oRbzH3EZ0BG+iLLQrpO25AYSQwEom0k+/teJr0dmIy+8hjbl3hNPQa/AM bxg0cHDRtq5sxa/S1M8waXpzbckIJeS1eqtsW4gIcgE2E2lZiwZFSDhsjF7LR1swlK qNV1VpmuBIFWil3car6O6H/5U0fA9eZUmNX8ywHCPMstNRhOymgunMPTxjaxR3EVW0 994wKmJQc6PKjTaSPf3IXZ1xEy6nqNJR4soD8T8dC5ylN4J14BWV/KKlew5M8V3giQ YKouL6IlkJHag== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/gtk.scm (gdk-pixbuf)[inputs]{bash-minimal}: Make it unconditional. --- gnu/packages/gtk.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 691e207165..cfc4c61235 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -657,9 +657,7 @@ highlighting and other features typical of a source code editor.") ;; Used for testing and required at runtime. ("shared-mime-info" ,shared-mime-info))) (inputs - `(,@(if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) ; for glib-or-gtk-wrap - '()) + `(("bash-minimal" ,bash-minimal) ; for glib-or-gtk-wrap ("jasper" ,jasper) ("libjpeg" ,libjpeg-turbo) ("libpng" ,libpng) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:27:41 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:27:41 +0000 Received: from localhost ([127.0.0.1]:57006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJVk-0005mF-Re for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:27:41 -0400 Received: from leibniz.telenet-ops.be ([195.130.137.77]:47630) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJVf-0005lR-JT for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:27:37 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by leibniz.telenet-ops.be (Postfix) with ESMTPS id 4HLXNt69YmzMqhGm for <50905@debbugs.gnu.org>; Fri, 1 Oct 2021 16:21:50 +0200 (CEST) Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMqMb; Fri, 01 Oct 2021 16:21:50 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 29/38] gnu: freedesktop: Unconditionally use alternatives to % variables. Date: Fri, 1 Oct 2021 16:21:31 +0200 Message-Id: <20211001142140.17027-29-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098110; bh=9bXXNf5sim3mWFDknGYsD4UkcW172PltQqj2lChp1sg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=qes/Z0MO2FxWYjAb1tJrAjKwwjlzefmhUGpAPbvg0h96fYBAxYtoa+gLxG/72Dm0f rjpmV9895q2aErzWaQqJ7ny49Slso4Wfim0edRrtRXiK9feSRq4admSoG7GCVWuG5P LUHwLLXi0pmy3e7e+r1deWl7V81m8aEwmZzpdvOH//in2ndrfLDDGMFCQLN9QyWmW0 UmDr2Oy/X5mb0ND079FdiJe48zt8QnPaTm38l0Y4+jxpYCFu9B56ARehfCHAmpvgpy O29MmM/2yP52kIQYeiyLkWwE5HkhVBtUEzJEKYnCH8lJTgYePLw9kIx6hoUk2jIFzw v0tDT8SVlxrIA== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/freedesktop.scm (elogind)[arguments]<#:configure-flags>: Use #$output and this-package-input instead of %outputs and %build-inputs. --- gnu/packages/freedesktop.scm | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 550253bc34..9bcf2d8d3e 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -583,20 +583,12 @@ the freedesktop.org XDG Base Directory specification.") (build-system meson-build-system) (arguments `(#:configure-flags - ;; TODO(core-updates): Use #$output unconditionally. - ,#~(let* ((out #$(if (%current-target-system) - #~#$output - #~(assoc-ref %outputs "out"))) + ,#~(let* ((out #$output) (sysconf (string-append out "/etc")) (libexec (string-append out "/libexec/elogind")) (dbuspolicy (string-append out "/etc/dbus-1/system.d")) - ;; TODO(core-updates): use this-package-input unconditionally. - (shadow #$(if (%current-target-system) - (this-package-input "shadow") - #~(assoc-ref %build-inputs "shadow"))) - (shepherd #$(if (%current-target-system) - (this-package-input "shepherd") - #~(assoc-ref %build-inputs "shepherd"))) + (shadow #$(this-package-input "shadow")) + (shepherd #$(this-package-input "shepherd")) (halt-path (string-append shepherd "/sbin/halt")) (kexec-path "") ;not available in Guix yet (nologin-path (string-append shadow "/sbin/nologin")) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:27:43 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:27:43 +0000 Received: from localhost ([127.0.0.1]:57008 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJVn-0005mP-5K for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:27:43 -0400 Received: from leibniz.telenet-ops.be ([195.130.137.77]:47840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJVf-0005lU-TS for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:27:37 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by leibniz.telenet-ops.be (Postfix) with ESMTPS id 4HLXNt1M6RzMqhGw for <50905@debbugs.gnu.org>; Fri, 1 Oct 2021 16:21:50 +0200 (CEST) Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMqME; Fri, 01 Oct 2021 16:21:50 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 24/38] gnu: at-spi2-core: Respect #:tests?. Date: Fri, 1 Oct 2021 16:21:26 +0200 Message-Id: <20211001142140.17027-24-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098110; bh=A6rnq+a0re+OfjLRoJUFtSXcubJL0JXDXPQUHbxTqaM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=C9IqxDBtbVCOc5JnYnr0Zbf1SIo8ILWxJNk4NRHUE0CYkDIhTRGqpxBkD1HV/jLhD murWVUcNGX7lunKJgtBGZBcn2KFosipvQcXSklw1OimuuCvSLV+OCDSiJ298XXYu7a dcf3ZR2zJpJfrGYRwDqSTA+GSr7/zv9IPYiukC+Z46RDWgwTOU5O8RI+Evyn0rT6Ix amAM6Y+nhmo19U0gXhxU2somiq9BNkCU9qIU0cd5TDOwPsY4+TEfeyoJ52K2l0ERqW C6GZcInb0D41Gh0p/g2rjpX6pt3s5VI/pPvahsGQbVUGQBRN/8qyhSRTi+u3H0kgfZ HZgiJcZCMKJ2g== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/gtk.scm (at-spi2-core)[arguments]<#:phases>{check}: Don't run tests if the value of #:tests? if false. --- gnu/packages/gtk.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index adb4d847a4..d829218305 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -768,14 +768,15 @@ scaled, composited, modified, saved, or rendered.") (string-append out "/share/gtk-doc"))) #t)))) (add-after 'install 'check - (lambda _ + (lambda* (#:key tests? #:allow-other-keys) (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME ;; Run test-suite under a dbus session. (setenv "XDG_DATA_DIRS" ; for finding org.xfce.Xfconf.service (string-append %output "/share")) ;; Don't fail on missing '/etc/machine-id'. (setenv "DBUS_FATAL_WARNINGS" "0") ; - (invoke "dbus-launch" "ninja" "test"))) + (when tests? + (invoke "dbus-launch" "ninja" "test")))) (delete 'check)))) (inputs `(("bash-minimal" ,bash-minimal))) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:27:43 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:27:43 +0000 Received: from localhost ([127.0.0.1]:57010 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJVn-0005mR-EF for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:27:43 -0400 Received: from leibniz.telenet-ops.be ([195.130.137.77]:47546) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJVf-0005lQ-JR for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:27:37 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by leibniz.telenet-ops.be (Postfix) with ESMTPS id 4HLXNs6fspzMqhHR for <50905@debbugs.gnu.org>; Fri, 1 Oct 2021 16:21:49 +0200 (CEST) Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMpM0; Fri, 01 Oct 2021 16:21:49 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 22/38] gnu: gdk-pixbuf: Remove trailing #t. Date: Fri, 1 Oct 2021 16:21:24 +0200 Message-Id: <20211001142140.17027-22-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098109; bh=9p9EtODfdsYaAYzctsNrasoK0EEY0Y58lAHN6fF6ANQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tyB0XfJDcTb8e6wi7G0DP7gMpZ9aVoTO0JfsxtAkAMU1Di4d8oGbwiXLZfNpJNEzT X1v5YHo5Hz+TyxKrIjvEqXp/o3OUgA3JC6QWe7wdthSsDkU2b1qQ9MgTu5Cl0GBY9b Cr7yopBkGZqbF+lZOyC9timfPgrG3OCWpR4FftyZ9SBLYLReO2Jbf9u/kGDlPzP7S6 kmKAQ+LQx6f+x0XpUXRaaRaHt5WKJQxqSRGzEGTOuSE3B4mYK41rqcex8vElRhJBlB GBjVKdODROi/p7PofY5mbFqcMVL7IRTA9H7RI9BkU5k/jOcf/Flmr2G4S6wzQ/P1oK tQoHACnnLz/Ow== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/gtk.scm (gdk-pixbuf)[arguments]<#:phases>: Remove the trailing #t. --- gnu/packages/gtk.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index cfc4c61235..f37dfaf89d 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -634,14 +634,12 @@ highlighting and other features typical of a source code editor.") (("http://www.oasis-open.org/docbook/xml/4\\.3/") (string-append (assoc-ref (or native-inputs inputs) "docbook-xml") - "/xml/dtd/docbook/")))) - #t)) + "/xml/dtd/docbook/")))))) (add-before 'configure 'disable-failing-tests (lambda _ (substitute* "tests/meson.build" (("\\[ 'pixbuf-fail', \\['conform', 'slow'\\], \\],") - "")) - #t)) + "")))) ;; The slow tests take longer than the specified timeout. ,@(if (target-arm? (%current-system)) '((replace 'check -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:31:36 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:31:36 +0000 Received: from localhost ([127.0.0.1]:57038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJZX-0005ut-VU for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:31:36 -0400 Received: from newton.telenet-ops.be ([195.130.132.45]:38854) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJZW-0005uQ-GO for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:31:35 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by newton.telenet-ops.be (Postfix) with ESMTPS id 4HLXNt3GSjzMql7f for <50905@debbugs.gnu.org>; Fri, 1 Oct 2021 16:21:50 +0200 (CEST) Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMqML; Fri, 01 Oct 2021 16:21:50 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 26/38] gnu: at-spi2-core: Remove trailing #t. Date: Fri, 1 Oct 2021 16:21:28 +0200 Message-Id: <20211001142140.17027-26-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098110; bh=uUPMAiwwDtFSAIo0y7cm/dPux3B/PijjMbez9VInIaM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=uYGldWhTgHpqRFFv/+Y2X4x9tgirMjeS5CZHtI584u9NiOZ/A7bal/DgGiLsVX5hg 8S9rHZ1UaO0Sucob6AT4xe2JtKx/ajeyxKUJW2iixTnQB+ftVJP2Hc4CKKxrikHkCA iSybNLScDvp86FqOqPo6da1RlWizTT/ZIQhNwntMKXYqS8OtAPVWgGi0rOiUwdm13l Kc2Re+jVe3/LsJrj0e9H0OwtjSBy0rukidNt3zHuFjJwBCehtZRxfe5bf8ODx7/7BR vulYaEivuzn7yGHK55s4zCbq5ijg1bfysOuGTidAZ3BcfhAnb1cYvzjVDRno3VQdxb 86dwcfMZhLC5A== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/gtk.scm (at-spi2-core)[arguments]<#:phases>: Remove trailing #t. --- gnu/packages/gtk.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 634a0125d8..842a46a846 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -734,12 +734,11 @@ scaled, composited, modified, saved, or rendered.") ;; Ensure that the cross-references point to the "doc" output. (substitute* "doc/libatspi/meson.build" (("docpath =.*") - (string-append "docpath = '" (assoc-ref outputs "doc") "/share/gtk-doc/html'\n"))) - #t)) + (string-append "docpath = '" (assoc-ref outputs "doc") + "/share/gtk-doc/html'\n"))))) (add-before 'install 'prepare-doc-directory (lambda* (#:key outputs #:allow-other-keys) - (mkdir-p (string-append (assoc-ref outputs "doc") "/share")) - #t)) + (mkdir-p (string-append (assoc-ref outputs "doc") "/share")))) (add-after 'unpack 'patch-docbook-sgml (lambda* (#:key native-inputs inputs #:allow-other-keys) (let* ((xmldoc @@ -748,8 +747,7 @@ scaled, composited, modified, saved, or rendered.") "/xml/dtd/docbook"))) (substitute* "doc/libatspi/libatspi-docs.sgml" (("http://.*/docbookx\\.dtd") - (string-append xmldoc "/docbookx.dtd"))) - #t))) + (string-append xmldoc "/docbookx.dtd")))))) ,@(if (%current-target-system) '() '((add-after 'install 'move-documentation @@ -760,8 +758,7 @@ scaled, composited, modified, saved, or rendered.") (string-append out "/share/gtk-doc") (string-append doc "/share/gtk-doc")) (delete-file-recursively - (string-append out "/share/gtk-doc"))) - #t)))) + (string-append out "/share/gtk-doc"))))))) (add-after 'install 'check (lambda* (#:key tests? #:allow-other-keys) (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:31:36 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:31:36 +0000 Received: from localhost ([127.0.0.1]:57040 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJZY-0005ux-AG for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:31:36 -0400 Received: from newton.telenet-ops.be ([195.130.132.45]:38858) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJZW-0005uS-GQ for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:31:35 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by newton.telenet-ops.be (Postfix) with ESMTPS id 4HLXNv1zvkzMqkLf for <50905@debbugs.gnu.org>; Fri, 1 Oct 2021 16:21:51 +0200 (CEST) Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMrMo; Fri, 01 Oct 2021 16:21:51 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 32/38] gnu: json-glib: Make 'bash-minimal' input unconditional. Date: Fri, 1 Oct 2021 16:21:34 +0200 Message-Id: <20211001142140.17027-32-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098111; bh=Stbf5m9+hWyHtGLI3hQkXNQ/MbTmV1dVYAw2rhyI4Fc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Z7ahzScb5I8oedmWevS3IR22JfLXZ6asEg6xLEmgy85DsZ6bWUBDRNkDpbxd98y2G qQ8hkBNaJAwoG1Hv4FQupusWwuWamNcTDB5MVAD7gka4GePXVKremyHODjSdg13V15 SdSPw1lTRzSQ27O39RXJDwQpLyHT0sDeW84OQt1rMyDYGYbSIwY0ezfD21JETaQD5h f55Vw4hGMAtUsxcuUXK46/96peMuvgTkmgDRddRLm7xQMpCSp2JDOx4ncok+x6ZOcW +1GKywseArOK1Oyxj8eCtEB+Snib525vKBzQRLbW/omRxzpmtrOAKqcduyk3q2T4DS JOxwkC+wLKO7Q== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/gnome.scm (json-glib)[inputs]{bash-minimal}: Make it unconditional. --- gnu/packages/gnome.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 57d9a9be79..b00a02b81f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4645,10 +4645,7 @@ configuration storage systems.") ("pkg-config" ,pkg-config) ("xsltproc" ,libxslt))) (inputs - ;; TODO(core-updates): Make this input unconditional. - (if (%current-target-system) - `(("bash-minimal" ,bash-minimal)) - '())) + `(("bash-minimal" ,bash-minimal))) (propagated-inputs `(("glib" ,glib))) ;according to json-glib-1.0.pc (home-page "https://wiki.gnome.org/Projects/JsonGlib") -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:31:38 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:31:39 +0000 Received: from localhost ([127.0.0.1]:57042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJZa-0005vA-Ix for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:31:38 -0400 Received: from newton.telenet-ops.be ([195.130.132.45]:38856) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJZW-0005uR-GQ for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:31:35 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by newton.telenet-ops.be (Postfix) with ESMTPS id 4HLXNv6vbLzMqkmS for <50905@debbugs.gnu.org>; Fri, 1 Oct 2021 16:21:51 +0200 (CEST) Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMrN7; Fri, 01 Oct 2021 16:21:51 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 37/38] build/qt-utils: Allow overriding the shell interpreter used. Date: Fri, 1 Oct 2021 16:21:39 +0200 Message-Id: <20211001142140.17027-37-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098111; bh=v8dpSt+yBNsMIXNs2uxccAIAWbz/Ch1xmzKzziL1T9E=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=uHv/mLD7Bs/2HsfZdfNUefDfcHFPrBFf5o8tSUNMFQkk4rCfMySoJrZ1T7dhcnpA4 Sp7fJ5dEiKymwk5Jt+QpAqxNv1gmXjJsGTltUHHz0X4H0of9+TgYzwS12gexdQn+Df obzCK8g3ISWZxan5HN9oT0M9dxvPEmOmamH7CSO6XoWVWo4EVDncd7AmOU6I7Kjc/G rwChlC6Oi8Rc33niXkEsGNf3zHWX60py6UzDiYxmph0xvpmSn3yAmmmbqE5+Bbi0jl sTFxXZZUvIIU3vVvwL2UseS7hVu6H2QhCkxuVlYeA9F/lA2NtRmxnJcmO65x/xUlnC CDxs/+KvAqoRg== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * guix/build/qt-utils.scm (wrap-qt-program*): Add #:sh argument and pass it to 'wrap-program'. (wrap-qt-program): Likewise, but pass it to 'wrap-qt-program*' instead. (wrap-all-qt-programs): Likewise, but pass it to 'wrap-qt-program' instead. --- guix/build/qt-utils.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/guix/build/qt-utils.scm b/guix/build/qt-utils.scm index c2b80cab7d..97145a116d 100644 --- a/guix/build/qt-utils.scm +++ b/guix/build/qt-utils.scm @@ -90,7 +90,7 @@ '("QTWEBENGINEPROCESS_PATH" = regular "/lib/qt5/libexec/QtWebEngineProcess")))) -(define* (wrap-qt-program* program #:key inputs output-dir +(define* (wrap-qt-program* program #:key sh inputs output-dir qt-wrap-excluded-inputs) (define input-directories @@ -105,9 +105,9 @@ (cons output-dir input-directories) output-dir))) (when (not (null? vars-to-wrap)) - (apply wrap-program program vars-to-wrap)))) + (apply wrap-program program #:sh sh vars-to-wrap)))) -(define* (wrap-qt-program program-name #:key inputs output +(define* (wrap-qt-program program-name #:key (sh (which "bash")) inputs output (qt-wrap-excluded-inputs %qt-wrap-excluded-inputs)) "Wrap the specified programm (which must reside in the OUTPUT's \"/bin\" directory) with suitably set environment variables. @@ -115,10 +115,11 @@ directory) with suitably set environment variables. This is like qt-build-systems's phase \"qt-wrap\", but only the named program is wrapped." (wrap-qt-program* (string-append output "/bin/" program-name) + #:sh sh #:output-dir output #:inputs inputs #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs)) -(define* (wrap-all-qt-programs #:key inputs outputs +(define* (wrap-all-qt-programs #:key (sh (which "bash")) inputs outputs (qt-wrap-excluded-outputs '()) (qt-wrap-excluded-inputs %qt-wrap-excluded-inputs) #:allow-other-keys) @@ -144,6 +145,7 @@ add a dependency of that output on Qt." ((output . output-dir) (unless (member output qt-wrap-excluded-outputs) (for-each (cut wrap-qt-program* <> + #:sh sh #:output-dir output-dir #:inputs inputs #:qt-wrap-excluded-inputs qt-wrap-excluded-inputs) (find-files-to-wrap output-dir)))))) -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Oct 01 10:31:39 2021 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:31:39 +0000 Received: from localhost ([127.0.0.1]:57044 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJZa-0005vC-T6 for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:31:39 -0400 Received: from newton.telenet-ops.be ([195.130.132.45]:39112) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJZW-0005uU-Nr for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:31:35 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by newton.telenet-ops.be (Postfix) with ESMTPS id 4HLXNv05g3zMqkG2 for <50905@debbugs.gnu.org>; Fri, 1 Oct 2021 16:21:51 +0200 (CEST) Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMqMe; Fri, 01 Oct 2021 16:21:50 +0200 From: Maxime Devos To: Mathieu Othacehe Subject: [PATCH core-updates v2 30/38] gnu: wayland: Unconditionally lookup docbook in native-inputs. Date: Fri, 1 Oct 2021 16:21:32 +0200 Message-Id: <20211001142140.17027-30-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098111; bh=bW0Vj0kgmMa3iTcQKOmwUtI5MJrCmDnhfcB3/zQzyWU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=T6OFIN45GZv0Yvq/d00fXnK3nJH7EilKK5lBxsRfFEtRmX2kLbShP1p2pN+gGuFjr g32nXUoYqnkvI+iIiN3vCt6bLh77Yo2L46GcuuzcaXONwxgyuyKK9f8vi0gS+/h4Cg mKePHXwPWnpO641qJ9mckD1QgF5VzY2o92pRZQ9P5TbvAM8hQRriRdnmQOvz3BG2cA WN+n9SoW1tChbNCWX+yI1caDIeH6mAbdtM8AnpiA5AfyVEdAk3JSyCscP/1/BU+XNH Zm4r+TNXygaUPEMp/Uq+1ohjUsFM2e7G8WWgIjoVPTKfHXn8oYseUZEv55p6ijl/Ug rX4lndB4SXxUw== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 50905 Cc: Maxime Devos , 50905@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/freedesktop.scm (wayland)[arguments]<#:phases>{patch-docbook-sgml}: Unconditionally look in (or native-inputs inputs) for docbook-xml and docbook-xml-4.2. --- gnu/packages/freedesktop.scm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 9bcf2d8d3e..0f04a38c00 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -975,22 +975,16 @@ Python.") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-docbook-xml - ;; TODO(core-updates): Use 'native-inputs' unconditionally - (lambda* (#:key ,@(if (%current-target-system) - '(native-inputs) - '()) - inputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs #:allow-other-keys) (with-directory-excursion "doc" (substitute* (find-files "." "\\.xml$") (("http://www.oasis-open.org/docbook/xml/4\\.5/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xml") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xml") "/xml/dtd/docbook/")) (("http://www.oasis-open.org/docbook/xml/4\\.2/") - (string-append (assoc-ref ,(if (%current-target-system) - '(or native-inputs inputs) - 'inputs) "docbook-xml-4.2") + (string-append (assoc-ref (or native-inputs inputs) + "docbook-xml-4.2") "/xml/dtd/docbook/")))) #t)) (add-after 'install 'move-doc -- 2.33.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Oct 02 12:54:15 2021 Received: (at 50905-done) by debbugs.gnu.org; 2 Oct 2021 16:54:15 +0000 Received: from localhost ([127.0.0.1]:60474 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWiH9-0000M3-1u for submit@debbugs.gnu.org; Sat, 02 Oct 2021 12:54:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34526) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWiH7-0000Lj-Dl for 50905-done@debbugs.gnu.org; Sat, 02 Oct 2021 12:54:13 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:57060) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWiH1-0003m1-UK; Sat, 02 Oct 2021 12:54:07 -0400 Received: from [2a01:e0a:19b:d9a0:45b5:a14a:5c75:5737] (port=59294 helo=meije) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWiH1-0001Dz-Ev; Sat, 02 Oct 2021 12:54:07 -0400 From: Mathieu Othacehe To: Maxime Devos Subject: Re: bug#50905: [PATCH core-updates 00/38] Clean up TODO(core-updates) References: <20211001142140.17027-1-maximedevos@telenet.be> Date: Sat, 02 Oct 2021 16:54:04 +0000 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> (Maxime Devos's message of "Fri, 1 Oct 2021 16:21:03 +0200") Message-ID: <87h7dzweoj.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 50905-done Cc: 50905-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > * guix/build-system/mozilla.scm > (lower-mozilla): New procedure. > (mozilla-build-system): New variable. > * Makefile.am (MODULES): Add it. > * doc/guix.texi (Build Systems): Document it. Pushed the v2 on core-updates, Thanks, Mathieu From unknown Fri Jun 20 07:18:36 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 31 Oct 2021 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator