From patchwork Wed Sep 29 22:19:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 33422 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2AE4D27BBE3; Wed, 29 Sep 2021 23:20:56 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DA08E27BBE1 for ; Wed, 29 Sep 2021 23:20:55 +0100 (BST) Received: from localhost ([::1]:42558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhwc-0006GG-W7 for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:20:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44174) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhvo-0005vN-Io for guix-patches@gnu.org; Wed, 29 Sep 2021 18:20:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39097) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhvm-00019N-9S for guix-patches@gnu.org; Wed, 29 Sep 2021 18:20:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhvm-0000bI-4E for guix-patches@gnu.org; Wed, 29 Sep 2021 18:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 01/38] build-system/mozilla: New build system. References: In-Reply-To: Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329539852135 (code B ref 50905); Wed, 29 Sep 2021 22:20:02 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 base-commit: 0cccc2f52cedd9b0e0646cc4d3ae64a886f2db6b 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 From patchwork Wed Sep 29 22:19:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 33421 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 98ADF27BBE3; Wed, 29 Sep 2021 23:20:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5E10727BBE1 for ; Wed, 29 Sep 2021 23:20:41 +0100 (BST) Received: from localhost ([::1]:42130 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhwO-0005wb-G8 for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:20:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhvo-0005vM-Gp for guix-patches@gnu.org; Wed, 29 Sep 2021 18:20:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39098) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhvn-0001AW-DN for guix-patches@gnu.org; Wed, 29 Sep 2021 18:20:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhvn-0000bY-6V for guix-patches@gnu.org; Wed, 29 Sep 2021 18:20:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 02/38] gnu: nspr: Use mozilla-build-system. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:20:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329539862150 (code B ref 50905); Wed, 29 Sep 2021 22:20:03 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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. From patchwork Wed Sep 29 22:19:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33428 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 75DDF27BBE1; Wed, 29 Sep 2021 23:21:42 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4E0AD27BBE3 for ; Wed, 29 Sep 2021 23:21:38 +0100 (BST) Received: from localhost ([::1]:44150 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhxJ-0007Wo-4j for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:21:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44440) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwn-0006eq-Db for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39176) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwm-00020u-Uo for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwm-0000jB-Qq for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 03/38] gnu: mozjs: Use mozilla-build-system. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540132470 (code B ref 50905); Wed, 29 Sep 2021 22:21:04 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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. From patchwork Wed Sep 29 22:19:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33424 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8AEA527BBE1; Wed, 29 Sep 2021 23:21:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F2DC727BBE3 for ; Wed, 29 Sep 2021 23:21:22 +0100 (BST) Received: from localhost ([::1]:43204 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhx4-0006hS-0f for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:21:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44414) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwk-0006e2-Id for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39169) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwk-0001yH-9B for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwk-0000iI-1b for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 04/38] gnu: icecat: Use mozilla-build-system. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540042361 (code B ref 50905); Wed, 29 Sep 2021 22:21:02 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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) From patchwork Wed Sep 29 22:19:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 33425 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6F99D27BBE3; Wed, 29 Sep 2021 23:21:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3A22A27BBE1 for ; Wed, 29 Sep 2021 23:21:24 +0100 (BST) Received: from localhost ([::1]:43248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhx5-0006jh-B3 for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:21:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44418) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwk-0006e3-Pd for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39170) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwk-0001yM-Hr for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwk-0000iR-EC for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 05/38] build/minetest-build-system: Move png-file? to (guix build utils). Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540072412 (code B ref 50905); Wed, 29 Sep 2021 22:21:02 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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")))) From patchwork Wed Sep 29 22:19:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33426 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DF71F27BBE4; Wed, 29 Sep 2021 23:21:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A610E27BBE1 for ; Wed, 29 Sep 2021 23:21:37 +0100 (BST) Received: from localhost ([::1]:44102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhxI-0007Up-LU for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:21:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwl-0006e4-5g for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39171) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwk-0001yi-TZ for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwk-0000iY-QA for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 06/38] gnu: mozjs: Make the native-inputs unconditional. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540072419 (code B ref 50905); Wed, 29 Sep 2021 22:21:02 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 From patchwork Wed Sep 29 22:19:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33448 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 51B6F27BBE3; Wed, 29 Sep 2021 23:24:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2482227BBE1 for ; Wed, 29 Sep 2021 23:24:08 +0100 (BST) Received: from localhost ([::1]:50614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhzj-0003WA-5a for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:24:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44430) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwl-0006e7-Iw for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39172) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwl-0001zM-BQ for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwl-0000if-6Z for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 07/38] gnu: mozjs: Make the quasiquote unconditional. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540072427 (code B ref 50905); Wed, 29 Sep 2021 22:21:03 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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. From patchwork Wed Sep 29 22:19:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33427 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 33D4527BBE1; Wed, 29 Sep 2021 23:21:38 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DB61B27BBE3 for ; Wed, 29 Sep 2021 23:21:37 +0100 (BST) Received: from localhost ([::1]:44100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhxI-0007Ug-TG for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:21:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44432) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwm-0006e8-0w for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39173) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwl-0001zk-Q1 for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwl-0000ip-MY for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 08/38] gnu: isc-dhcp: Don't use canonical-package. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540082434 (code B ref 50905); Wed, 29 Sep 2021 22:21:03 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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) From patchwork Wed Sep 29 22:19:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33423 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 592E727BBE4; Wed, 29 Sep 2021 23:21:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id ED28A27BBE1 for ; Wed, 29 Sep 2021 23:21:22 +0100 (BST) Received: from localhost ([::1]:43214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhx4-0006hn-0z for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:21:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwm-0006eA-Dz for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39174) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwm-0001zp-5i for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwm-0000iw-2Z for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 09/38] gnu: isc-dhcp: Make an input unconditional. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540082441 (code B ref 50905); Wed, 29 Sep 2021 22:21:04 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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))) From patchwork Wed Sep 29 22:19:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33450 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6000827BBE3; Wed, 29 Sep 2021 23:24:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1CD7527BBE1 for ; Wed, 29 Sep 2021 23:24:19 +0100 (BST) Received: from localhost ([::1]:51020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhzu-0003nH-4n for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:24:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44436) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwm-0006eC-QH for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39175) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwm-0001zz-Ia for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwm-0000j4-Ed for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 10/38] gnu: isc-dhcp: Remove unnecessary shebang patching. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540082449 (code B ref 50905); Wed, 29 Sep 2021 22:21:04 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 From patchwork Wed Sep 29 22:19:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33431 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B76EB27BBE1; Wed, 29 Sep 2021 23:21:53 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 37D0127BBE4 for ; Wed, 29 Sep 2021 23:21:53 +0100 (BST) Received: from localhost ([::1]:44970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhxY-00087A-8a for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:21:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44466) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwp-0006mL-Jj for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39182) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwp-00023E-Aq for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwp-0000jt-65 for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 11/38] gnu: isc-dhcp: Remove trailing #t. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540292530 (code B ref 50905); Wed, 29 Sep 2021 22:21:07 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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) From patchwork Wed Sep 29 22:19:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33445 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5433427BBE3; Wed, 29 Sep 2021 23:23:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 159AC27BBE1 for ; Wed, 29 Sep 2021 23:23:29 +0100 (BST) Received: from localhost ([::1]:49588 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhz6-0002oU-4K for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:23:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwu-00076q-96 for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39193) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwt-00029V-EU for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwt-0000lB-9x for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 12/38] gnu: gobject-introspection: Move things to native-inputs. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540332610 (code B ref 50905); Wed, 29 Sep 2021 22:21:11 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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) From patchwork Wed Sep 29 22:19:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33447 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 11B2827BBE3; Wed, 29 Sep 2021 23:24:06 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CEA7527BBE1 for ; Wed, 29 Sep 2021 23:24:05 +0100 (BST) Received: from localhost ([::1]:50478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhzg-0003Qe-Tp for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:24:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44602) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwv-0007Ag-U7 for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39199) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwv-0002Cq-MH for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwv-0000lt-J1 for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 13/38] gnu: gobject-introspection: Use python instead of python-wrapper. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540352654 (code B ref 50905); Wed, 29 Sep 2021 22:21:13 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches '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) From patchwork Wed Sep 29 22:19:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33453 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D409A27BBE3; Wed, 29 Sep 2021 23:24:35 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A6F7427BBE1 for ; Wed, 29 Sep 2021 23:24:35 +0100 (BST) Received: from localhost ([::1]:51886 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVi0A-0004PJ-OH for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:24:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44454) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwo-0006hN-Aq for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39179) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwo-00021w-3E for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwn-0000jY-VK for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 14/38] gnu: cairo: Make 'bash-minimal' input unconditional. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540282508 (code B ref 50905); Wed, 29 Sep 2021 22:21:05 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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) From patchwork Wed Sep 29 22:19:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33434 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9270627BBE3; Wed, 29 Sep 2021 23:22:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4531427BBE1 for ; Wed, 29 Sep 2021 23:22:08 +0100 (BST) Received: from localhost ([::1]:45816 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhxn-0000F8-A4 for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:22:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44458) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwo-0006iW-Na for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39180) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwo-00022O-Ep for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwo-0000jf-BW for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 15/38] gnu: libthai: Make 'datrie' input unconditional. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540292515 (code B ref 50905); Wed, 29 Sep 2021 22:21:06 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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") From patchwork Wed Sep 29 22:19:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 33452 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EB4AF27BBE3; Wed, 29 Sep 2021 23:24:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BA4AD27BBE1 for ; Wed, 29 Sep 2021 23:24:27 +0100 (BST) Received: from localhost ([::1]:51458 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVi02-00047L-RP for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:24:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44446) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwn-0006gM-V8 for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39178) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwn-00021Y-NJ for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwn-0000jR-J4 for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 16/38] gnu: libdatrie: Make input labels match the package name. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540282500 (code B ref 50905); Wed, 29 Sep 2021 22:21:05 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 From patchwork Wed Sep 29 22:19:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33429 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 279F327BBE3; Wed, 29 Sep 2021 23:21:53 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EE89827BBE1 for ; Wed, 29 Sep 2021 23:21:52 +0100 (BST) Received: from localhost ([::1]:44966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhxX-000874-4d for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:21:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44442) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwn-0006fZ-IV for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39177) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwn-00021M-Ac for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwn-0000jI-70 for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 17/38] gnu: pango: Make 'bash-minimal' input unconditional. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540282493 (code B ref 50905); Wed, 29 Sep 2021 22:21:05 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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. From patchwork Wed Sep 29 22:19:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33454 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6BC9527BBE3; Wed, 29 Sep 2021 23:24:45 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2C75727BBE1 for ; Wed, 29 Sep 2021 23:24:45 +0100 (BST) Received: from localhost ([::1]:52324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVi0K-0004h7-8R for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:24:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44462) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwp-0006jy-5F for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39181) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwo-00022y-Re for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwo-0000jm-Na for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 18/38] gnu: gdk-pixbuf: Unconditionally lookup docbook in native-inputs. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540292522 (code B ref 50905); Wed, 29 Sep 2021 22:21:06 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 From patchwork Wed Sep 29 22:19:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33437 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4723727BBE3; Wed, 29 Sep 2021 23:22:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 19ABA27BBE1 for ; Wed, 29 Sep 2021 23:22:22 +0100 (BST) Received: from localhost ([::1]:46654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhy1-0000nu-4t for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:22:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44480) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwq-0006pc-BI for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39184) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwq-000246-2X for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwp-0000k7-Ud for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 19/38] gnu: gdk-pixbuf: Respect #:tests?. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540302545 (code B ref 50905); Wed, 29 Sep 2021 22:21:07 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 From patchwork Wed Sep 29 22:19:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33433 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4420F27BBE3; Wed, 29 Sep 2021 23:22:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 19BDD27BBE1 for ; Wed, 29 Sep 2021 23:22:08 +0100 (BST) Received: from localhost ([::1]:45794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhxn-0000EY-2q for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:22:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44472) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwp-0006nq-W4 for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39183) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwp-00023N-MT for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwp-0000k0-Id for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 20/38] gnu: gdk-pixbuf: Use target predicates. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540302538 (code B ref 50905); Wed, 29 Sep 2021 22:21:07 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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? From patchwork Wed Sep 29 22:19:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33455 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 92D7D27BBE3; Wed, 29 Sep 2021 23:24:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5B22527BBE1 for ; Wed, 29 Sep 2021 23:24:52 +0100 (BST) Received: from localhost ([::1]:52626 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVi0R-0004u4-FP for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:24:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44486) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwq-0006qz-QB for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39185) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwq-00024n-ET for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwq-0000kE-AV for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 21/38] gnu: gdk-pixbuf: Make 'bash-minimal' input unconditional. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540302552 (code B ref 50905); Wed, 29 Sep 2021 22:21:08 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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) From patchwork Wed Sep 29 22:19:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33435 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7B5E727BBE3; Wed, 29 Sep 2021 23:22:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 46CBF27BBE1 for ; Wed, 29 Sep 2021 23:22:20 +0100 (BST) Received: from localhost ([::1]:46606 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhxz-0000mI-9b for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:22:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44516) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhws-000701-Md for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39190) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhws-000274-Ax for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhws-0000kp-6J for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 22/38] gnu: gdk-pixbuf: Remove trailing #t. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540322589 (code B ref 50905); Wed, 29 Sep 2021 22:21:10 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 From patchwork Wed Sep 29 22:19:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33430 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 94E9927BBE3; Wed, 29 Sep 2021 23:21:53 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3626E27BBE1 for ; Wed, 29 Sep 2021 23:21:53 +0100 (BST) Received: from localhost ([::1]:45004 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhxY-000897-8R for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:21:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44488) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwr-0006sO-4c for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39186) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwq-00024y-Qs for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwq-0000kM-Mj for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 23/38] gnu: at-spi2-core: Make 'bash-minimal' input unconditional. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540302560 (code B ref 50905); Wed, 29 Sep 2021 22:21:08 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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) From patchwork Wed Sep 29 22:19:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33440 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BD25C27BBE3; Wed, 29 Sep 2021 23:22:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8F79E27BBE1 for ; Wed, 29 Sep 2021 23:22:31 +0100 (BST) Received: from localhost ([::1]:47572 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhyA-0001Qz-Jc for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:22:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44496) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwr-0006vS-TX for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39188) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwr-00025j-JI for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwr-0000ka-Eh for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 24/38] gnu: at-spi2-core: Respect #:tests?. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540312574 (code B ref 50905); Wed, 29 Sep 2021 22:21:09 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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))) From patchwork Wed Sep 29 22:19:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33432 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A833F27BBE3; Wed, 29 Sep 2021 23:22:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 758B827BBE1 for ; Wed, 29 Sep 2021 23:22:07 +0100 (BST) Received: from localhost ([::1]:45826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhxm-0000FY-IL for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:22:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44492) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwr-0006ti-Fa for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:09 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39187) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwr-000258-6q for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwr-0000kT-2g for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 25/38] gnu: at-spi2-core: Unconditionally lookup docbook in native-inputs. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540312567 (code B ref 50905); Wed, 29 Sep 2021 22:21:09 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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" From patchwork Wed Sep 29 22:19:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33442 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0C1BB27BBE3; Wed, 29 Sep 2021 23:22:56 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CCA3B27BBE1 for ; Wed, 29 Sep 2021 23:22:55 +0100 (BST) Received: from localhost ([::1]:48372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhyY-0001yC-T3 for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:22:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44504) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhws-0006xL-A7 for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39189) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwr-00026U-Up for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwr-0000ki-Qj for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 26/38] gnu: at-spi2-core: Remove trailing #t. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540312581 (code B ref 50905); Wed, 29 Sep 2021 22:21:09 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 From patchwork Wed Sep 29 22:19:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33444 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EEF5027BBE3; Wed, 29 Sep 2021 23:23:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C38A827BBE1 for ; Wed, 29 Sep 2021 23:23:14 +0100 (BST) Received: from localhost ([::1]:48980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhyr-0002Ne-TS for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:23:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwt-00071O-29 for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39191) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhws-00027o-Mc for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhws-0000kw-IG for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 27/38] gnu: avahi: Make 'bash-minimal' input unconditional. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540322596 (code B ref 50905); Wed, 29 Sep 2021 22:21:10 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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) From patchwork Wed Sep 29 22:19:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33436 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2BBF827BBE3; Wed, 29 Sep 2021 23:22:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F271A27BBE1 for ; Wed, 29 Sep 2021 23:22:20 +0100 (BST) Received: from localhost ([::1]:46628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhxz-0000n1-OG for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:22:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44544) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwt-000731-G2 for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39192) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwt-00028b-2U for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhws-0000l4-UM for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 28/38] gnu: avahi: Make the 'patch-more-shebangs' phase unconditional. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540322603 (code B ref 50905); Wed, 29 Sep 2021 22:21:10 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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) From patchwork Wed Sep 29 22:19:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33443 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F23C727BBE3; Wed, 29 Sep 2021 23:23:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BD9B827BBE1 for ; Wed, 29 Sep 2021 23:23:13 +0100 (BST) Received: from localhost ([::1]:48924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhyq-0002Lc-QV for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:23:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44640) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwx-0007FP-WF for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39204) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwx-0002HQ-L9 for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwx-0000mU-GZ for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 29/38] gnu: freedesktop: Unconditionally use alternatives to % variables. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:15 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540362690 (code B ref 50905); Wed, 29 Sep 2021 22:21:15 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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")) From patchwork Wed Sep 29 22:19:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33456 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7177B27BBE3; Wed, 29 Sep 2021 23:24:59 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 13C8527BBE1 for ; Wed, 29 Sep 2021 23:24:59 +0100 (BST) Received: from localhost ([::1]:52836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVi0Y-00052u-5w for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:24:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44584) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwv-0007AK-67 for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39197) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwu-0002CL-UV for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwu-0000le-Qb for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 30/38] gnu: wayland: Unconditionally lookup docbook in native-inputs. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540342640 (code B ref 50905); Wed, 29 Sep 2021 22:21:12 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 From patchwork Wed Sep 29 22:19:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33439 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E504A27BBE3; Wed, 29 Sep 2021 23:22:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B08CF27BBE1 for ; Wed, 29 Sep 2021 23:22:30 +0100 (BST) Received: from localhost ([::1]:47504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhy9-0001OC-Ny for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:22:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44564) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwu-000772-EI for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39194) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwt-0002Ab-Pz for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwt-0000lI-M9 for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 31/38] gnu: json-glib: Unconditionally lookup docbook in native-inputs. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540332618 (code B ref 50905); Wed, 29 Sep 2021 22:21:11 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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. From patchwork Wed Sep 29 22:19:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33438 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A352427BBE3; Wed, 29 Sep 2021 23:22:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6CB7327BBE1 for ; Wed, 29 Sep 2021 23:22:29 +0100 (BST) Received: from localhost ([::1]:47382 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhy8-0001Jf-Ek for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:22:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44566) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwu-00077v-Hm for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39195) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwu-0002Bt-7S for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwu-0000lQ-25 for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 32/38] gnu: json-glib: Make 'bash-minimal' input unconditional. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540342625 (code B ref 50905); Wed, 29 Sep 2021 22:21:12 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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") From patchwork Wed Sep 29 22:19:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33441 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6670127BBE3; Wed, 29 Sep 2021 23:22:55 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2E97F27BBE1 for ; Wed, 29 Sep 2021 23:22:55 +0100 (BST) Received: from localhost ([::1]:48304 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhyY-0001vI-7d for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:22:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44576) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwu-00079G-TC for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39196) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwu-0002C6-Il for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwu-0000lX-Ek for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 33/38] gnu: heimdal: Make some parts of phases unconditional. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540342633 (code B ref 50905); Wed, 29 Sep 2021 22:21:12 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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'. From patchwork Wed Sep 29 22:19:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33457 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 55E9727BBE3; Wed, 29 Sep 2021 23:25:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1E2C927BBE1 for ; Wed, 29 Sep 2021 23:25:11 +0100 (BST) Received: from localhost ([::1]:53072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVi0k-0005D8-5Y for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:25:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44598) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwv-0007AV-IO for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39198) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwv-0002CT-9i for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwv-0000lm-6Y for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 34/38] gnu: heimdal: Make 'bash-minimal' input unconditional. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540352647 (code B ref 50905); Wed, 29 Sep 2021 22:21:13 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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))) From patchwork Wed Sep 29 22:19:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33446 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7321A27BBE3; Wed, 29 Sep 2021 23:23:58 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3985B27BBE1 for ; Wed, 29 Sep 2021 23:23:58 +0100 (BST) Received: from localhost ([::1]:50058 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhzZ-000395-A8 for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:23:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44606) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhww-0007Aj-AB for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39200) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhww-0002Dq-2W for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwv-0000m0-Uy for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 35/38] gnu: libcap: Unconditionally use #$output. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540352662 (code B ref 50905); Wed, 29 Sep 2021 22:21:13 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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" From patchwork Wed Sep 29 22:19:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33458 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 18E4727BBE3; Wed, 29 Sep 2021 23:25:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DEE0E27BBE1 for ; Wed, 29 Sep 2021 23:25:21 +0100 (BST) Received: from localhost ([::1]:53536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVi0u-0005W6-Sy for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:25:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44618) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhww-0007Ap-Lx for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39201) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhww-0002ER-El for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhww-0000m8-Ae for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 36/38] gnu: libproxy: Respect #:tests?. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:14 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540352669 (code B ref 50905); Wed, 29 Sep 2021 22:21:14 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 From patchwork Wed Sep 29 22:19:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33449 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C612127BBE3; Wed, 29 Sep 2021 23:24:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8D3AB27BBE1 for ; Wed, 29 Sep 2021 23:24:16 +0100 (BST) Received: from localhost ([::1]:50892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhzr-0003hw-Jx for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:24:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44628) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwx-0007CU-AZ for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39202) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhww-0002FP-RA for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhww-0000mF-N3 for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 37/38] build/qt-utils: Allow overriding the shell interpreter used. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:14 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540362676 (code B ref 50905); Wed, 29 Sep 2021 22:21:14 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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)))))) From patchwork Wed Sep 29 22:19:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33451 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EA01027BBE3; Wed, 29 Sep 2021 23:24:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BC1F727BBE1 for ; Wed, 29 Sep 2021 23:24:24 +0100 (BST) Received: from localhost ([::1]:51324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mVhzz-0003zF-RR for patchwork@mira.cbaines.net; Wed, 29 Sep 2021 18:24:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44634) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mVhwx-0007E5-JA for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39203) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mVhwx-0002Gk-9p for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mVhwx-0000mM-4H for guix-patches@gnu.org; Wed, 29 Sep 2021 18:21:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH 38/38] lint: check-wrapper-inputs: Remove mentions of core-updates. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Sep 2021 22:21:15 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50905 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50905@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.16329540362684 (code B ref 50905); Wed, 29 Sep 2021 22:21:15 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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)))