From patchwork Fri Oct 1 14:21:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 33502 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 1587A27BBE1; Fri, 1 Oct 2021 15:27:33 +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 2004527BBE4 for ; Fri, 1 Oct 2021 15:27:32 +0100 (BST) Received: from localhost ([::1]:46218 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJVb-00045g-4k for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:27:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44010) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUF-0002AL-Vb for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45414) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUC-0000W5-IC for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUC-0005gU-Ex for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 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: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309831321594 (code B ref 50905); Fri, 01 Oct 2021 14:26:04 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:13 +0000 Received: from localhost ([127.0.0.1]:56909 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTN-0005c8-3n for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:13 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33304) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ4-0005Ta-ET for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:51 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMmK0; Fri, 01 Oct 2021 16:21:47 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:03 +0200 Message-Id: <20211001142140.17027-1-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098107; bh=w34kHtGWnBZ5MxjxizImitn0skaztKbb1wU8Y5diKMo=; h=From:To:Cc:Subject:Date; b=QC5RAO9aHIP7zCP1nZJjIb21iFxGWCXHMVAPPfJDbyiDLWjOszt7M2o14hFrCo9A/ EQpB8u0fWD8c0KRX5KjsneuCBGRbvtTF1I3XhNkSERTdU0O60Ccpvq60+A7HV+P1Uk A0tGL3XcIhmtnQEhEPghUjeR/aIWzK5lYVhEXoLnHXs0KH+y9Aoubg4xVgu5lhelll EG6ft1/BlHDXmfiX3IZmEC6wl2HaM4iWJSTSV+ZbFLopC+iuzbjlELAGSXewrBgk88 lnl7MKHBRXYv5+5TCoA9OPHwqE/EBEgA+v32WnOsF0A99y5KtDNlxMVVdY3glrN8P4 DT3W7N6QAGeGw== X-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. * doc/guix.texi (Build Systems): Document it. --- Makefile.am | 1 + doc/guix.texi | 9 ++++++ guix/build-system/mozilla.scm | 52 +++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+) create mode 100644 guix/build-system/mozilla.scm 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/doc/guix.texi b/doc/guix.texi index 830a230bd0..996526eb83 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8000,6 +8000,15 @@ directory, the parameter @code{#:javascript-files} can be used to specify a list of file names to feed to the minifier. @end defvr +@defvr {Scheme Variable} mozilla-build-system +This variable is exported by @code{(guix build-system mozilla)}. It +sets the @code{--target} and @code{--host} configuration flags to what +software developed by Mozilla expects -- due to historical reasons, +Mozilla software expects @code{--host} to be the system that is +cross-compiled from and @code{--target} to be the system that is +cross-compiled to, contrary to the standard Autotools conventions. +@end defvr + @defvr {Scheme Variable} ocaml-build-system This variable is exported by @code{(guix build-system ocaml)}. It implements a build procedure for @uref{https://ocaml.org, OCaml} packages, which consists diff --git a/guix/build-system/mozilla.scm b/guix/build-system/mozilla.scm new file mode 100644 index 0000000000..b4141c8177 --- /dev/null +++ b/guix/build-system/mozilla.scm @@ -0,0 +1,52 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Maxime Devos +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix build-system mozilla) + #:use-module (guix build-system gnu) + #:use-module (guix build-system) + #:use-module (guix utils) + #:export (mozilla-build-system)) + +;; +;; Build procedure for packages using Autotools with the Mozillian conventions +;; for --target, --host and --build, which are different from the GNU +;; conventions. +;; +;; Code: + +(define* (lower-mozilla name #:key system target #:allow-other-keys + #:rest arguments) + (define lower (build-system-lower gnu-build-system)) + (if target + (apply lower + (substitute-keyword-arguments arguments + ;; Override --target and --host to what Mozillian configure + ;; scripts expect. + ((#:configure-flags configure-flags ''()) + `(cons* ,(string-append "--target=" target) + ,(string-append "--host=" (nix-system->gnu-triplet system)) + ,configure-flags)))) + (apply lower name arguments))) ; not cross-compiling + +(define mozilla-build-system + (build-system + (name 'mozilla) + (description "The build system for Mozilla software using the Autotools") + (lower lower-mozilla))) + +;;; mozilla.scm ends here From patchwork Fri Oct 1 14:21:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 33489 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 DE7B027BBE3; Fri, 1 Oct 2021 15:26:34 +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 A602627BBE1 for ; Fri, 1 Oct 2021 15:26:34 +0100 (BST) Received: from localhost ([::1]:43592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJUf-0002AZ-Ma for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:26:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43980) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUB-00025M-2S for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45409) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUA-0000S8-OD for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUA-0005ft-Cc for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 02/38] gnu: nspr: Use mozilla-build-system. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309831221558 (code B ref 50905); Fri, 01 Oct 2021 14:26:02 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:12 +0000 Received: from localhost ([127.0.0.1]:56899 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTL-0005bd-Ue for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:12 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33302) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ4-0005Tb-ER for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:49 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMnKP; Fri, 01 Oct 2021 16:21:47 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:04 +0200 Message-Id: <20211001142140.17027-2-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098107; bh=vljAjo3/PZeUZYRN1VIkfQoAGE+KBNPQ84xN0OBM6bY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vIB4bQskyDta7JLnGujuJddvA/RTaNfn7qJFqXH6fY9PRVjnqlC1jNKDGFhoYyyBV KNzO3pwV+Uue6Q9VvExJ+9YJXWnhe4SZbJaXLXy5bY5emttOe4KwaFMpLDt6Og8WyM /63UGVPiY+zUnjB1TGl75/WOJdtGVn/2EMge7yOBW5iX8+vJ1YoINC/pMeCnb8IAOD twaLUhteOajjUDav3c73rh5MZ/0sTiSuENQXFS0J8Eqg6EOvRa6L+eChLJSRSuW3VX VERYh/A+aCGA5XMAhUv4d4MSN5S1CWiOgxLrwXmIQuCFk0DuVJiAINollFxaudZCEe FkWNGTWxY/K3w== X-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 Fri Oct 1 14:21:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33490 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 B8C2727BBE3; Fri, 1 Oct 2021 15:26:39 +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 93C6427BBE1 for ; Fri, 1 Oct 2021 15:26:35 +0100 (BST) Received: from localhost ([::1]:43684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJUg-0002GO-Lj for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:26:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44060) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUJ-0002Ak-WA for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45431) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUJ-0000b4-Fj for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUJ-0005iW-CZ for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 03/38] gnu: mozjs: Use mozilla-build-system. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309832121723 (code B ref 50905); Fri, 01 Oct 2021 14:26:11 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:21 +0000 Received: from localhost ([127.0.0.1]:56943 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTR-0005e6-6i for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:20 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33310) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ4-0005Tc-EG for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:54 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMnKW; Fri, 01 Oct 2021 16:21:47 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:05 +0200 Message-Id: <20211001142140.17027-3-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098107; bh=nt9yZbzYYVKoSncxX9Vm+mRzHq2SC2tPwsrKIWPJz6c=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hazTuodZLvvk0/muUJeA0IK27/smhUcHPuGT8FuMqvDDNF5qcXpMSDQ3hDTlAf9N/ 1e0kRJoFQVikosjQJlcX2vyYRRGdFpJcaShZ3HNqiFEavHBy5EGKTAkHjmvQadnb39 X94VWSya0nfP9TyK386DvDQfODx6sfAqUBdCMhFpKHlMNle8zUhq0KmLLwBMmHzcjc 4rns6AnQqHkmFWsTJImsbFdEG/x0Z7Pij/P0odhDPRVrZ/U5TS+cJox18EfpmKOg/6 ejFo9ooXCKg733boi4mSLuvNC9mMuET5ma8VZZlOndhgnU5VcPtQN9v6H9D9+EeZmr Ng0hj/Pss3uAQ== X-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 Fri Oct 1 14:21:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33488 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 7168A27BBE3; Fri, 1 Oct 2021 15:26:33 +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 447E927BBE1 for ; Fri, 1 Oct 2021 15:26:33 +0100 (BST) Received: from localhost ([::1]:43538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJUe-00028R-6Y for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:26:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUB-00025c-4F for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45410) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUA-0000SF-Sl for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUA-0005g0-Q4 for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 04/38] gnu: icecat: Use mozilla-build-system. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309831221565 (code B ref 50905); Fri, 01 Oct 2021 14:26:02 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:12 +0000 Received: from localhost ([127.0.0.1]:56901 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTM-0005bf-7Y for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:12 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33316) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ4-0005Td-EP for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:50 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMnKc; Fri, 01 Oct 2021 16:21:47 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:06 +0200 Message-Id: <20211001142140.17027-4-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098107; bh=sTdB+hC/jnMw4GG2vc6eHlsT6AH09md3iN1TflsFCgk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fYRECn5cZ7a7D//ONIxYKJl1cWfdFoaPhkrVsXidJKCW4R0qxWMvDfGYIEcEnSMgU fVhNaDpCyh0c8Xn/IdtUZ6OShnWwKk8KVyMjs7BdR+nvZI5JKRjH8ewMUnE0aXf57U hyxzAGQwxgIpmrZIPaEe1pQ0iBi/VtAh6PGYx4tCGJfZoYfMx5FVwIh/ckaYRiJMdG FFmaabqHlKja8cfo6N+DgJ2nPmXw4rmBU9k8H578cEtxHaqSCeh4JS997ELVzIurxT kWnfB/cz2c37eafEdewW/lKpPn4FEccJwN8ZBogorYpX5PWmEoDElIHHv2pV0hD3AW MBYBWGjhy1TYw== X-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 Fri Oct 1 14:21:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 33494 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 8359727BBE3; Fri, 1 Oct 2021 15:27:00 +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 4801227BBE1 for ; Fri, 1 Oct 2021 15:27:00 +0100 (BST) Received: from localhost ([::1]:44546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJV5-0002xB-Bn for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:26:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUF-0002AT-Vw for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45415) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUC-0000WN-Ve for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUC-0005gb-Sa for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 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: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309831321601 (code B ref 50905); Fri, 01 Oct 2021 14:26:04 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:13 +0000 Received: from localhost ([127.0.0.1]:56911 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTN-0005cF-Hz for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:13 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33326) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ4-0005Te-EK for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:51 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMnKi; Fri, 01 Oct 2021 16:21:47 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:07 +0200 Message-Id: <20211001142140.17027-5-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098107; bh=VVt3ntCLp/UoKgWoBp+TFdwruGuf+mFnPp+kfLWP5Y0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MufgqSwJg6CtKaDs5QTJDgN7fFb5qURLElMUFmVgkmRKrikXNq2XNsnc6iP0qrdpF VDK4+3U+D8JDPBKOeSaYvovPdneLds5u+w6oYKvBMA6cFNVA4ackk3nxTFWSRkN4mX Dk3IfDKK/Sib47CmqkCEc+PWCY+WOrzT+zHvBA8boUHX9omSvKLsYZTpfNiE2QrzY+ z8rhTqJO4lDR1uHlCoJmf3G9MHlGTp3mMJnTulM1E3seimwxZUzNsL3eNIC/luTQwv 4A1uxAvmN/7H1JAizYqL8uR6ybZhcCUfoqjZMSKpGnTr0SdpUXEaIAEyHEhi98+/mX 5kWB+t0z1aVIA== X-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 Fri Oct 1 14:21:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33493 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 B457D27BBE3; Fri, 1 Oct 2021 15:26:54 +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 78C4927BBE1 for ; Fri, 1 Oct 2021 15:26:54 +0100 (BST) Received: from localhost ([::1]:44476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJUz-0002tv-KW for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:26:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43988) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUB-000264-Gv for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45411) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUB-0000SP-9c for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUB-0005g8-6c for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 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: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309831221572 (code B ref 50905); Fri, 01 Oct 2021 14:26:03 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:12 +0000 Received: from localhost ([127.0.0.1]:56903 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTM-0005bm-Ea for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:12 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33342) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ4-0005Tf-Dd for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:50 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMnKp; Fri, 01 Oct 2021 16:21:47 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:08 +0200 Message-Id: <20211001142140.17027-6-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098107; bh=0nUJJabp+zVKDApycT0iSpv9225T9FdSLVDPaaKDKNo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NUCvHZcQjSRoKMoBjEYnxj1YK0A1jAp80EtOFdYV770LQj0768zldoGgg42WOrtxL 8JOQIiw8zSHUYPxjP+s3Q9AtdtfbGeHGEMWIODG4JlfroMSS8m1UK9DDDV8ZQvPYHH XoX/4KDDtgUYt+B/BRIvsJu1WtgsxlD/vk0C6hL3KNHl4zEwvyHK+yxwx9Ld6odv5T 7x+dX+qnp9eiHvcr2/mKHwER32LhkUO0CWdVRQcJdSFtrDMiq049Au2C94Ic0FPJ6l +AxSmJ/Ml3D8zr0sNd7r/jcsd2mDSWnJ9C9b1lUfj3x6PQv2y5ySEO8kgBjw1GODO5 lT7Z8cLqBM8xA== X-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 Fri Oct 1 14:21:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33492 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 2858D27BBE1; Fri, 1 Oct 2021 15:26:44 +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 A8C2427BBE3 for ; Fri, 1 Oct 2021 15:26:43 +0100 (BST) Received: from localhost ([::1]:44372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJUo-0002oA-Dk for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:26:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44020) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUF-0002AS-Vc for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45413) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUC-0000VP-4r for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUC-0005gM-1a for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 07/38] gnu: mozjs: Make the quasiquote unconditional. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309831321587 (code B ref 50905); Fri, 01 Oct 2021 14:26:03 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:13 +0000 Received: from localhost ([127.0.0.1]:56907 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTM-0005c0-SW for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:13 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ4-0005Th-Hi for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:51 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMnKv; Fri, 01 Oct 2021 16:21:47 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:09 +0200 Message-Id: <20211001142140.17027-7-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098107; bh=0/rAoM65eJlMQWUPLBJdJTahIdtfBENf+X7vRhbmmeg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=aX8HiHzLdbYG7xosOS2INskPKrAn78DNN5yV3M6mwTXBJA74WQT0v/aD/isnOYoeo zwypri3cJMZ64i9W3aQd1AG3H8ZePN6SYYANX6+yUGpZ4SO+yaBxMXf5HNsf3XpnC9 pTEYoUloX8fAUOB92hcaqtmd3XxfOjHROKVnqm8i47axg7ZoWTbKlX+sf+e08M4bMo gTYxmRsCQjYorvTLrjfupVHCWF2kpYZyGrpMcKLUHx7cLxIsnLSwkdRyqprxL1i2LH zijdD+tcAho/p3hh1mcYV6wiBE3inTHx1GZBtLzAnk7dibWLL2mrY+hgXD8ubCWEpW CFhqbPc/bCBeA== X-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 Fri Oct 1 14:21:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33487 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 4A88D27BBE3; Fri, 1 Oct 2021 15:26:32 +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 0AE4927BBE1 for ; Fri, 1 Oct 2021 15:26:32 +0100 (BST) Received: from localhost ([::1]:43518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJUd-00027j-2M for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:26:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUC-00026s-1G for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45412) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUB-0000UH-Pc for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUB-0005gF-Js for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 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: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309831221579 (code B ref 50905); Fri, 01 Oct 2021 14:26:03 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:12 +0000 Received: from localhost ([127.0.0.1]:56905 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTM-0005bt-Lm for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:12 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33358) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ4-0005Ti-Ls for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:51 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMnL1; Fri, 01 Oct 2021 16:21:48 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:10 +0200 Message-Id: <20211001142140.17027-8-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098108; bh=CGpXVEGPdOA07TT/1tOmXDHEByyTr0XyOyvkuGoF4BY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EWdeVnE/vifIxCNpdt+mHEFQ1lUgF5NQ1DQ8kOmQGxADz4OdptKIUx9kCjMVsXyuh AmBArB+O5xw8LE36zVa57hV1Ap2FX6C3jpIewQIwmv8FSlrr/IEX1uRH4y1n6bI5ms uayOUxR8X4/W+BAH+DXuqGt10VOzFdW/zUvVgxBDPdcmWqyc0MfG7HKy7TTnsvYCoE l6RhGe3E3egf55CX5iCZhwgls0B7zN/9IQC+5RVUkhGV9rtk6bv5KiQO1DnHDj1fq2 DftHSyFWgy7bvY9o24/BE3nZRf0Lj0bR5ZR9nEDRa1OTXd7q2nU22bcguvOH24gffy cNfcW5yoQR6fA== X-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 Fri Oct 1 14:21:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33495 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 6D25327BBE3; Fri, 1 Oct 2021 15:27:10 +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 41F7827BBE1 for ; Fri, 1 Oct 2021 15:27:10 +0100 (BST) Received: from localhost ([::1]:45122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJVF-0003Mk-9b for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:27:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUF-0002AR-Vw for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45416) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUD-0000WO-BY for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUD-0005gi-8w for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 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: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309831421608 (code B ref 50905); Fri, 01 Oct 2021 14:26:05 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:14 +0000 Received: from localhost ([127.0.0.1]:56913 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTN-0005cM-Qt for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:13 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33366) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ4-0005Tj-PG for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:51 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMoL5; Fri, 01 Oct 2021 16:21:48 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:11 +0200 Message-Id: <20211001142140.17027-9-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098108; bh=Yk+kDz1RDTVDV4bN5aLyyFuYBedaPc7RlhbPuNasVwI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RZz7SeW+dKoPy0A+K3mgE0UMRvko0iCYJQsAjYeUrMHrmIu4llG/uwB7WGJ6BegE9 AdNVANuYxIgWLnkQXU2+409EykK3wDkBdHCialBpB1c2D7dICCHLu5SR+7eh+mBond muL8Rh8TtN+ch6bp7xkVQnlVHfk34jZ72GLfKK6p6Am6k8I/7XMrM8JnylSb6xplYE qfjQXcApF0KwawMbKv5nQwgj1VW2GexVqW2JLU7Wfq4rTe+UW4Eux1j3SRD7QsDEco Qbu8kwyfo8meR2mOpS55xgXamz5s9ziUZ25i5qro/PaM1oMvP+5VxnnCXFI03qpLOr byH9I4UvTvm5Q== X-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 Fri Oct 1 14:21:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33491 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 9914527BBE3; Fri, 1 Oct 2021 15:26: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 5489027BBE1 for ; Fri, 1 Oct 2021 15:26:42 +0100 (BST) Received: from localhost ([::1]:44282 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJUn-0002iq-Ex for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:26:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44012) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUF-0002AM-VT for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45419) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUE-0000WZ-IW for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUE-0005h5-FY for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 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: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309831421630 (code B ref 50905); Fri, 01 Oct 2021 14:26:06 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:14 +0000 Received: from localhost ([127.0.0.1]:56919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTO-0005ci-FP for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:14 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33378) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ4-0005Tk-Tp for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:52 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMoL8; Fri, 01 Oct 2021 16:21:48 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:12 +0200 Message-Id: <20211001142140.17027-10-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098108; bh=UOgLmA0Q2Kcq7Zx/3nOGDBZyxl5ppcEHC40ZKHK3ldI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=VH2CqoYuAfFyCGUYFSM6sYVERsQhAKpcSe4MGS7XHEENTDiBU11HvMwVW2uoDRTuf OwgKcvQWCTW4Wn6NfOVpvkuZCT6kDsROQzohxFe2JIkF+jAT2CvCfXeAqKzgQkqoJF dEzDx5jc4WOc7C327uhymPwKYy7HnmKJILEJen+ZEhNG/GtNYNtNUNh2NdZ0SCZjou TPZrkYamcZmATS6LrCyzWP4kMj88gB/rmRES4wKcfu494utZqaPnzdA69nWhJk4DIz 7BY+TXsWPUYpwI+a00mKhmRsJ9CUq7XXu5bEOd+IgHfSIiGtk+GueHWFjhJ5Dxo+6i nivcDzDYN0yDg== X-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 Fri Oct 1 14:21:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33498 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 17B6427BBE3; Fri, 1 Oct 2021 15:27: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 5F9A427BBE1 for ; Fri, 1 Oct 2021 15:27:13 +0100 (BST) Received: from localhost ([::1]:45374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJVI-0003Wx-Dg for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:27:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44014) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUF-0002AN-VG for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45417) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUD-0000WS-QF for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUD-0005gq-MU for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 11/38] gnu: isc-dhcp: Remove trailing #t. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309831421616 (code B ref 50905); Fri, 01 Oct 2021 14:26:05 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:14 +0000 Received: from localhost ([127.0.0.1]:56915 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTO-0005cT-14 for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:14 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33386) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ5-0005Tl-38 for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:52 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMoLF; Fri, 01 Oct 2021 16:21:48 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:13 +0200 Message-Id: <20211001142140.17027-11-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098108; bh=A9VLAeR+reKgwipy3W/twWU4asR3YGGGZgnXpB4vWDs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dLMJYx5178k65TFbpbXsLfgCiGdv7yHv5fvsLu8JhlWOFSG5d7vrQn2afFkyGsCSv 6tPEvH1+S5TYbYU1Y46BUthzUlW50gXG6xXaA/8pXLT3eW1EDLvFjMIXTxfUPbdp4Q HGXzq4vNuPNwFPdp6Actefn5HQlF7BAiteFDdqHwD/keQTI4Tsesqu9Bs599V6WM0c /LKFvA5zUhr3C6Ufh2hITJcWjFw/2tWWQyKl5/B4I+xy+oAuEbPQTDvIQnmG3Zffef iScCuZKPT3cbAKcuXEe29IsVz987gCLIQTrxkaM7MVmGLKgsZfhdSW0qhy5/knBK3J 7JZwEZC5dCIPQ== X-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 Fri Oct 1 14:21:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33504 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 B93E827BBE3; Fri, 1 Oct 2021 15:28: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 808BF27BBE1 for ; Fri, 1 Oct 2021 15:28:13 +0100 (BST) Received: from localhost ([::1]:47034 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJWG-0004d9-Hj for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:28:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUF-0002AP-VG for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45418) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUE-0000WW-5n for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUE-0005gx-2c for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 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: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309831421623 (code B ref 50905); Fri, 01 Oct 2021 14:26:06 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:14 +0000 Received: from localhost ([127.0.0.1]:56917 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTO-0005cb-7v for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:14 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33394) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ5-0005Tm-7H for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:52 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMoLM; Fri, 01 Oct 2021 16:21:48 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:14 +0200 Message-Id: <20211001142140.17027-12-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098108; bh=eThyqZx1j58+TnVqKMEs4M8T54v78kMtximnREY6a9w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UmzNTIk+QEigj3/YjkoC7GsM7vtHY/tP673XnateJiEp1FbWFpV5G1EjT7iS8+G2i UGhUUOl0v0sJY0se3y6UXRq0VarVCBveZJV0qIfPNtvMuogyIlTdly7lq35Om9zqmQ bCIMajLSiOAZyIUJPQwQl/jmIC73bbG8Z3gu72Cg4osaShdKvnfZFNJP9vAtnK8xoe LIJiD0FbCuOofyuLfBV6ALjhanv3yShbMFGcUn+iX1dNnC/2ks3zqhyKkPSktrxHlI esvXx+klvbCR2vY0PgJdsiFZOexMF0JIzc1PRBMDWgYqMMNQkhwkDdPIJawdabUKGc 6Nh/K9woKzfQQ== X-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 Fri Oct 1 14:21:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33497 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 D445127BBE4; Fri, 1 Oct 2021 15:27: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 5737727BBE3 for ; Fri, 1 Oct 2021 15:27:13 +0100 (BST) Received: from localhost ([::1]:45396 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJVI-0003Xx-F3 for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:27:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44026) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUG-0002AW-1K for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45420) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUF-0000Wd-0e for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUE-0005hC-Tf for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 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: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309831521637 (code B ref 50905); Fri, 01 Oct 2021 14:26:06 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:15 +0000 Received: from localhost ([127.0.0.1]:56921 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTO-0005cp-NV for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:14 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33408) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ5-0005Tn-BR for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:52 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMoLS; Fri, 01 Oct 2021 16:21:48 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:15 +0200 Message-Id: <20211001142140.17027-13-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098108; bh=Hmn536RufB5zH0RqRtgI/COEZzeOJletEsjLLXC9Zjg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=h7t1V/4wC0F3JRxweVsLg70oWHikmeHHIzKQdCeAoeSXenMHV+/y5BW98jeCS0qSn ij/Jrei5OC/P5/wXqcak4bKqj49hT7fjVabm9cKdBENoZ/zjpXUpFvp05VVcxZuKqB QJaphYEw7vGirkXQw87dVcWHBb/sXYi/j9PYtRZfxIblcM8DXqYTPVb9KtZF1jlDra 1v4FbX07pRO3RREMcb0GSRy1DKUGyvMovfKZLV8+udc8kxX02NhPvU+7SxbuLsmjYi a5X0dSZcd95hiuJD4SJNPKhfF883ZvgCXxzri2YlXpYmkL5r+QAgQOqQsS/rK4JF6d rQUfXjV3vZoCA== X-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 Fri Oct 1 14:21:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33501 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 90FF227BBE1; Fri, 1 Oct 2021 15:27:32 +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 D436927BBE3 for ; Fri, 1 Oct 2021 15:27:31 +0100 (BST) Received: from localhost ([::1]:46212 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJVa-00045a-LW for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:27:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44024) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUG-0002AV-0c for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45421) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUF-0000We-DE for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUF-0005hJ-AO for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 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: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309831521645 (code B ref 50905); Fri, 01 Oct 2021 14:26:07 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:15 +0000 Received: from localhost ([127.0.0.1]:56923 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTO-0005cw-Tp for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:15 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33420) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ5-0005To-Fb for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:52 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMoLV; Fri, 01 Oct 2021 16:21:48 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:16 +0200 Message-Id: <20211001142140.17027-14-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098108; bh=AoP7EFEkBqf/10RXlN2FSXxy1mZ9MufxZhlFnexqNAY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EATEkHCF8+9bQr1UfGymKKKs+3R6pT2Y8SM2iXC/BWE8Xzn8Dd2MtCi2NqyaUOge8 pcB6Sxn4JzxSXzeK3JAzcxDQ5VLDaBfDIctBWU9XIjsLtkmrqiG/YxQf3sbGsdKNcY DiGCn/j3RzhxeX9r02xP4s8lhZ+wl8HXNGuq7Vp3zaFQBeU1IPJ/cAaZBnR/heoHOu bBvh1kHtrBEfJdRAdCHXDWy7Wt/PP+pYL/MtROCzzyZYkjbVSCoV3CWYfqDHeA08b5 z1VxisLW23lmvdy9/VCVvG+RJz64twxOLlDcNWstCIk36JDcyyLTSeo3XKmEuXhoRF qajh2ui+G96mA== X-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 Fri Oct 1 14:21:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33508 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 F3A3427BBE3; Fri, 1 Oct 2021 15:28:39 +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 BC88627BBE1 for ; Fri, 1 Oct 2021 15:28:39 +0100 (BST) Received: from localhost ([::1]:47708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJWg-00058z-SN for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:28:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44052) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUJ-0002Ah-To for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45422) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUF-0000X0-Rv for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUF-0005hS-Nb for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 15/38] gnu: libthai: Make 'datrie' input unconditional. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309831521652 (code B ref 50905); Fri, 01 Oct 2021 14:26:07 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:15 +0000 Received: from localhost ([127.0.0.1]:56925 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTP-0005d4-6g for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:15 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ5-0005Tq-K1 for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:52 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMoLZ; Fri, 01 Oct 2021 16:21:48 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:17 +0200 Message-Id: <20211001142140.17027-15-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098108; bh=q8lxOUm0nF2OShhS6pl5Fb76fruHGy2Ng/U1snK2Dg4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=lf1ZgNFZEGEc+E0r0WVqiy50QwvkRumRgaAdBfq5k1aIq644HOtBK6L3oiMEw+v4W fG37fq092AvZYoiH1c/bj89llRHUrYm3Rgqv0BGQ4H45P6ZMJurZVA1sgdk7TBzs91 oTjbESQa2JGx0sM55Zz7vYCiYTGdr1jfC5+lc40/QO5L0dTMSgiEBg901UnG3hbXyI q5embvV/X/Zi61QrPzA8byJGAycF7CeYXqU4B8Y80fmZJ3bbEK+zX5C0aB55OBnKv4 8ySwKi3N2n7tky59SmRWExrZC3g2UxpmbVT9T0GhBLfekv+m8savHApBMNyVCoJngH xfw2a9/PZJVpA== X-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 Fri Oct 1 14:21:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 33496 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 A89BB27BBE4; Fri, 1 Oct 2021 15:27: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 7910F27BBE1 for ; Fri, 1 Oct 2021 15:27:11 +0100 (BST) Received: from localhost ([::1]:45216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJVG-0003QS-Gh for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:27:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44056) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUK-0002Aj-05 for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45423) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUG-0000XV-7a for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUG-0005hZ-4O for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 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: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309831521659 (code B ref 50905); Fri, 01 Oct 2021 14:26:08 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:15 +0000 Received: from localhost ([127.0.0.1]:56927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTP-0005dB-DM for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:15 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33454) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ5-0005Tr-Ot for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:53 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMpLe; Fri, 01 Oct 2021 16:21:49 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:18 +0200 Message-Id: <20211001142140.17027-16-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098109; bh=4yd+s7qOzNY4jvD+JkiKndZ53enYGgJXb94YjUZ+wW4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=lpjZeSgrzy8mxFXpUUfxDa2mYJBq+wothgDqKDqSsD/Ii+xKZmdFj0Mdge/dikbyS nMOxz6JhRUjlZ99aYS0v4CRM7eklNHFxVRJnkmd6IEhBiYooTgCEFCYE8rNF41qiLL Pjb2MXGv2Tt0zlN2vPivRRCxO+F8EavePnTSeWIrF1XSLOVmFZJs2mW3Do04m0AFfB Dfsnz5fXAwBOvLtNW69dOMYfpJTC8hsOT19VQfICkBRo2/cXh15SYkYXHWd2rPl2YJ +cRIilcuaHic2rf+flw7Eddm2jW0FSgLt5UpNRyYezu+k528CI4wF/sKy/HH3brqzu 208vThPSOViuw== X-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 Fri Oct 1 14:21:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33513 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 722D327BBE3; Fri, 1 Oct 2021 15:28: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 466C427BBE1 for ; Fri, 1 Oct 2021 15:28:55 +0100 (BST) Received: from localhost ([::1]:48570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJWw-0005k7-Bp for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:28:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUK-0002An-00 for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45424) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUG-0000Yq-Jv for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUG-0005hg-Gq for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 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: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309831521666 (code B ref 50905); Fri, 01 Oct 2021 14:26:08 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:15 +0000 Received: from localhost ([127.0.0.1]:56929 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTP-0005dI-KF for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:15 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33462) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ5-0005Ts-T8 for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:53 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMpLi; Fri, 01 Oct 2021 16:21:49 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:19 +0200 Message-Id: <20211001142140.17027-17-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098109; bh=ktj1JZaoYTMgLPKJZdv9+qmGldFJnKHeW0LaxpqkFAk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=nhEaef1I3SiSAR+Uqr4NY/Q5U9keIY14D9LvP3wYlWEnJE1i5LX25bvSx9qrEQl+B dSCMuRIJ/5HOq/rcBh4ZQ0uHovbzBDm9dtxDcanePY8rJlxK4ID7x+08pqWHaG+mbo rAW49tsA4EONXewJu6oB343NBv1LjxTJF3pZeIY64hSR+qzBDZX9Pxcau8loyy0YoH JjR5VqVfWfQxIFefVvaRsqSLkNOEUhkCziLGDoL45AhHdCLvge8xOZ0SQrVCiJ9S1F zcCz4PbGVJqxPxxfjiuQKFl6qKtlDRCnwTZ2po6WKx5GEIfNi1R4e7i1/w38THGMn2 GAj+deuji4GvA== X-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 Fri Oct 1 14:21:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33516 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 4CC9827BBE1; Fri, 1 Oct 2021 15:29:05 +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 96D7827BBE3 for ; Fri, 1 Oct 2021 15:29:04 +0100 (BST) Received: from localhost ([::1]:49446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJX5-0006JU-HO for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:29:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUK-0002Ao-0J for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45426) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUH-0000ZT-Dh for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUH-0005hv-Ah for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 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: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309831621681 (code B ref 50905); Fri, 01 Oct 2021 14:26:09 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:16 +0000 Received: from localhost ([127.0.0.1]:56933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTQ-0005dW-0c for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:16 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ6-0005Tt-0L for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:53 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMpLl; Fri, 01 Oct 2021 16:21:49 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:20 +0200 Message-Id: <20211001142140.17027-18-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098109; bh=F2lxH8w2Q2islWBG4l7ocoP+OtDE0r33U+tqgDhoqvk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UMW+88zo9NAoaNlclAlMUmKdVPG+4c2emyuiGJkGMP09DRpWzNXeVXmM3y3DSKKga /F5ilVg3PXjj2NxN1koDtDX8ovxkoFRYwh0Yzq68jMMhbsO9gYw2rPrUSue6otmCO4 6bGBhJE7xEoGEM+PaiDPoqPhOVixS8uvZqC1kSUogn1XXkdU4a5TJ8D+sI2vbCKZwR IYqNu/6f8ufsSbgr1xJ71mLRxQLxBjkJSzzdNofpaLwox6GxdGFsm/uLStQrO0ggiq QWd2Jp3BOHvuCUC/a++EslazRosXnpL8cmxAT2r/WlRJRs4km8VkQMs8Y9Kl/WywzI p/RFFT5OcBAxw== X-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 Fri Oct 1 14:21:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33499 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 9AE1E27BBE3; Fri, 1 Oct 2021 15:27: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 5FEE227BBE1 for ; Fri, 1 Oct 2021 15:27:27 +0100 (BST) Received: from localhost ([::1]:45952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJVW-0003uj-2O for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:27:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44070) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUK-0002Ap-1F for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45425) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUH-0000ZC-0M for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUG-0005ho-TY for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 19/38] gnu: gdk-pixbuf: Respect #:tests?. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309831621673 (code B ref 50905); Fri, 01 Oct 2021 14:26:08 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:16 +0000 Received: from localhost ([127.0.0.1]:56931 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTP-0005dP-QQ for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:15 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33484) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ6-0005Tu-5A for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:53 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMpLo; Fri, 01 Oct 2021 16:21:49 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:21 +0200 Message-Id: <20211001142140.17027-19-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098109; bh=ezOEB3mOxWogaCDVd/yx9NcbSH9Peuf6TXHbjRp9krQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=un5JKgmRNxImHmZsMmxjy9FAZHvNtZkc4NFx5XQJuy3Je+MheAubBFigEm/liRj2W SWQFlvn0GwdHFhDJOKxyTd7k9TceY7fjF4rx6vnPQBVO5DJuR9BATGEWsXIAGawWAi 5t/TnY1vDbECrJ3rZdniEMfh0+dabvyFtPlcAycSTwxVyZfOreKineM8Upw4d6RvFw SqGBXtd7+wj54yvWtGZPzWoXZfqtmleXxQQVC80mhbxXaT0VXMQmVamnbbua/V95H6 eaeBHnebfJKRUcIEvj0A55lQmjvnTkW66dqhmQ72PoZ5M0UEnjAZffyWlzptGJJkEf M2hCBzu73EFiw== X-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 Fri Oct 1 14:21:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33509 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 D073627BBE1; Fri, 1 Oct 2021 15:28: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 182B627BBE4 for ; Fri, 1 Oct 2021 15:28:40 +0100 (BST) Received: from localhost ([::1]:47770 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJWh-0005Ay-6e for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:28:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44062) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUK-0002Al-03 for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45427) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUH-0000Zl-Qc for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUH-0005i2-NT for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 20/38] gnu: gdk-pixbuf: Use target predicates. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309831621688 (code B ref 50905); Fri, 01 Oct 2021 14:26:09 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:16 +0000 Received: from localhost ([127.0.0.1]:56935 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTQ-0005de-AN for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:16 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33492) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ6-0005Tv-9Q for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:53 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMpLr; Fri, 01 Oct 2021 16:21:49 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:22 +0200 Message-Id: <20211001142140.17027-20-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098109; bh=bahdBuGrJkWxiJ6oxwD00WLPRJyU7JZkJUZeihA96uQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=uwaUrVueExHJeu0v4WaKQDVCynR+FK1DxrkwuQuDLx+6+DFRhZd0NMVlEhPrFFhWQ cdedSRh1leRNTaNA5/ZUMvN90Ax3iNOxKH5zu3TM+U0QxRIYiIGpc/Hl4yg56NdcFR EyfAduMdnfj691WIP+DO7WVRFoVOLowCvt/nHR7zo6xcZBRXgWhcmHHl5M84uhEOF5 7u4qgdjXAuO8WPPJyMqVdo7XP20Qrgvq68a1F2WsGwrz2vfo2b58BUHQ1t0fNA5HWs oTxRpcG2fzTrlc/JrDSEOSaUg6cgodvdaqWgvcOYty9A5lWdRgPOPs7Oz31YiQjGUJ /rLSXjTstv7aA== X-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 Fri Oct 1 14:21:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33519 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 AF2FB27BBE3; Fri, 1 Oct 2021 15:30: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 8195027BBE1 for ; Fri, 1 Oct 2021 15:30:11 +0100 (BST) Received: from localhost ([::1]:52492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJYA-0008N5-K5 for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:30:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJW7-0004zA-40 for guix-patches@gnu.org; Fri, 01 Oct 2021 10:28:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45467) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJW6-0002Nl-SS for guix-patches@gnu.org; Fri, 01 Oct 2021 10:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJW6-0005nI-PX for guix-patches@gnu.org; Fri, 01 Oct 2021 10:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 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: Fri, 01 Oct 2021 14:28: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309845722206 (code B ref 50905); Fri, 01 Oct 2021 14:28:02 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:27:37 +0000 Received: from localhost ([127.0.0.1]:57004 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJVh-0005lv-JD for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:27:37 -0400 Received: from leibniz.telenet-ops.be ([195.130.137.77]:47544) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJVf-0005lP-JL for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:27:36 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by leibniz.telenet-ops.be (Postfix) with ESMTPS id 4HLXNs5kKYzMqhGT for <50905@debbugs.gnu.org>; Fri, 1 Oct 2021 16:21:49 +0200 (CEST) Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMpLu; Fri, 01 Oct 2021 16:21:49 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:23 +0200 Message-Id: <20211001142140.17027-21-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098109; bh=eqaU5MEUL+3CrzJYaZsrAg+J8Evf9NbzkISRjVxgenc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fhLl575i/wcFHdZcAB4E7a5E1xm95/yLZqbDlNJof4CqhJrdkwvtSEbER0jZC312M ezQN1wC32oRbzH3EZ0BG+iLLQrpO25AYSQwEom0k+/teJr0dmIy+8hjbl3hNPQa/AM bxg0cHDRtq5sxa/S1M8waXpzbckIJeS1eqtsW4gIcgE2E2lZiwZFSDhsjF7LR1swlK qNV1VpmuBIFWil3car6O6H/5U0fA9eZUmNX8ywHCPMstNRhOymgunMPTxjaxR3EVW0 994wKmJQc6PKjTaSPf3IXZ1xEy6nqNJR4soD8T8dC5ylN4J14BWV/KKlew5M8V3giQ YKouL6IlkJHag== X-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 Fri Oct 1 14:21:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33520 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 C952A27BBE3; Fri, 1 Oct 2021 15:30: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 8FB2427BBE1 for ; Fri, 1 Oct 2021 15:30:24 +0100 (BST) Received: from localhost ([::1]:52882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJYN-0000CN-Ce for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:30:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44940) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJW9-0004zT-7n for guix-patches@gnu.org; Fri, 01 Oct 2021 10:28:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45470) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJW8-0002Pu-7R for guix-patches@gnu.org; Fri, 01 Oct 2021 10:28:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJW8-0005ng-47 for guix-patches@gnu.org; Fri, 01 Oct 2021 10:28:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 22/38] gnu: gdk-pixbuf: Remove trailing #t. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Oct 2021 14:28: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309846322232 (code B ref 50905); Fri, 01 Oct 2021 14:28:04 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:27:43 +0000 Received: from localhost ([127.0.0.1]:57010 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJVn-0005mR-EF for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:27:43 -0400 Received: from leibniz.telenet-ops.be ([195.130.137.77]:47546) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJVf-0005lQ-JR for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:27:37 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by leibniz.telenet-ops.be (Postfix) with ESMTPS id 4HLXNs6fspzMqhHR for <50905@debbugs.gnu.org>; Fri, 1 Oct 2021 16:21:49 +0200 (CEST) Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMpM0; Fri, 01 Oct 2021 16:21:49 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:24 +0200 Message-Id: <20211001142140.17027-22-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098109; bh=9p9EtODfdsYaAYzctsNrasoK0EEY0Y58lAHN6fF6ANQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tyB0XfJDcTb8e6wi7G0DP7gMpZ9aVoTO0JfsxtAkAMU1Di4d8oGbwiXLZfNpJNEzT X1v5YHo5Hz+TyxKrIjvEqXp/o3OUgA3JC6QWe7wdthSsDkU2b1qQ9MgTu5Cl0GBY9b Cr7yopBkGZqbF+lZOyC9timfPgrG3OCWpR4FftyZ9SBLYLReO2Jbf9u/kGDlPzP7S6 kmKAQ+LQx6f+x0XpUXRaaRaHt5WKJQxqSRGzEGTOuSE3B4mYK41rqcex8vElRhJBlB GBjVKdODROi/p7PofY5mbFqcMVL7IRTA9H7RI9BkU5k/jOcf/Flmr2G4S6wzQ/P1oK tQoHACnnLz/Ow== X-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 Fri Oct 1 14:21:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33512 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 3534427BBE1; Fri, 1 Oct 2021 15:28:54 +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 BEEC327BBE3 for ; Fri, 1 Oct 2021 15:28:53 +0100 (BST) Received: from localhost ([::1]:48536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJWu-0005iw-RD for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:28:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44054) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUJ-0002Ai-Tj for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45428) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUI-0000Zn-7b for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUI-0005iA-4O for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 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: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309831621695 (code B ref 50905); Fri, 01 Oct 2021 14:26:10 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:16 +0000 Received: from localhost ([127.0.0.1]:56937 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTQ-0005dl-Gr for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:16 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33302) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ6-0005Tb-9k for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:53 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMpM6; Fri, 01 Oct 2021 16:21:50 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:25 +0200 Message-Id: <20211001142140.17027-23-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098110; bh=lFr77h45AV8XOGO9Vabr7KSuMtKAqd7YAhbFyPGf/BY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RzpBtCDsANg5VktBM8aGAr4hQzLa4fVQ7VTWEVVIwhchAljMdC4vlKHcmbgfhHDFq LRnQD4fRlZTO4ufBPXHCCVJefMCXh/z4A8fKuedW6InIZrgNNyvAVuv8Fah78EDKgi D7I+ka5et825VTn2+GzXrHwFR2WNPtp7QD9XitDGW2ubq4ZdTZCeYLQnhzTLfS0vz0 lxZUyiDNaE8QX9B7noKCe3q5h9u5U3II3EabEhye2yUo4rVFi2jRE3Zy6NLIu4KdM/ Tm9CbD7y0YFlAMHqONp7kh1Y01jJndoZhSEWjV9+AFa+O0rtRNKAxqU1NYpEGWlciL CoS+7YAkcnxaQ== X-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 Fri Oct 1 14:21:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33517 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 240AA27BBE3; Fri, 1 Oct 2021 15:29:10 +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 E982827BBE1 for ; Fri, 1 Oct 2021 15:29:09 +0100 (BST) Received: from localhost ([::1]:49882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJXB-0006bF-1U for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:29:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJW9-0004zS-6j for guix-patches@gnu.org; Fri, 01 Oct 2021 10:28:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45469) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJW7-0002Ps-Qc for guix-patches@gnu.org; Fri, 01 Oct 2021 10:28:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJW7-0005nX-Nh for guix-patches@gnu.org; Fri, 01 Oct 2021 10:28:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 24/38] gnu: at-spi2-core: Respect #:tests?. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Oct 2021 14:28: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309846322226 (code B ref 50905); Fri, 01 Oct 2021 14:28:03 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:27:43 +0000 Received: from localhost ([127.0.0.1]:57008 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJVn-0005mP-5K for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:27:43 -0400 Received: from leibniz.telenet-ops.be ([195.130.137.77]:47840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJVf-0005lU-TS for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:27:37 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by leibniz.telenet-ops.be (Postfix) with ESMTPS id 4HLXNt1M6RzMqhGw for <50905@debbugs.gnu.org>; Fri, 1 Oct 2021 16:21:50 +0200 (CEST) Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMqME; Fri, 01 Oct 2021 16:21:50 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:26 +0200 Message-Id: <20211001142140.17027-24-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098110; bh=A6rnq+a0re+OfjLRoJUFtSXcubJL0JXDXPQUHbxTqaM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=C9IqxDBtbVCOc5JnYnr0Zbf1SIo8ILWxJNk4NRHUE0CYkDIhTRGqpxBkD1HV/jLhD murWVUcNGX7lunKJgtBGZBcn2KFosipvQcXSklw1OimuuCvSLV+OCDSiJ298XXYu7a dcf3ZR2zJpJfrGYRwDqSTA+GSr7/zv9IPYiukC+Z46RDWgwTOU5O8RI+Evyn0rT6Ix amAM6Y+nhmo19U0gXhxU2somiq9BNkCU9qIU0cd5TDOwPsY4+TEfeyoJ52K2l0ERqW C6GZcInb0D41Gh0p/g2rjpX6pt3s5VI/pPvahsGQbVUGQBRN/8qyhSRTi+u3H0kgfZ HZgiJcZCMKJ2g== X-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 Fri Oct 1 14:21:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33515 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 B845327BBE3; Fri, 1 Oct 2021 15:29:02 +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 7F48C27BBE1 for ; Fri, 1 Oct 2021 15:29:02 +0100 (BST) Received: from localhost ([::1]:49306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJX3-0006DL-K1 for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:29:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUJ-0002Am-Vv for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45429) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUI-0000Zq-Lz for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUI-0005iH-IB for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 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: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309831721702 (code B ref 50905); Fri, 01 Oct 2021 14:26:10 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:17 +0000 Received: from localhost ([127.0.0.1]:56939 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTQ-0005ds-O6 for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:16 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33316) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ6-0005Td-I6 for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:54 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMqMH; Fri, 01 Oct 2021 16:21:50 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:27 +0200 Message-Id: <20211001142140.17027-25-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098110; bh=A/vKhXVf1Ixg8MY6muVmQzAsOO348cwUUuDUpPpNf1Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=e6JCYD1sQ/eSMVmzxoZohTjbArDj5PsKSsfJW8l6ZmYWXh0IiJ4TwX+dVPA2rLdEj ZZ90ZHqlbtIl4+/D4gQYNVORmxNK+7nkq+MYg6lPb2qAvSl6FVUXm7XuSqRmdQVVp2 /mNlqzaBtkd1zO6AgruOjMXyPnFFtoSbBZhm+VeFWARGi+Q8VCbo3eddMbx6MsnwEd OUWRK83a4+1K3MIe+szUI83ZZBCxngYiqrZAqt/QYaJlCVfXiP6OqDg4lg95MTMNcj L6ddt2CAQB8WKaRgJuWEOXhvHKkwKsE2Cajg1Qp5u/PL+jsRZ6EnCcmNE4EEgwtIvC dCNN97BBk9htw== X-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 Fri Oct 1 14:21:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33524 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 97D1F27BBE3; Fri, 1 Oct 2021 15:34: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 5A4FA27BBE1 for ; Fri, 1 Oct 2021 15:34:20 +0100 (BST) Received: from localhost ([::1]:57846 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJcB-00044v-Ek for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:34:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46360) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJZy-0001jj-Uh for guix-patches@gnu.org; Fri, 01 Oct 2021 10:32:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45498) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJZy-00061W-M9 for guix-patches@gnu.org; Fri, 01 Oct 2021 10:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJZy-0005vt-D4 for guix-patches@gnu.org; Fri, 01 Oct 2021 10:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 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: Fri, 01 Oct 2021 14:32: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309869622753 (code B ref 50905); Fri, 01 Oct 2021 14:32:02 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:31:36 +0000 Received: from localhost ([127.0.0.1]:57038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJZX-0005ut-VU for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:31:36 -0400 Received: from newton.telenet-ops.be ([195.130.132.45]:38854) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJZW-0005uQ-GO for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:31:35 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by newton.telenet-ops.be (Postfix) with ESMTPS id 4HLXNt3GSjzMql7f for <50905@debbugs.gnu.org>; Fri, 1 Oct 2021 16:21:50 +0200 (CEST) Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMqML; Fri, 01 Oct 2021 16:21:50 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:28 +0200 Message-Id: <20211001142140.17027-26-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098110; bh=uUPMAiwwDtFSAIo0y7cm/dPux3B/PijjMbez9VInIaM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=uYGldWhTgHpqRFFv/+Y2X4x9tgirMjeS5CZHtI584u9NiOZ/A7bal/DgGiLsVX5hg 8S9rHZ1UaO0Sucob6AT4xe2JtKx/ajeyxKUJW2iixTnQB+ftVJP2Hc4CKKxrikHkCA iSybNLScDvp86FqOqPo6da1RlWizTT/ZIQhNwntMKXYqS8OtAPVWgGi0rOiUwdm13l Kc2Re+jVe3/LsJrj0e9H0OwtjSBy0rukidNt3zHuFjJwBCehtZRxfe5bf8ODx7/7BR vulYaEivuzn7yGHK55s4zCbq5ijg1bfysOuGTidAZ3BcfhAnb1cYvzjVDRno3VQdxb 86dwcfMZhLC5A== X-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 Fri Oct 1 14:21:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33507 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 28EF027BBE3; Fri, 1 Oct 2021 15:28: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 F22F527BBE1 for ; Fri, 1 Oct 2021 15:28:26 +0100 (BST) Received: from localhost ([::1]:47528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJWT-00050D-Vj for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:28:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44930) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJW6-0004yB-LX for guix-patches@gnu.org; Fri, 01 Oct 2021 10:28:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45466) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJW6-0002N2-Da for guix-patches@gnu.org; Fri, 01 Oct 2021 10:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJW6-0005nB-9V for guix-patches@gnu.org; Fri, 01 Oct 2021 10:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 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: Fri, 01 Oct 2021 14:28: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309845722194 (code B ref 50905); Fri, 01 Oct 2021 14:28:02 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:27:37 +0000 Received: from localhost ([127.0.0.1]:57002 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJVh-0005li-6P for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:27:37 -0400 Received: from leibniz.telenet-ops.be ([195.130.137.77]:47686) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJVf-0005lS-JJ for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:27:36 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by leibniz.telenet-ops.be (Postfix) with ESMTPS id 4HLXNt48vLzMqhHW for <50905@debbugs.gnu.org>; Fri, 1 Oct 2021 16:21:50 +0200 (CEST) Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMqMS; Fri, 01 Oct 2021 16:21:50 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:29 +0200 Message-Id: <20211001142140.17027-27-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098110; bh=4z53cwgt0+rqfiFPlApNnz24oZuES5mst2PwRQiKIxQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=b0LGSMM9jApNiqDMXNUDS+MdJu4Q8/F/8AZKYnLraJ4Xfn6q+FF2L7BpNNeCs/ujg Jen9KfMF4Ezu6W0RVygPvXj+dtSenTSCD8kBhM/UYAxgyJjLNML88g4scaYaFjsU7v pFzJ1xaOpbqk/AK3ZzJdxNoclMgHSzTzt8TyKlZajwHTinp+7vUunWbe1FePwO/VMo es89JGGs5kSFxYozymF0VrD5nGPpFYp0TAsH9P9wUHJcTwZyYhsyfX8AR+6nf3Zpm7 moE268XRziRECbhmQEs3AhL62kQx6ytrIPgdSfsoXXfSMKZT4ejFMQ/jEtnyPV5rwz UYxC4sNJ6thYQ== X-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 Fri Oct 1 14:21:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33505 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 B280127BBE4; Fri, 1 Oct 2021 15:28:15 +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 6C4F227BBE1 for ; Fri, 1 Oct 2021 15:28:15 +0100 (BST) Received: from localhost ([::1]:47074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJWI-0004gI-Fc for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:28:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44074) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUK-0002Aq-2f for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45430) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUJ-0000a1-2I for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUI-0005iP-Vi for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 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: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309831721709 (code B ref 50905); Fri, 01 Oct 2021 14:26:10 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:17 +0000 Received: from localhost ([127.0.0.1]:56941 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTQ-0005dz-Vi for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:17 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33342) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ6-0005Tf-VZ for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:54 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMqMV; Fri, 01 Oct 2021 16:21:50 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:30 +0200 Message-Id: <20211001142140.17027-28-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098110; bh=BnOMBYoP+/dZYJVHLmM8tNuSfhnP2UiBb/JMajdkVAw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=rtc2iZ04bQcwyqtdk2cESFz5IRwE1FZYzkG0az2jRJC8bmC9Saapx+PNvore3nhUN cVZ1mxUaklJy7FsYtQQVeCEgFodD7SAhSSR1WFOi54YbC+dSl4kQ9Evn5rOgUA84jb gmDH13DAMry9ktME0daSE7LZW64p78us8ZwB8Fy47UUCVl9VqvXTSLBh7J3O/SFdGn DbWOreq23zvvevHgP2Ao5mTgtYRiBU7eIwhEcFiUFd/8nPAbZyXTm1nhVzsSoaloEj RhaX/BRw5HIvVe/nGgMguDW0ZRTwbPnzgS0+fVWvb4TsWwNNm0tls3Q7m/QFRtq2kZ hnmZ1/XL5+0iw== X-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 Fri Oct 1 14:21:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33511 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 EDE4F27BBE4; Fri, 1 Oct 2021 15:28: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 9C61E27BBE1 for ; Fri, 1 Oct 2021 15:28:53 +0100 (BST) Received: from localhost ([::1]:48362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJWu-0005bi-L7 for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:28:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44934) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJW7-0004zC-JB for guix-patches@gnu.org; Fri, 01 Oct 2021 10:28:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45468) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJW7-0002Oi-Bh for guix-patches@gnu.org; Fri, 01 Oct 2021 10:28:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJW7-0005nQ-8e for guix-patches@gnu.org; Fri, 01 Oct 2021 10:28:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 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: Fri, 01 Oct 2021 14:28: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309846122216 (code B ref 50905); Fri, 01 Oct 2021 14:28:03 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:27:41 +0000 Received: from localhost ([127.0.0.1]:57006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJVk-0005mF-Re for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:27:41 -0400 Received: from leibniz.telenet-ops.be ([195.130.137.77]:47630) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJVf-0005lR-JT for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:27:37 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by leibniz.telenet-ops.be (Postfix) with ESMTPS id 4HLXNt69YmzMqhGm for <50905@debbugs.gnu.org>; Fri, 1 Oct 2021 16:21:50 +0200 (CEST) Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMqMb; Fri, 01 Oct 2021 16:21:50 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:31 +0200 Message-Id: <20211001142140.17027-29-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098110; bh=9bXXNf5sim3mWFDknGYsD4UkcW172PltQqj2lChp1sg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=qes/Z0MO2FxWYjAb1tJrAjKwwjlzefmhUGpAPbvg0h96fYBAxYtoa+gLxG/72Dm0f rjpmV9895q2aErzWaQqJ7ny49Slso4Wfim0edRrtRXiK9feSRq4admSoG7GCVWuG5P LUHwLLXi0pmy3e7e+r1deWl7V81m8aEwmZzpdvOH//in2ndrfLDDGMFCQLN9QyWmW0 UmDr2Oy/X5mb0ND079FdiJe48zt8QnPaTm38l0Y4+jxpYCFu9B56ARehfCHAmpvgpy O29MmM/2yP52kIQYeiyLkWwE5HkhVBtUEzJEKYnCH8lJTgYePLw9kIx6hoUk2jIFzw v0tDT8SVlxrIA== X-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 Fri Oct 1 14:21:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33521 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 8802227BBE3; Fri, 1 Oct 2021 15:32: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 543B727BBE1 for ; Fri, 1 Oct 2021 15:32:16 +0100 (BST) Received: from localhost ([::1]:54882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJaB-0001mC-EW for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:32:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46370) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJa0-0001l6-0w for guix-patches@gnu.org; Fri, 01 Oct 2021 10:32:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45501) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJZz-000640-OV for guix-patches@gnu.org; Fri, 01 Oct 2021 10:32:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJZz-0005wH-Lx for guix-patches@gnu.org; Fri, 01 Oct 2021 10:32:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 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: Fri, 01 Oct 2021 14:32: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309869922775 (code B ref 50905); Fri, 01 Oct 2021 14:32:03 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:31:39 +0000 Received: from localhost ([127.0.0.1]:57044 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJZa-0005vC-T6 for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:31:39 -0400 Received: from newton.telenet-ops.be ([195.130.132.45]:39112) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJZW-0005uU-Nr for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:31:35 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by newton.telenet-ops.be (Postfix) with ESMTPS id 4HLXNv05g3zMqkG2 for <50905@debbugs.gnu.org>; Fri, 1 Oct 2021 16:21:51 +0200 (CEST) Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMqMe; Fri, 01 Oct 2021 16:21:50 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:32 +0200 Message-Id: <20211001142140.17027-30-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098111; bh=bW0Vj0kgmMa3iTcQKOmwUtI5MJrCmDnhfcB3/zQzyWU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=T6OFIN45GZv0Yvq/d00fXnK3nJH7EilKK5lBxsRfFEtRmX2kLbShP1p2pN+gGuFjr g32nXUoYqnkvI+iIiN3vCt6bLh77Yo2L46GcuuzcaXONwxgyuyKK9f8vi0gS+/h4Cg mKePHXwPWnpO641qJ9mckD1QgF5VzY2o92pRZQ9P5TbvAM8hQRriRdnmQOvz3BG2cA WN+n9SoW1tChbNCWX+yI1caDIeH6mAbdtM8AnpiA5AfyVEdAk3JSyCscP/1/BU+XNH Zm4r+TNXygaUPEMp/Uq+1ohjUsFM2e7G8WWgIjoVPTKfHXn8oYseUZEv55p6ijl/Ug rX4lndB4SXxUw== X-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 Fri Oct 1 14:21:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33503 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 F38D827BBE3; Fri, 1 Oct 2021 15:27:54 +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 B9A5D27BBE1 for ; Fri, 1 Oct 2021 15:27:54 +0100 (BST) Received: from localhost ([::1]:46788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJVx-0004UB-Qc for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:27:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44076) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUK-0002Ar-5O for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45432) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUJ-0000cO-TF for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUJ-0005id-P0 for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 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: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309832121730 (code B ref 50905); Fri, 01 Oct 2021 14:26:11 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:21 +0000 Received: from localhost ([127.0.0.1]:56945 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTU-0005eK-VP for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:21 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33358) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ7-0005Ti-D2 for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:54 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMrMj; Fri, 01 Oct 2021 16:21:51 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:33 +0200 Message-Id: <20211001142140.17027-31-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098111; bh=RriO5a8YOCmfeZKTUQhZ+SktKBPPQdjUsMMdvni4RAA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KH++Vultam/UrLFMIIGR7rH6xo6/Q0CXTdJuorHE7r+sBe8oR6MiHOhDHG6KguqLu xSdVUwAPEgtVxfr8f8TkkvYd7ZorLbLIyd5GRFumzWbEAgu+CPT5XBrK8SsrtabNki RRS9FXp6Mht6VDrQKmI9nqoC1qharbALVIZdf+4QpFdTBqEEyyhM/zvCFlLD4M5eq9 Np9gmuPuLc/VCY5arLnQtUDsgZAzJbGkSUrI1fwYO10i2DNGmxFL8+IBmTpQbi3Tnl MJGExaQc3NsUJMIaJlPLzYeLbG0kxrWltCk+8fAJRSHDRaVGtsVxvZrWWkMFJno1JI 3gxXOi8dtJLvg== X-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 Fri Oct 1 14:21:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33523 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 646A927BBE3; Fri, 1 Oct 2021 15:32:18 +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 352EE27BBE1 for ; Fri, 1 Oct 2021 15:32:18 +0100 (BST) Received: from localhost ([::1]:54990 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJaD-0001qA-64 for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:32:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46362) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJZz-0001jr-7c for guix-patches@gnu.org; Fri, 01 Oct 2021 10:32:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45499) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJZy-00061u-W2 for guix-patches@gnu.org; Fri, 01 Oct 2021 10:32:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJZy-0005w3-RK for guix-patches@gnu.org; Fri, 01 Oct 2021 10:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 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: Fri, 01 Oct 2021 14:32: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309869622759 (code B ref 50905); Fri, 01 Oct 2021 14:32:02 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:31:36 +0000 Received: from localhost ([127.0.0.1]:57040 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJZY-0005ux-AG for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:31:36 -0400 Received: from newton.telenet-ops.be ([195.130.132.45]:38858) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJZW-0005uS-GQ for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:31:35 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by newton.telenet-ops.be (Postfix) with ESMTPS id 4HLXNv1zvkzMqkLf for <50905@debbugs.gnu.org>; Fri, 1 Oct 2021 16:21:51 +0200 (CEST) Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMrMo; Fri, 01 Oct 2021 16:21:51 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:34 +0200 Message-Id: <20211001142140.17027-32-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098111; bh=Stbf5m9+hWyHtGLI3hQkXNQ/MbTmV1dVYAw2rhyI4Fc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Z7ahzScb5I8oedmWevS3IR22JfLXZ6asEg6xLEmgy85DsZ6bWUBDRNkDpbxd98y2G qQ8hkBNaJAwoG1Hv4FQupusWwuWamNcTDB5MVAD7gka4GePXVKremyHODjSdg13V15 SdSPw1lTRzSQ27O39RXJDwQpLyHT0sDeW84OQt1rMyDYGYbSIwY0ezfD21JETaQD5h f55Vw4hGMAtUsxcuUXK46/96peMuvgTkmgDRddRLm7xQMpCSp2JDOx4ncok+x6ZOcW +1GKywseArOK1Oyxj8eCtEB+Snib525vKBzQRLbW/omRxzpmtrOAKqcduyk3q2T4DS JOxwkC+wLKO7Q== X-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 Fri Oct 1 14:21:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33500 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 AD72D27BBE3; Fri, 1 Oct 2021 15:27:28 +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 630F927BBE1 for ; Fri, 1 Oct 2021 15:27:28 +0100 (BST) Received: from localhost ([::1]:46032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJVX-0003xy-Hh for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:27:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUL-0002Bt-Bz for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45433) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUK-0000cw-7Q for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUK-0005il-51 for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 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: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309832121737 (code B ref 50905); Fri, 01 Oct 2021 14:26:12 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:21 +0000 Received: from localhost ([127.0.0.1]:56947 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTV-0005eR-B6 for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:21 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ7-0005Th-Ko for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:55 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMrMr; Fri, 01 Oct 2021 16:21:51 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:35 +0200 Message-Id: <20211001142140.17027-33-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098111; bh=C741vQZeiyfLswNMZ93oGojZZxOECaQbr8Dy+JElW1w=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Xk/OsmiT2KIRH19Dzh3+sdvPHVokltJMLuR4TY85ICrGb3dApvtJ2Dh/Fu8dkOHiE yDD8MfG9HanbVBLKfQUoAy7rDjTWlrgIS6Ly4Wk8Crz3v/GZ0fmHROfEpCq+eFc0pQ G/A/ei778zyloKnjkRw66g92ucYHtiQrNyRJhf2UpLsDwYNmRoDLQ8z1PjJzWuGpv9 msob0S9s6IAk4B/tJd0KbRsZD0R1O31SSHhJvJoiB/5cThkzrHQIGrcr9FG8y8VJeh rW0kjZCJs57FbbIZFetiMiXO+t1A25TbGagx4R48Ta5Zim0q0M7PUyT/N95K3yZ/Tx ZDny2+aO6p39g== X-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 Fri Oct 1 14:21:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33506 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 C7E1727BBE3; Fri, 1 Oct 2021 15:28:26 +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 97CAA27BBE1 for ; Fri, 1 Oct 2021 15:28:26 +0100 (BST) Received: from localhost ([::1]:47474 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJWT-0004yD-Ks for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:28:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44084) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUL-0002Bv-DT for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45434) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUK-0000dF-Jc for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUK-0005is-Gr for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 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: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309832921751 (code B ref 50905); Fri, 01 Oct 2021 14:26:12 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:29 +0000 Received: from localhost ([127.0.0.1]:56949 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTV-0005eY-Lh for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:29 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33304) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ7-0005Ta-Ou for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:55 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMrMw; Fri, 01 Oct 2021 16:21:51 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:36 +0200 Message-Id: <20211001142140.17027-34-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098111; bh=CzzgOdv7zv61ImbiAbcUKnTxA9omOQCetOkaZtSVMvI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ju2npogMIA8KRrz6SA0YIrG+BdNimgtYL0Z1r3WGEEFd4oSwCEQpiY+xR+58lDzKb ckOfP17+FYUIWdPp0so2XW958XbMNxeDhwBELQe9j5SXih0s5rJTcfXUYAlPlCu94V cEG1VyH3YzVNWkUXj8Ft5wIkI7LF56/bD8inxtrVb5WfkOFmtYDUZcoAa0oEenXgl2 +Q+pyeolY7x5I+GVxLHp5nDKGkLZyv3H+xsMQTjXyZLBluIF8sWGPIANj+Yyh45KgQ 7aiUZV7StR4AFLp/BRA891RMpn1gFqrM2b0Tkv01sxzC1J2LYvJm6n4ijKA4/qQoHP coV8wtmK1GyJA== X-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 Fri Oct 1 14:21:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33518 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 73CDC27BBE3; Fri, 1 Oct 2021 15:29:10 +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 2E18327BBE1 for ; Fri, 1 Oct 2021 15:29:10 +0100 (BST) Received: from localhost ([::1]:49900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJXB-0006bk-8x for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:29:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44086) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUL-0002C9-Dp for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45435) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUK-0000dH-Vr for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUK-0005iz-T5 for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 35/38] gnu: libcap: Unconditionally use #$output. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309832921759 (code B ref 50905); Fri, 01 Oct 2021 14:26:12 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:29 +0000 Received: from localhost ([127.0.0.1]:56951 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTd-0005em-Hm for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:29 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33326) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ7-0005Te-Te for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:55 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMrN1; Fri, 01 Oct 2021 16:21:51 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:37 +0200 Message-Id: <20211001142140.17027-35-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098111; bh=7FMrRAI+hoHB0h97dajzGW7URSZ1oTv6RBsTX85rGSo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jOexRw5mjDURFfFPeSbNTtg3pLPhm0JFjKKdNbFWu7+Luwlni1zEAx1qnz6dhDK0M cBGOp6x8E9OWA7CoPTLoVKWk+hvZsg3Kku7nxPSpSTunlOJo81XDUB1Ddp5wlipDIA BDg5sBR46GFIqem3GFY0XKfLGFBW99QkWNIqvNWQIL/9K3S7dN9ZOQcWWC2HMuLGfz iSA2YhaE5l8At6pfOC7XA8T2Y+Q/9I+HF78ue3ZG5irYh23p+Ni42AUwlv15B05UZm PTIM4jjt2RX9U6hBDj+4yCy0Etw/inpSnx4hU/8HhVLnMXFR2tyZJWmWmq845Z1jyT qyoEiKbpNMwnA== X-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 Fri Oct 1 14:21:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33514 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 7168027BBE3; Fri, 1 Oct 2021 15:29:01 +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 469C527BBE1 for ; Fri, 1 Oct 2021 15:29:01 +0100 (BST) Received: from localhost ([::1]:49106 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJX2-00065T-DL for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:29:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44092) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUM-0002Cc-0I for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45436) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUL-0000di-CQ for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUL-0005j7-92 for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 36/38] gnu: libproxy: Respect #:tests?. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309833021766 (code B ref 50905); Fri, 01 Oct 2021 14:26:13 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:30 +0000 Received: from localhost ([127.0.0.1]:56953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTd-0005eu-QB for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:29 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33366) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ8-0005Tj-2A for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:55 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMrN4; Fri, 01 Oct 2021 16:21:51 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:38 +0200 Message-Id: <20211001142140.17027-36-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098111; bh=jLhUhiWEFDu103zRABAn2hfAkw+BkNTRdpZgjkuZskM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jHUs9QYqvGW75jLVJ9CezkF1f/yzRN9HWft9lE6pWm8cZjpXX3gSSXnNln8bViRa9 qe0FhdO/zE0TFNn6fXhLR9i8v8Dl7Yq7Tjiodn+E0/O9tp/ELFhCl60dRMS9ex0m0J OXXgT2Ca1ie+iFro/GqIizhubiEzwC2QDRnfC5InXSwf39rDbpV/vTUYOxDdPdt/W5 9Ys09G3gZFrxItyxjv6EhbyZM11CK0dcx+eWiRE2FhdXLDuBHk5GscwoQbUxaoLMPN X44IshF30tGZDbYFqg7fCnk+H2pQFKFzNEMtFvKXaJsc3ybLyEnp9Cm7KVvqyOszo1 ntE9frrI0sLXA== X-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 Fri Oct 1 14:21:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33522 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 0D38F27BBE3; Fri, 1 Oct 2021 15:32:18 +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 CCB2227BBE1 for ; Fri, 1 Oct 2021 15:32:17 +0100 (BST) Received: from localhost ([::1]:54962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJaC-0001pH-SU for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:32:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46368) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJZz-0001kP-LD for guix-patches@gnu.org; Fri, 01 Oct 2021 10:32:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45500) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJZz-00062P-Bg for guix-patches@gnu.org; Fri, 01 Oct 2021 10:32:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJZz-0005wA-8t for guix-patches@gnu.org; Fri, 01 Oct 2021 10:32:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 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: Fri, 01 Oct 2021 14:32: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309869922769 (code B ref 50905); Fri, 01 Oct 2021 14:32:03 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:31:39 +0000 Received: from localhost ([127.0.0.1]:57042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJZa-0005vA-Ix for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:31:38 -0400 Received: from newton.telenet-ops.be ([195.130.132.45]:38856) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJZW-0005uR-GQ for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:31:35 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by newton.telenet-ops.be (Postfix) with ESMTPS id 4HLXNv6vbLzMqkmS for <50905@debbugs.gnu.org>; Fri, 1 Oct 2021 16:21:51 +0200 (CEST) Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMrN7; Fri, 01 Oct 2021 16:21:51 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:39 +0200 Message-Id: <20211001142140.17027-37-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098111; bh=v8dpSt+yBNsMIXNs2uxccAIAWbz/Ch1xmzKzziL1T9E=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=uHv/mLD7Bs/2HsfZdfNUefDfcHFPrBFf5o8tSUNMFQkk4rCfMySoJrZ1T7dhcnpA4 Sp7fJ5dEiKymwk5Jt+QpAqxNv1gmXjJsGTltUHHz0X4H0of9+TgYzwS12gexdQn+Df obzCK8g3ISWZxan5HN9oT0M9dxvPEmOmamH7CSO6XoWVWo4EVDncd7AmOU6I7Kjc/G rwChlC6Oi8Rc33niXkEsGNf3zHWX60py6UzDiYxmph0xvpmSn3yAmmmbqE5+Bbi0jl sTFxXZZUvIIU3vVvwL2UseS7hVu6H2QhCkxuVlYeA9F/lA2NtRmxnJcmO65x/xUlnC CDxs/+KvAqoRg== X-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 Fri Oct 1 14:21:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 33510 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 02A0027BBE4; Fri, 1 Oct 2021 15:28: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 A8F3C27BBE1 for ; Fri, 1 Oct 2021 15:28:51 +0100 (BST) Received: from localhost ([::1]:48342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJWs-0005am-Od for patchwork@mira.cbaines.net; Fri, 01 Oct 2021 10:28:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJUM-0002Cd-0h for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45437) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJUL-0000dj-P2 for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJUL-0005jE-Li for guix-patches@gnu.org; Fri, 01 Oct 2021 10:26:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50905] [PATCH core-updates v2 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: Fri, 01 Oct 2021 14:26: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: Mathieu Othacehe Cc: Maxime Devos , 50905@debbugs.gnu.org Received: via spool by 50905-submit@debbugs.gnu.org id=B50905.163309833021772 (code B ref 50905); Fri, 01 Oct 2021 14:26:13 +0000 Received: (at 50905) by debbugs.gnu.org; 1 Oct 2021 14:25:30 +0000 Received: from localhost ([127.0.0.1]:56955 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJTe-0005f1-1A for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:25:30 -0400 Received: from andre.telenet-ops.be ([195.130.132.53]:33386) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJQ8-0005Tl-Bc for 50905@debbugs.gnu.org; Fri, 01 Oct 2021 10:21:55 -0400 Received: from butterfly.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by andre.telenet-ops.be with bizsmtp id 0eMm260020mfAB401eMrNB; Fri, 01 Oct 2021 16:21:52 +0200 From: Maxime Devos Date: Fri, 1 Oct 2021 16:21:40 +0200 Message-Id: <20211001142140.17027-38-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211001142140.17027-1-maximedevos@telenet.be> References: <20211001142140.17027-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1633098112; bh=P1BKDHo+NzXFnTkGv7/kqZyiXCiO/gVMh2GTNAfUmWc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=d7OFh3/zMsRzwEv7QkZ/mR4bKHsVY5disSysLwltZb2aKRf9C6Pv+2A3MpCbthvx6 XzlN6BrY0KfLgefguUlxW01+o6zeG7pCAFQ/HbcAWW0GzF310OSLAs3cRUs5YuXd8B 9K6RVwH9KujSJQy0X6RcDfO40F2999gpMajQqHtOmDElwiDvjpN2p/1C3x7xFedwkx BFqSYaNMDVt40qpx5UkfhRvVIAc2S1h1TJp4K7dj7Zw+mTQB07TO9dc2ivx304+q+2 n04BH+ZK705Uqaxd0UaznhaWMDXQmb56h9aIXb5bbvh3gzMAQS6wGNMRIphn32/v0u 6VcKQtap5ipgg== X-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)))