From patchwork Sun Oct 6 17:00:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 68651 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 3950427BBE2; Sun, 6 Oct 2024 18:02:49 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6FB1227BBEA for ; Sun, 6 Oct 2024 18:02:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sxUdt-0000hU-6R; Sun, 06 Oct 2024 13:02:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sxUdq-0000fk-UJ for guix-patches@gnu.org; Sun, 06 Oct 2024 13:01:58 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sxUdq-0000zL-Em for guix-patches@gnu.org; Sun, 06 Oct 2024 13:01:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=VZe3h0ljXUPaLDH8d6GUh4VyfqvPQiTotA1V9/R4nh0=; b=NPqhoOxrryGyw5jj2JgqqhlxUUzYA9EgvQHTV4VFUnG6rIMElLM62rvxf5bhp17HrqOZm1KfBShoyHxAeHbHgjQm0DwClqaVPSRbMTcJe/MXExRC3F7vmiF6Nkc714fFaxr7LavHqrVh3NfR/Be7b2XjweGUcwpcn7/cbDMvWJ9x5uMbONBPeiimiulxQqTYGZS+CZnYpL4053utYWrld+4vTnsQvsvpuEbw1SqLMI1REJaZ3TwLjiXxDsf86gko2sHq/UKypspvujH4X29Up+OHOON8Bw0KrwVBaIZYJIEpHzGedq6waaPsfsiaxKLJofTwREOvIfA+uctwuO8JyQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sxUdw-0004ds-H8 for guix-patches@gnu.org; Sun, 06 Oct 2024 13:02:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#68150] [PATCH v2 1/8] build: glib-or-gtk: Export %glib-or-gtk-build-system-default-modules. References: In-Reply-To: Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 06 Oct 2024 17:02:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit@debbugs.gnu.org id=B68150.172823408317721 (code B ref 68150); Sun, 06 Oct 2024 17:02:04 +0000 Received: (at 68150) by debbugs.gnu.org; 6 Oct 2024 17:01:23 +0000 Received: from localhost ([127.0.0.1]:42204 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxUdH-0004be-6D for submit@debbugs.gnu.org; Sun, 06 Oct 2024 13:01:23 -0400 Received: from wolfsden.cz ([37.205.8.62]:53416) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sxUd9-0004aI-RM for 68150@debbugs.gnu.org; Sun, 06 Oct 2024 13:01:19 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id CF2DF31EE38; Sun, 6 Oct 2024 17:01:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234067; bh=CZGt2UQnNoUSqApr6L77CSLg6OZNusKyd+X+f99FE5U=; h=From:To:Cc:Subject:Date; b=ZsK7KWKYRXzVBGABX/XKwzGxcJAYe+pM2WL+Ins5h6WkK7hwW99EUiAwgFwzBm6Wf sCKSkPz57hoki7COMR4ZKMpKp/Sjj6MCMoa44SPKGF5culU30vPGVHyGaFBZ575gU9 Y8tt2R9qKa1+DsMxq8jTooDoKoyoW95uKQeEoqjTzmynq0b+XoGxyJTmtm+LdTRLGP 7auv5+RFqE3X4WGm6+SBeEEolkTwbd8jCYIMD06tCLvTTVR93jI2da/kFlT0UyWwYc hRH2Mt/wbNd6hHvA59EnXLMynUHHd7E7vdEXOIKzue4U4s4cvHHfCAIhto1lK0Dr5H nPwb74M3t/sS/toHdAqojOZjjh84iCm9hO7BI823rBvChhqBvwkG2PTZT+Z5VEBY9F uAvBEaM93WU8fDbT3rF1TSQShVgsxNC8HDDUhkLtDBqnOCf9MLJtEJfAJEbHmtF3lB eq/T6sfF729Kfl82sR0mFC2JUxnZSWoCCUtyj9z4JkmoCJDmWjeH+udflCYU1vmk07 I7ZmItttGx+zG2xl8KQ+TacESewgLhjWxEnGvXaWaAr18VchYHxRWkC7vjfB8U0K8x NFCffsaV75x/NVUn4RVyTwdMTuhykajRGy6MBt+nKz9udCk0Lvg0brjvNF5mU6QIKz pSrOWOKQ9rAmg/JS/RcPQdAU= Received: from localhost (unknown [146.70.134.132]) by wolfsden.cz (Postfix) with ESMTPSA id DE49031E6FD; Sun, 6 Oct 2024 17:01:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234067; bh=CZGt2UQnNoUSqApr6L77CSLg6OZNusKyd+X+f99FE5U=; h=From:To:Cc:Subject:Date; b=ZsK7KWKYRXzVBGABX/XKwzGxcJAYe+pM2WL+Ins5h6WkK7hwW99EUiAwgFwzBm6Wf sCKSkPz57hoki7COMR4ZKMpKp/Sjj6MCMoa44SPKGF5culU30vPGVHyGaFBZ575gU9 Y8tt2R9qKa1+DsMxq8jTooDoKoyoW95uKQeEoqjTzmynq0b+XoGxyJTmtm+LdTRLGP 7auv5+RFqE3X4WGm6+SBeEEolkTwbd8jCYIMD06tCLvTTVR93jI2da/kFlT0UyWwYc hRH2Mt/wbNd6hHvA59EnXLMynUHHd7E7vdEXOIKzue4U4s4cvHHfCAIhto1lK0Dr5H nPwb74M3t/sS/toHdAqojOZjjh84iCm9hO7BI823rBvChhqBvwkG2PTZT+Z5VEBY9F uAvBEaM93WU8fDbT3rF1TSQShVgsxNC8HDDUhkLtDBqnOCf9MLJtEJfAJEbHmtF3lB eq/T6sfF729Kfl82sR0mFC2JUxnZSWoCCUtyj9z4JkmoCJDmWjeH+udflCYU1vmk07 I7ZmItttGx+zG2xl8KQ+TacESewgLhjWxEnGvXaWaAr18VchYHxRWkC7vjfB8U0K8x NFCffsaV75x/NVUn4RVyTwdMTuhykajRGy6MBt+nKz9udCk0Lvg0brjvNF5mU6QIKz pSrOWOKQ9rAmg/JS/RcPQdAU= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 6 Oct 2024 19:00:24 +0200 Message-ID: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The list of modules used by default was not public, so users of this build system had to pick between copy&pasting the list, or using %glib-or-gtk-build-system-modules. The former is sub-optimal, since it is hard to keep it in sync. The latter is just wrong and leads to basically fall-backing to gnu-build-system. The solution is to export the default list giving the users option to use it directly. * guix/build-system/glib-or-gtk.scm (%glib-or-gtk-build-system-default-modules): Renamed from %default-modules. (define-module): Export it. (glib-or-gtk-build), (glib-or-gtk-cross-build): Use it. Change-Id: I331b2a3f0bdc3ce14eb9f2f80605e7873369168d --- Rebase on latest master. guix/build-system/glib-or-gtk.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -- 2.46.0 diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm index 5d026ec5ab..6c69a950e8 100644 --- a/guix/build-system/glib-or-gtk.scm +++ b/guix/build-system/glib-or-gtk.scm @@ -30,7 +30,8 @@ (define-module (guix build-system glib-or-gtk) #:use-module (guix build-system) #:use-module (guix build-system gnu) #:use-module (guix packages) - #:export (%glib-or-gtk-build-system-modules + #:export (%glib-or-gtk-build-system-default-modules + %glib-or-gtk-build-system-modules glib-or-gtk-build glib-or-gtk-cross-build glib-or-gtk-build-system) @@ -64,7 +65,7 @@ (define-module (guix build-system glib-or-gtk) ;; ;; Code: -(define %default-modules +(define %glib-or-gtk-build-system-default-modules ;; Build-side modules made available in the build environment. '((guix build glib-or-gtk-build-system) (guix build utils))) @@ -144,7 +145,7 @@ (define* (glib-or-gtk-build name inputs (glib-or-gtk-wrap-excluded-outputs ''()) (system (%current-system)) (imported-modules %glib-or-gtk-build-system-modules) - (modules %default-modules) + (modules %glib-or-gtk-build-system-default-modules) allowed-references disallowed-references) "Build SOURCE with INPUTS. See GNU-BUILD for more details." @@ -219,7 +220,7 @@ (define* (glib-or-gtk-cross-build name (system (%current-system)) (build (nix-system->gnu-triplet system)) (imported-modules %glib-or-gtk-build-system-modules) - (modules %default-modules) + (modules %glib-or-gtk-build-system-default-modules) allowed-references disallowed-references) "Cross-build SOURCE with INPUTS. See GNU-BUILD for more details." From patchwork Sun Oct 6 17:00:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 68644 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 6F2EB27BBE9; Sun, 6 Oct 2024 18:02:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CC06A27BBEA for ; Sun, 6 Oct 2024 18:02:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sxUdq-0000fj-Qy; Sun, 06 Oct 2024 13:01:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sxUdp-0000fS-Ae for guix-patches@gnu.org; Sun, 06 Oct 2024 13:01:57 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sxUdp-0000z8-2i for guix-patches@gnu.org; Sun, 06 Oct 2024 13:01:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=hpgAkongXbUIMpul8fTwVFqIwAVpiCysvekA881GqrU=; b=spplThEvy7R552uLlrUAM+qgrgRLrw+Oul80mZ+IxMD+o8SZixwyI6a7CFfBaC8auhi7r72MHyM1Wkv8A15RssiFD3aBt0uw0v056Kt5ep4NW++ZVdY7WK0LPpwAJblEPb4q2F1gWmky12eV5Dxsa8wtcbUCM6S+243rsGLVAZVyn+J+/8h2cpK8SnnClx7GYt/eOAkr9VKUhz7IXBB0mDlw5G/+54nqwZvHtVoqPB4pJ2PeodkwT7SSNonE4iPwM1oyVOKp0xPA3ro8QvfksFnj/2vmWddsFxK7emyOp6aLUSNs6y2Q2EKpn+SC7edmkY2AuMqfiGGyuLI8XXBlMg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sxUdu-0004dR-G1 for guix-patches@gnu.org; Sun, 06 Oct 2024 13:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#68150] [PATCH v2 2/8] gnu: netsurf: Actually use glib-or-gtk-build-system. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 06 Oct 2024 17:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit@debbugs.gnu.org id=B68150.172823408017676 (code B ref 68150); Sun, 06 Oct 2024 17:02:02 +0000 Received: (at 68150) by debbugs.gnu.org; 6 Oct 2024 17:01:20 +0000 Received: from localhost ([127.0.0.1]:42190 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxUdD-0004ar-Aw for submit@debbugs.gnu.org; Sun, 06 Oct 2024 13:01:19 -0400 Received: from wolfsden.cz ([37.205.8.62]:53420) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sxUd9-0004aK-RK for 68150@debbugs.gnu.org; Sun, 06 Oct 2024 13:01:17 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 70E8C320E1E; Sun, 6 Oct 2024 17:01:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234068; bh=tFClRpeTe8fCns+OD2qta3i1vCnV3SJERlKtrDRilhk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dbbVzelALM8qRdiPM2niAvEIkyn8l7Y7XXq6kuUFlOZrXAn7qTeN+6JGG0OMzALp3 8BQU9hwlDQnCLV/trW3f541Rg6CSWzxvg8+SeV6T07Wae0pIBhyMhsEC+wcp8nyqDP 5t5dLaa4kuPweQP1PBkzKwMmOK9jaago9ajBQGyd3ltsYdQ79RlVfMvzL7KE3Mv7sU M0Au3VM1ceQs0w4MpJsx55Hdc78ath1Y7pcZYH0Yg+7N7ziGS0FZXZn04JvuGlK+br 6y3dA9YbxgETP7nwu6DJzvBXTF845mqBViV274dwSZ5UPYRieOAtc5C1O9YNQY6u8r dvXy0hjxLIH/1hGUoTqtTPRcOFQ4ffvZY8SCA8zQt0M8qKsqx79TlbF/qIFUrX9pt8 s+mxnsebX15lXN4eLghAXgP6++4sIhFOz9hKgis73l/qyaV8g3Vtwbh4wA5moGWzgR wgtio8t5eDUmw/d5unPl9JPmh3aLwnLyvNEbcjB5VZtUpRPpgBbwN4K8OJrJtQ80Bq Mm8VISM05glBBE6BsaxMzVUCFqJk9a/xjArDW1AlkQVnYSDEVqEYgbD5p9296SNbsw zP0M+LmOcLVc0HhKwS00DAKQisqSuHdIVg2Vg6l2kpmFAanKH6azYHbAtB26POdaQy P3Wo5P9+zRvDLavkfgKAc0sE= Received: from localhost (unknown [146.70.134.132]) by wolfsden.cz (Postfix) with ESMTPSA id 0ED6C31EE3C; Sun, 6 Oct 2024 17:01:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234068; bh=tFClRpeTe8fCns+OD2qta3i1vCnV3SJERlKtrDRilhk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dbbVzelALM8qRdiPM2niAvEIkyn8l7Y7XXq6kuUFlOZrXAn7qTeN+6JGG0OMzALp3 8BQU9hwlDQnCLV/trW3f541Rg6CSWzxvg8+SeV6T07Wae0pIBhyMhsEC+wcp8nyqDP 5t5dLaa4kuPweQP1PBkzKwMmOK9jaago9ajBQGyd3ltsYdQ79RlVfMvzL7KE3Mv7sU M0Au3VM1ceQs0w4MpJsx55Hdc78ath1Y7pcZYH0Yg+7N7ziGS0FZXZn04JvuGlK+br 6y3dA9YbxgETP7nwu6DJzvBXTF845mqBViV274dwSZ5UPYRieOAtc5C1O9YNQY6u8r dvXy0hjxLIH/1hGUoTqtTPRcOFQ4ffvZY8SCA8zQt0M8qKsqx79TlbF/qIFUrX9pt8 s+mxnsebX15lXN4eLghAXgP6++4sIhFOz9hKgis73l/qyaV8g3Vtwbh4wA5moGWzgR wgtio8t5eDUmw/d5unPl9JPmh3aLwnLyvNEbcjB5VZtUpRPpgBbwN4K8OJrJtQ80Bq Mm8VISM05glBBE6BsaxMzVUCFqJk9a/xjArDW1AlkQVnYSDEVqEYgbD5p9296SNbsw zP0M+LmOcLVc0HhKwS00DAKQisqSuHdIVg2Vg6l2kpmFAanKH6azYHbAtB26POdaQy P3Wo5P9+zRvDLavkfgKAc0sE= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 6 Oct 2024 19:00:25 +0200 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> References: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The #:modules argument was based on %glib-or-gtk-build-system-modules, which, despite the name, should go into #:imported-modules. When put into #:modules, it leads to following warning: WARNING: (guile-user): `%standard-phases' imported from both (guix build glib-or-gtk-build-system) and (guix build gnu-build-system) Due to the definition of %glib-or-gtk-build-system-modules `((guix build glib-or-gtk-build-system) ,@%gnu-build-system-modules) It results in %standard-phases from gnu-build-system being used, effectively turning glib-or-gtk-build-system with #:modules set to %glib-or-gtk-build-system-modules into gnu-build-system. The solution is to use the (now) exported default value of #:modules (%glib-or-gtk-build-system-default-modules) as a base of the #:modules. * gnu/packages/web.scm (netsurf)[arguments]<#:modules>: Use %glib-or-gtk-build-system-default-modules instead of %glib-or-gtk-build-system-modules. Change-Id: Iacc4df7e213dbdae5a783e3aedde7e6e20402025 --- Rebase on latest master. gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.46.0 diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 552abf83c5..0ed88c11cf 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -6265,7 +6265,7 @@ (define-public netsurf (ice-9 match) (srfi srfi-1) (sxml simple) - ,@%glib-or-gtk-build-system-modules) + ,@%glib-or-gtk-build-system-default-modules) #:phases (modify-phases %standard-phases (delete 'configure) From patchwork Sun Oct 6 17:00:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 68645 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 9B3A127BBE9; Sun, 6 Oct 2024 18:02:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CADB327BBE2 for ; Sun, 6 Oct 2024 18:02:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sxUdr-0000fi-73; Sun, 06 Oct 2024 13:01:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sxUdp-0000fQ-7W for guix-patches@gnu.org; Sun, 06 Oct 2024 13:01:57 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sxUdo-0000z9-Vv for guix-patches@gnu.org; Sun, 06 Oct 2024 13:01:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=ocdGJT2e+DWGT6xanKT3ncwSGz/lUtVwG1nZzLFtwYA=; b=RFO6a0Ae2/WAgEB8MKFOn4XcUcfBfaO5oO/8pgO1Q/ig+ITwHWy/Xva8j2XLrXFeT8CKXUSLbGEynCkg9fgAS2wtL0WjZecLo0KZEa+6Drar2k9z61AGBkcKY2ws2T2uX8ixiTi+vMzzZe8jbBS+GOtXL4THxUQD3DOzldaIVKs+3jun4ICG8nIFNlUTlcz/rn8SkbyrX6yrRe5FwxBt/HTkP/qRyJ7CxYbrvFV6ekXahP2R2tuTrpKVmMDs6za+g1OFftHDv1Xgb+YtPcs0xl3h/Eiwo2Eb19R+gaoYxt/0gRxpPBgp9m7ooQRHx9tA3wu48Y1HX/yLSkDTAoo2lQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sxUdv-0004dY-03 for guix-patches@gnu.org; Sun, 06 Oct 2024 13:02:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#68150] [PATCH v2 3/8] gnu: libreoffice: Actually use glib-or-gtk-build-system. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 06 Oct 2024 17:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit@debbugs.gnu.org id=B68150.172823408017684 (code B ref 68150); Sun, 06 Oct 2024 17:02:02 +0000 Received: (at 68150) by debbugs.gnu.org; 6 Oct 2024 17:01:20 +0000 Received: from localhost ([127.0.0.1]:42192 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxUdD-0004b3-S1 for submit@debbugs.gnu.org; Sun, 06 Oct 2024 13:01:20 -0400 Received: from wolfsden.cz ([37.205.8.62]:53424) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sxUdA-0004aN-Bf for 68150@debbugs.gnu.org; Sun, 06 Oct 2024 13:01:17 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 987A8320D6A; Sun, 6 Oct 2024 17:01:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234069; bh=Rbmu5DDHRtiM7xI8m/s0uaYnXW/XXoA4KYy+ji8Rogo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RykUM7lEOnF1trTq3Iy5IULCM1vY/0U+RDT26AAmRcfC7Jqewe9fSMnPCBxpaMcu2 k9zw6lC5jz1LK/1jsVLg2c9UG6ivoj1IdGuC9vUMY83VKOGxdiTgP1OdywkSSaiy6t wjep/rzWSVtoImpq5j97mbBimXE3t/wYaqFCvKcZk099JKvQpqzNSX5t4m96AzQWog m5FB9a4iZLLFbM7fleq2JIb3QoA7JQ1odjw4IbWEVLvzFJ7eDA8SyKOQXJyfOIq4iC 6aKeAUYeDk1Khd2ozqN6Q+9SlrP6ymm/tVDf+OeBCkBq1zXLFkX6+HXzIKHaz5IwrI NfWYbZ/GuODP3v8oy4V1rXOkyKpC2Jll+86YuvLWkYe734P2R+vD/xLtOaGjj5TFSa QPzO9mD9TW9ucMNs66NcWmtj9IaEOM8jdYVDyG9FEdUPW7or2DJAmpuadqxJZs2n6w RDRLHBfcB+Tb/jFsQfSNhu8I+xqE1y3Usha3WQ4I9gUzFbO/wPVIEufyBrzwVcRxGN z3ZeBl6wg6f7XVfDElxc4Ig2wJ97ETXM1/k3e4Vgp7I3ByTo6uOpbkkc/740XhxO4l 1PS+MuLB59xEL1Wc0UX8dtruVhF8lCi0PemFcw4E/X0gukhxg1LEay5lSTHPe7Yd6g ohhYWrFgnJW1sxDwbOs4Ppuk= Received: from localhost (unknown [146.70.134.132]) by wolfsden.cz (Postfix) with ESMTPSA id 34421320AFE; Sun, 6 Oct 2024 17:01:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234069; bh=Rbmu5DDHRtiM7xI8m/s0uaYnXW/XXoA4KYy+ji8Rogo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RykUM7lEOnF1trTq3Iy5IULCM1vY/0U+RDT26AAmRcfC7Jqewe9fSMnPCBxpaMcu2 k9zw6lC5jz1LK/1jsVLg2c9UG6ivoj1IdGuC9vUMY83VKOGxdiTgP1OdywkSSaiy6t wjep/rzWSVtoImpq5j97mbBimXE3t/wYaqFCvKcZk099JKvQpqzNSX5t4m96AzQWog m5FB9a4iZLLFbM7fleq2JIb3QoA7JQ1odjw4IbWEVLvzFJ7eDA8SyKOQXJyfOIq4iC 6aKeAUYeDk1Khd2ozqN6Q+9SlrP6ymm/tVDf+OeBCkBq1zXLFkX6+HXzIKHaz5IwrI NfWYbZ/GuODP3v8oy4V1rXOkyKpC2Jll+86YuvLWkYe734P2R+vD/xLtOaGjj5TFSa QPzO9mD9TW9ucMNs66NcWmtj9IaEOM8jdYVDyG9FEdUPW7or2DJAmpuadqxJZs2n6w RDRLHBfcB+Tb/jFsQfSNhu8I+xqE1y3Usha3WQ4I9gUzFbO/wPVIEufyBrzwVcRxGN z3ZeBl6wg6f7XVfDElxc4Ig2wJ97ETXM1/k3e4Vgp7I3ByTo6uOpbkkc/740XhxO4l 1PS+MuLB59xEL1Wc0UX8dtruVhF8lCi0PemFcw4E/X0gukhxg1LEay5lSTHPe7Yd6g ohhYWrFgnJW1sxDwbOs4Ppuk= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 6 Oct 2024 19:00:26 +0200 Message-ID: <048211ca5d3fca6a7d86973ddf7bfb8dca426649.1728234031.git.~@wolfsden.cz> X-Mailer: git-send-email 2.46.0 In-Reply-To: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> References: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The #:modules argument was based on %glib-or-gtk-build-system-modules, which, despite the name, should go into #:imported-modules. When put into #:modules, it leads to following warning: WARNING: (guile-user): `%standard-phases' imported from both (guix build glib-or-gtk-build-system) and (guix build gnu-build-system) Due to the definition of %glib-or-gtk-build-system-modules `((guix build glib-or-gtk-build-system) ,@%gnu-build-system-modules) It results in %standard-phases from gnu-build-system being used, effectively turning glib-or-gtk-build-system with #:modules set to %glib-or-gtk-build-system-modules into gnu-build-system. The solution is to use the (now) exported default value of #:modules (%glib-or-gtk-build-system-default-modules) as a base of the #:modules. * gnu/packages/libreoffice.scm (libreoffice)[arguments]<#:modules>: Use %glib-or-gtk-build-system-default-modules instead of %glib-or-gtk-build-system-modules. Change-Id: I5304d9993af7d5f1187c6276e72a269aa60f5666 --- Rebase on latest master. gnu/packages/libreoffice.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.46.0 diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index ed8dfd432b..2acbddaa3b 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -908,7 +908,7 @@ (define-public libreoffice ,@%glib-or-gtk-build-system-modules) #:modules `(((guix build python-build-system) #:select (python-version)) (ice-9 textual-ports) - ,@%glib-or-gtk-build-system-modules) + ,@%glib-or-gtk-build-system-default-modules) #:tests? #f ; Building the tests already fails. #:phases #~(modify-phases %standard-phases From patchwork Sun Oct 6 17:00:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 68647 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 AC32D27BBEA; Sun, 6 Oct 2024 18:02:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6AF0027BBE2 for ; Sun, 6 Oct 2024 18:02:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sxUdt-0000hh-KD; Sun, 06 Oct 2024 13:02:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sxUdr-0000gY-Hn for guix-patches@gnu.org; Sun, 06 Oct 2024 13:01:59 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sxUdr-0000zX-3s for guix-patches@gnu.org; Sun, 06 Oct 2024 13:01:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=seFGH4NWzPczN3A3cKoH+lae4zQiT5Ojul0vLrKPUzY=; b=EWUWkyV3C7uPbpa71IWBpnX0LRbjOalRGIGXTt6BAUL4d1qc7Bc1CpjNmZIR76LkLHoKYZv/CxSEtZFpRjxeD5W80f6TKy+arAjBKcMW9VawBLb1RMJeclciWnOAY3QQpvDjbOA/Fyreld1Zl4Rz85I4LLQWZf8N62fHGUKipETODJWjCDCtpNXGnAataYW0O3Igez+SHtxvbP1TuerXmj9SEEoB3VWe9W/sq/7DztV3e4TbuG87hXEHQMiCYaSEGO7Ok3ZRh1R5Uc9QoDKF95mMzWlWa+jsVmB4mrDu1rGpza5wQ2Jwl3IM33vYTRFgOmF1VHUdaiE6D5qinkzVuw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sxUdv-0004df-GJ; Sun, 06 Oct 2024 13:02:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#68150] [PATCH v2 4/8] gnu: sugar: Dehardcode #:modules. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: rekado@elephly.net, guix-patches@gnu.org Resent-Date: Sun, 06 Oct 2024 17:02:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz>, Ricardo Wurmus X-Debbugs-Original-Xcc: Ricardo Wurmus Received: via spool by 68150-submit@debbugs.gnu.org id=B68150.172823408217706 (code B ref 68150); Sun, 06 Oct 2024 17:02:03 +0000 Received: (at 68150) by debbugs.gnu.org; 6 Oct 2024 17:01:22 +0000 Received: from localhost ([127.0.0.1]:42200 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxUdG-0004bR-EH for submit@debbugs.gnu.org; Sun, 06 Oct 2024 13:01:22 -0400 Received: from wolfsden.cz ([37.205.8.62]:53434) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sxUdC-0004af-Fj for 68150@debbugs.gnu.org; Sun, 06 Oct 2024 13:01:18 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id BA9D531DF59; Sun, 6 Oct 2024 17:01:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234071; bh=7LrDJ5c6x1yxgVKlZZd7DKsR4VUnLcgW+nIrYRxook0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Gex6si4t1p+8MDXPSz/+tLtoJzfL99DWf0M6SnKF5qDDc9UsGP5ARzaYNFNaBkGQ/ wh1wd6l7UrfGYqfAiIlAGDY1T5/+WXJrIZwcXEQdpzZdg5GxocAFcRD3+Z2hQWx2OH qYxyU4rYAC64PLwtDOdJyI/O4HKy9fz0WoyxKFLNSVYYjsJRIdfrjdo+9BmtTOBnEB w4ungDZ6BQN5SPRUyl2gDUsUXFQO/GwjPbEp77RVJNmslKOg2jpfff1bAN7bS0vL0D McZyx5k1cTean/OPJgQ7Ab2tPikw6AaVg51+tBuEEbMxr2f452d47rC9wjthP2dXh8 P07JPcEZYh2/G8Kk7ge/ekrnpCUNvSa74HQ7LHZVOSyJFX4WFxWNqX52hH3J2N/oBf cgIoqVjtrxVTK6HRNZVeX1nE3VqJJD5SwCSjk2s99w3TYMxpjAThSwcwhzXyTOXpy9 8xli5OUwNtuPTv6a+yyg7x+cgT+/4MwstDMNFdYaVXtyOttQiIKH4ADAiAD56HUecg MCvZQMiw/nLXhCdy4BmR/eB4vLkdrDQ0zAcv2UZisAwp89IVN2iOkC2L9Cx+YyQnlA l+FLI2SahdyJhmr76jixD3J4E0sekeLZXLKeROhsQu3h+e60GeaE9dOFc09P+CceZ6 oa619DiDR6aic/5KNLyVnjXs= Received: from localhost (unknown [146.70.134.132]) by wolfsden.cz (Postfix) with ESMTPSA id 446EE320A5D; Sun, 6 Oct 2024 17:01:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234070; bh=7LrDJ5c6x1yxgVKlZZd7DKsR4VUnLcgW+nIrYRxook0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=pTj7D7+SsPrKtWrrBOtvjsjeDCqa+1MGps2fLle9uxsbsTsytZbJtp/8HEb9d04KA p7i+0n0P14ujNklztVWjD2PhsJk/vglMbA7A+XtkGZmDhx999EbIa3E9/y/eo9kg4G Z9y9hS2GBTgmt2O6QAhvsHdgjPPjdAgpQnvsF/Tw8/uhdNKfnCQ4vA5BaCVmBFEHim i0iMMPgDgk4sbgj3oemQbKwX1HXg6DRWOOXPtuKdxf9HjnRludKlQKhcRlAPyuqsP8 8DH0TXVmwWYR9AGDf7dno7ch4Wa/8rJ2nOzdRuorW251nvK9qqg/T2p6XJITaM++9Q +iv4z4zevoq64JSRXKUKLSJ8f3snnD6YH7HD6/8A8Rmpu16vWdRsrBZdmOMjV2gF4w PeFsLyAcKdC6A0yaRJtKW+moPgH1ZlmsTxvfHYMrMtgBdt2zHpyb3I1WGj6bwaZ9LM 8UYgkI1kccslG3ymd6aJKTnskNQ2zAt7p5Ut/PGUhh0VzA2E6pXRWYZK3+gEFxLsUR kE/cLYrVXeMQ2uXckW35frC2DDcH3OfEWM++mUU1fd8vkS+YGvTQvEiLe63ROGIchJ kYY2QTv2IRuAWy6Vxnp0zgCpGNi4FzImrw6qLraCzWMjSBjcVtQfU1ar0ywcPWfTGo NK1pDtujqHL4hsdt66FQUpWM= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 6 Oct 2024 19:00:27 +0200 Message-ID: <40bc3cdf0208472a340ed15a2c3e5b83cde7437b.1728234031.git.~@wolfsden.cz> X-Mailer: git-send-email 2.46.0 In-Reply-To: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> References: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/sugar.scm (sugar)[arguments]<#:modules>: Replace the hardcoded list with %glib-or-gtk-build-system-default-modules. Change-Id: I5a98d356c3e1a32b71e7949e3425da74081c1e82 --- Rebase on latest master. gnu/packages/sugar.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.46.0 diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index 77008bc078..e9cfd1a21a 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -74,9 +74,8 @@ (define-public sugar `(,@%glib-or-gtk-build-system-modules (guix build python-build-system)) #:modules - '((guix build glib-or-gtk-build-system) - ((guix build python-build-system) #:prefix python:) - (guix build utils)) + `(((guix build python-build-system) #:prefix python:) + ,@%glib-or-gtk-build-system-default-modules) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-build-system From patchwork Sun Oct 6 17:00:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 68648 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 AF86627BBEA; Sun, 6 Oct 2024 18:02:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 69ABF27BBE2 for ; Sun, 6 Oct 2024 18:02:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sxUds-0000hK-HR; Sun, 06 Oct 2024 13:02:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sxUdr-0000fm-00 for guix-patches@gnu.org; Sun, 06 Oct 2024 13:01:59 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sxUdq-0000zM-O5 for guix-patches@gnu.org; Sun, 06 Oct 2024 13:01:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=lR2Uapj4NMr7If4lvBHilxSyr58hKxaO4ADNQTCowp4=; b=b8W/ujNMjHkyRpO9C/JlVdheJ9l/Ax41eUKN4V3AtunL1uKP7LZMSajMUrOLD9p3vkDsQj2SyuzuN3nB8H93GCIhus+r+9T2js2IlzlhJ60R3H2TvHx4MaPuLr4SR0CcE+ruMX7IUPB6/8PpZpWu3Y2278UV6SxGKldb1y7pWNEfajwn922a+5gPaMZdAMOtmRIJD2wBHWOB/G+DtOoHr0w6ZMXFfRkgBYVLNtZ79eMcsiZy1UtG6ikj3B5ud9oEApBKk5EG5URGPw7i3TitAK4UjaeHvqpeb+4D3swHImCID85ZLsg757CEZfCzMknk3XHwWGOUXHW/aihjqMtTuA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sxUdw-0004dm-0T; Sun, 06 Oct 2024 13:02:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#68150] [PATCH v2 5/8] gnu: sugar-datastore: Dehardcode #:modules. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: rekado@elephly.net, guix-patches@gnu.org Resent-Date: Sun, 06 Oct 2024 17:02:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz>, Ricardo Wurmus X-Debbugs-Original-Xcc: Ricardo Wurmus Received: via spool by 68150-submit@debbugs.gnu.org id=B68150.172823408317713 (code B ref 68150); Sun, 06 Oct 2024 17:02:03 +0000 Received: (at 68150) by debbugs.gnu.org; 6 Oct 2024 17:01:23 +0000 Received: from localhost ([127.0.0.1]:42202 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxUdG-0004bX-QQ for submit@debbugs.gnu.org; Sun, 06 Oct 2024 13:01:23 -0400 Received: from wolfsden.cz ([37.205.8.62]:53430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sxUdC-0004ae-CP for 68150@debbugs.gnu.org; Sun, 06 Oct 2024 13:01:18 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id A0606320E67; Sun, 6 Oct 2024 17:01:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234071; bh=Y2M2jqKa8IF+sb9+5mPI5TnAcyxU2+t9bcSmoj7bueo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=j0nIRaSeK4KJyCKbEym9riFC82s3+HAWzSBg03/UDLsAR/SBhdIShGnrPAK7Bpgo+ FvgLU4/pyAeRYavRbPUQLpbVJD1Uv7u33gtYQ3BRDvMajrk3bRVhFStYTGzMJJshsY gZUw91PXWVcGswSE0LAtKp0lrPPHuBMa2+eFWHuLGEpAcRWf7Wi3d1zPi9/7rGY7SL u3F6cZ4aaSQSWnIQl8aHVN3oG9h6XO6egLz1n4QOlLUCr173yJ9PZiJukCHA594wWH 4xhVmn2BnFOVfaCS3+CJWpwXsiCVwrseWcBehbvYljotGuPXKOsS+K6R9mN5go5wNl WIWzEU4tJtNkAvwe4RLPUGd7/keu27o4M9gR0fSv/L/s2ctIHbsC5fZ+0mbhdzOulw r5eGkW+oB0QFwBhtAxiADR0FPaAD32qCfIfzCOkmec5zDuVqPugI6+RYZznFGyOGhq MIKvcY/8fuPMr85GaaytgVbE0ZfL8AEHYpe3OPK+xLcBuGAdz8GGY+lExOcS4qmXMk r+flgA6AZB3DQrueERC1GnNEfZNHDA/wmTsgpd5QiuKNUbfGwDUKuk4bdBhMvu9Lsk YLecdIrcP7K6PZ3NQWkcWrhQG+HH94maWgBZcm8jsvzaGz9hNy3iw0MvxWQhLNFFQx zkuoQAu0LfXrVuPNELfbM9Bs= Received: from localhost (unknown [146.70.134.132]) by wolfsden.cz (Postfix) with ESMTPSA id 48B7831F141; Sun, 6 Oct 2024 17:01:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234071; bh=Y2M2jqKa8IF+sb9+5mPI5TnAcyxU2+t9bcSmoj7bueo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=j0nIRaSeK4KJyCKbEym9riFC82s3+HAWzSBg03/UDLsAR/SBhdIShGnrPAK7Bpgo+ FvgLU4/pyAeRYavRbPUQLpbVJD1Uv7u33gtYQ3BRDvMajrk3bRVhFStYTGzMJJshsY gZUw91PXWVcGswSE0LAtKp0lrPPHuBMa2+eFWHuLGEpAcRWf7Wi3d1zPi9/7rGY7SL u3F6cZ4aaSQSWnIQl8aHVN3oG9h6XO6egLz1n4QOlLUCr173yJ9PZiJukCHA594wWH 4xhVmn2BnFOVfaCS3+CJWpwXsiCVwrseWcBehbvYljotGuPXKOsS+K6R9mN5go5wNl WIWzEU4tJtNkAvwe4RLPUGd7/keu27o4M9gR0fSv/L/s2ctIHbsC5fZ+0mbhdzOulw r5eGkW+oB0QFwBhtAxiADR0FPaAD32qCfIfzCOkmec5zDuVqPugI6+RYZznFGyOGhq MIKvcY/8fuPMr85GaaytgVbE0ZfL8AEHYpe3OPK+xLcBuGAdz8GGY+lExOcS4qmXMk r+flgA6AZB3DQrueERC1GnNEfZNHDA/wmTsgpd5QiuKNUbfGwDUKuk4bdBhMvu9Lsk YLecdIrcP7K6PZ3NQWkcWrhQG+HH94maWgBZcm8jsvzaGz9hNy3iw0MvxWQhLNFFQx zkuoQAu0LfXrVuPNELfbM9Bs= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 6 Oct 2024 19:00:28 +0200 Message-ID: <2e5a67cccc836e8a49b4cdf086763d558b93f048.1728234031.git.~@wolfsden.cz> X-Mailer: git-send-email 2.46.0 In-Reply-To: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> References: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/sugar.scm (sugar-datastore)[arguments]<#:modules>: Replace the hardcoded list with %glib-or-gtk-build-system-default-modules. Change-Id: I9ceadd163d3f6cd49ed2623b6060b223257e9aed --- Rebase on latest master. gnu/packages/sugar.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.46.0 diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index e9cfd1a21a..1a353f6f3c 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -251,9 +251,8 @@ (define-public sugar-datastore `(,@%glib-or-gtk-build-system-modules (guix build python-build-system)) #:modules - '((guix build glib-or-gtk-build-system) - ((guix build python-build-system) #:prefix python:) - (guix build utils)) + `(((guix build python-build-system) #:prefix python:) + ,@%glib-or-gtk-build-system-default-modules) #:phases '(modify-phases %standard-phases (add-after 'unpack 'patch-build-system From patchwork Sun Oct 6 17:00:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 68649 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 DB5F327BBEA; Sun, 6 Oct 2024 18:02:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A01E727BBE2 for ; Sun, 6 Oct 2024 18:02:40 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sxUds-0000h9-9r; Sun, 06 Oct 2024 13:02:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sxUdr-0000fp-85 for guix-patches@gnu.org; Sun, 06 Oct 2024 13:01:59 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sxUdq-0000zV-Vz for guix-patches@gnu.org; Sun, 06 Oct 2024 13:01:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=HEHBFTrw0oaUWPEaLqDyN9EBf+KU//I66EMa/RMnBrM=; b=qO75lgpTe+hPs4Z9SL+aq/ZpZxfFHZwkAjycrUlDBQIE4uBk2S77IgdkPXkp3Q/Pk0czhqvAD/YUjMFfvEVsisJl7FgLiY0cL+AJdspNIx85UVC1s0cTe9q/eMigtbYyRXJZL9wm3KIqnb08YlltuoOVd0/sRtnQgZSYgnVxjVunk4Z/RenRJAOrAbePkpBOIz3PG78AHLxSB4veveg5ZPYVu8mjUGkHf9UkVOT2c9fu+rRbGfUALUjL0a4Y2R0tIGo+++lciYkLpem2mfRB4vGRorARb23C/LZOngKwDWN24NuPx0S2c3ZWWzqWTJgGD+jtZgJDuMf5C9hfvEEqUQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sxUdx-0004e2-2R; Sun, 06 Oct 2024 13:02:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#68150] [PATCH v2 6/8] gnu: sugar-toolkit-gtk3: Dehardcode #:modules. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: rekado@elephly.net, guix-patches@gnu.org Resent-Date: Sun, 06 Oct 2024 17:02:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz>, Ricardo Wurmus X-Debbugs-Original-Xcc: Ricardo Wurmus Received: via spool by 68150-submit@debbugs.gnu.org id=B68150.172823408417727 (code B ref 68150); Sun, 06 Oct 2024 17:02:05 +0000 Received: (at 68150) by debbugs.gnu.org; 6 Oct 2024 17:01:24 +0000 Received: from localhost ([127.0.0.1]:42206 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxUdH-0004bm-L2 for submit@debbugs.gnu.org; Sun, 06 Oct 2024 13:01:23 -0400 Received: from wolfsden.cz ([37.205.8.62]:53434) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sxUdD-0004af-5n for 68150@debbugs.gnu.org; Sun, 06 Oct 2024 13:01:19 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id B65CD320E79; Sun, 6 Oct 2024 17:01:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234072; bh=vWusWujdWvgev+ZhgMe6UpQfzIl0VkitoYhQoPf/siA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=andDftwULnV6Oq3+Qy9RHZosISJJHmIlN9QFCe1zLAW07zlINDM9O6VEjgM27Mrrv fsIfC718Lo+c1cFLFYKp+uqECS6tLjQfYJOpzbBufoNsmRSQ6uyTlgkREsDo3RL7iA c0b8nyJ89CWVkoxHSQVwP6NqUQrAzRq7WS4IYty1l71Mbo9veiY1SHH1VwZRSR2G89 m/dl5/GaLtUi8wnHAIRq5XFlJ55T0y0jhIHQgEYYZ4n5seIUyaaoUz9b6Fefe/SnCg 7AM6/udpO/iv7TPoah464ZtMkhIROAzzfU51EcWCTD8QZlZ9AGVKRcHo8pms5MpEM6 n0ElRGPmuXCl9KzftuZo1fYOmsUS4dTpLLRah5gIEGz3TZW51kNvEhNp8Wnos/V4TD +j1fKrYQIorM2UV7axN300WHIWhChfZjryaJFyc4dU3s19TWmPkrjsPGtlSJbaEW7I UnpXcO/XF/J4zQNohxlaHoZPHPl5NXqfK8Jrp8oQkU4Z4VTapgbIJ+LuMx0GgwUp4L RqffMfilWV1sDu3NMYqd+GzF4SsJAUU4YeAcPLi3ibHcVwEsD/dgll1TPXg5oAzNfX 2Q+SuW1ZL8EXPsw3RQy5F2N7ltsn+eiNp1suB4v5i+jsKL7p3MW7z8z2RlEXgXvQ9T /FbLuI1KxfKkEN6EzfVEIIA0= Received: from localhost (unknown [146.70.134.132]) by wolfsden.cz (Postfix) with ESMTPSA id 5B88F31E102; Sun, 6 Oct 2024 17:01:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234072; bh=vWusWujdWvgev+ZhgMe6UpQfzIl0VkitoYhQoPf/siA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=andDftwULnV6Oq3+Qy9RHZosISJJHmIlN9QFCe1zLAW07zlINDM9O6VEjgM27Mrrv fsIfC718Lo+c1cFLFYKp+uqECS6tLjQfYJOpzbBufoNsmRSQ6uyTlgkREsDo3RL7iA c0b8nyJ89CWVkoxHSQVwP6NqUQrAzRq7WS4IYty1l71Mbo9veiY1SHH1VwZRSR2G89 m/dl5/GaLtUi8wnHAIRq5XFlJ55T0y0jhIHQgEYYZ4n5seIUyaaoUz9b6Fefe/SnCg 7AM6/udpO/iv7TPoah464ZtMkhIROAzzfU51EcWCTD8QZlZ9AGVKRcHo8pms5MpEM6 n0ElRGPmuXCl9KzftuZo1fYOmsUS4dTpLLRah5gIEGz3TZW51kNvEhNp8Wnos/V4TD +j1fKrYQIorM2UV7axN300WHIWhChfZjryaJFyc4dU3s19TWmPkrjsPGtlSJbaEW7I UnpXcO/XF/J4zQNohxlaHoZPHPl5NXqfK8Jrp8oQkU4Z4VTapgbIJ+LuMx0GgwUp4L RqffMfilWV1sDu3NMYqd+GzF4SsJAUU4YeAcPLi3ibHcVwEsD/dgll1TPXg5oAzNfX 2Q+SuW1ZL8EXPsw3RQy5F2N7ltsn+eiNp1suB4v5i+jsKL7p3MW7z8z2RlEXgXvQ9T /FbLuI1KxfKkEN6EzfVEIIA0= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 6 Oct 2024 19:00:29 +0200 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> References: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/sugar.scm (sugar-toolkit-gtk3)[arguments]<#:modules>: Replace the hardcoded list with %glib-or-gtk-build-system-default-modules. Change-Id: I6a5e4511d2e696a673f7d5b49f75285ee488223d --- Rebase on latest master. gnu/packages/sugar.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.46.0 diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index 1a353f6f3c..10893a1dfd 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -320,9 +320,8 @@ (define-public sugar-toolkit-gtk3 `(,@%glib-or-gtk-build-system-modules (guix build python-build-system)) #:modules - '((guix build glib-or-gtk-build-system) - ((guix build python-build-system) #:prefix python:) - (guix build utils)) + `(((guix build python-build-system) #:prefix python:) + ,@%glib-or-gtk-build-system-default-modules) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-build-system From patchwork Sun Oct 6 17:00:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 68646 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 D5B6B27BBE9; Sun, 6 Oct 2024 18:02:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8F9D127BBE2 for ; Sun, 6 Oct 2024 18:02:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sxUdt-0000hl-Uw; Sun, 06 Oct 2024 13:02:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sxUds-0000h3-9J for guix-patches@gnu.org; Sun, 06 Oct 2024 13:02:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sxUdr-0000zq-Vy for guix-patches@gnu.org; Sun, 06 Oct 2024 13:02:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=ySvqD+7EJ5IidIob6y83VAkzy3IFh4OukZT9Y+0yCxM=; b=UdSV3cCDHxTK/cQURvPAtJFPr5c1otZSsStSHt3wT8JiOZk8o6yYQfdax0TFqKAhCBbmafT1u6vWxml0QRlX87BwqP+sb8UVNCfu+cFqCCG9J3GtZbnTGP599MiAR8sE88Mp9QAIbfl3NB+imEZWCvad01phqrKuZFGOwg49V8Xp/SW3SoDPQDt7louiQhwC+0KtVXDpwUEcKOGLfjSigJQ7Jm8EZzGH1dumLJDbA6LKxokRALjlwbCtaFVuun5wVX3ggofenn9CQ/midJQh6rCuu8iuPW1i17w/nRn+VWsvS5SNy7EaB2vQWZTyaIfZA9k24T4YjACM7Ev6B+dbaw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sxUdy-0004eL-2p for guix-patches@gnu.org; Sun, 06 Oct 2024 13:02:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#68150] [PATCH v2 7/8] gnu: nimf: Dehardcode #:modules. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 06 Oct 2024 17:02:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit@debbugs.gnu.org id=B68150.172823408717747 (code B ref 68150); Sun, 06 Oct 2024 17:02:06 +0000 Received: (at 68150) by debbugs.gnu.org; 6 Oct 2024 17:01:27 +0000 Received: from localhost ([127.0.0.1]:42210 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxUdL-0004c5-BC for submit@debbugs.gnu.org; Sun, 06 Oct 2024 13:01:27 -0400 Received: from wolfsden.cz ([37.205.8.62]:53446) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sxUdF-0004bJ-Ql for 68150@debbugs.gnu.org; Sun, 06 Oct 2024 13:01:22 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 18AA431E6B5; Sun, 6 Oct 2024 17:01:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234075; bh=gANqb4yaugW04t+OLOEbQxsylSJEXs8mpibnzyK+hwg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oW4dlLjmrcv3WSiHYA1sBmME/WROLadweLM0weKk/6YMc+hA+l6CCPYODGVOg8VGU IA8CaYfFB+iFf0bpUrn4QogY/nqZsGa8o4jVai5836yZ4XZuUfwHhcLO+k6ZncupH2 3cZ34O3JVFwg0PaQTyW7UN4cl/HqfDnJwl2OSTnuWsbuNSj4PrFrS0AFsos39VPDQs OFaDj5PiZd7/gii8kEutFkAddK7HziyiuqMfUCEn030oJ9/7pIactDuJTvoNke3196 HrhEEt6GXC2lj1u1kNCMAAxeWvEs6vrGVAXohUeOF4cNCDtLySdzSd/Du5b4xzNyJm 2TVrGCZWhOrk6CcQ0iEe41lQ5yF+GadUlCh0+mp5G6oGuVTGtJEzVOl/r7kx3PcC6w M9Vcn+BLodn796NWNF6Mu9w86j3GBObMmphyKkfg1xJxBkidS36BBMGLX1YlAegAL3 nE/Q3TDcAPd/kxFLRrCZHvHPMygH3NsectPodcqvBmsN4w51RlLtjaJEDT7j5wGXBw 9CKf4ualbI6lNSaokmzGBKzXPJSwtfnT4P419FglX8tKd+ll4IsDykTtwJED9Gim3o 6/ccG0ea/mIXBemGlzmH+2ncwXSobLBkTBD0/9pQ2IIs4mizY9o8JzeSKhJ48ez0H3 u+CNtqzAc0241gHpns2HWcCY= Received: from localhost (unknown [146.70.134.132]) by wolfsden.cz (Postfix) with ESMTPSA id 6FD2C31EE41; Sun, 6 Oct 2024 17:01:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234073; bh=gANqb4yaugW04t+OLOEbQxsylSJEXs8mpibnzyK+hwg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=G0MVl68vIa6IPtmJDtLL/OrCsGHMRaadIQ5ojh90HURyZxwAo3iFJTjIoGf/029kJ IwJn+qx/vXGFGqRi8XViq7dJ4noTrLQUPke+g5czggPOk2hByv2uuSOlnxxw+aTVFs XX5MmMCZecmUZ5ClM+YUoEDkqkVTHMjEEC7IoABl3GzMlG0hCuvpAJSEolrNxCUF2+ UyGe8AC1LWM4Xu1aeq5qA1e7B8Uh2V+Q0bnyyJ0Lt7nyU9bROLP/02zyy5B4o66gWk 1DsLcRxAPjviCGhTQhr0iWJXnTaRwz7/9DGqjmjpNk73KBeNE8+ROWbIzmHtWuknFK UfKjFQmqG3HaPMAlXdn/1JY5Wen2W0BTW8vdiyxC6Il1QsZjAHhaa0SGvfEpzn3c1a TsTQWSW9MSpbnUeDSBgkOzgq7SxMDRbl1NHHPIwFzrFcDwzuZLuZ+Tq219GEpQ4IjM x00IcnNWYUFokQvADUQ21K32+whiUJdromVm+TI/kKYAVwuYIF6x+NabgkdbtdqIIB CfnGVrVEqyH7iYVwzcWmibmhjNK3rSZXx/9+e1nojbZgKcIvRC3HNl0TeVSAfSIHB1 gT09DQ86ZeMh9UzDfmZgtEnVZW2kwMYhXci8NzAif723FMtkXhg8vy6gb2yR6EW4VO 1xPzQlLE74IdbxFV4ok0p1EE= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 6 Oct 2024 19:00:30 +0200 Message-ID: <4df57c09796c144f2c8f6103228a5206895d097f.1728234031.git.~@wolfsden.cz> X-Mailer: git-send-email 2.46.0 In-Reply-To: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> References: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/language.scm (nimf)[arguments]<#:modules>: Replace the hardcoded list with %glib-or-gtk-build-system-default-modules. Change-Id: I5eaaac4cdd50b635d24b10c7fa2d365dcf392498 --- Rebase on latest master. gnu/packages/language.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.46.0 diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 7a3deb0b43..2d522f6877 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -99,10 +99,8 @@ (define-public nimf (guix build cmake-build-system) (guix build qt-build-system) (guix build qt-utils)) - #:modules '((guix build glib-or-gtk-build-system) - ((guix build qt-build-system) - #:prefix qt:) - (guix build utils)) + #:modules `(((guix build qt-build-system) #:prefix qt:) + ,@%glib-or-gtk-build-system-default-modules) #:configure-flags #~(list "--with-im-config-data" "--with-imsettings-data" From patchwork Sun Oct 6 17:00:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 68650 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 8FFFF27BBE2; Sun, 6 Oct 2024 18:02:48 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_ALL,DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5340727BBE2 for ; Sun, 6 Oct 2024 18:02:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sxUdt-0000hX-86; Sun, 06 Oct 2024 13:02:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sxUdr-0000gc-Qb for guix-patches@gnu.org; Sun, 06 Oct 2024 13:01:59 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sxUdr-0000zi-FI for guix-patches@gnu.org; Sun, 06 Oct 2024 13:01:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=GKqRF1O2IkETno3d7oNlnWrnPq3MSgXXcGjVtTVaCRo=; b=egef4Cc+Xp4RJD5dIvTa9FGIQtjRQvsq23p2dxcT1VRdu9edsAO5EJwa3xI4nk27OpHTJUAMFqpBKXVIucioGA6+mCXARPQNncr05+faQI1uEp6LMV/I221pEZNw+qpZUuslYWT7egn65wfr/077fpzD3kcJIzTUfdZuE2YWw5m29hdn8KU378IojIIQADNBNpZl7lO8OKg2jMbIQMltvPK9+J6SyuHJHSC7UzoneNK/4Sj5tx/Hhc18jMnpHA5l/XqykkA2K6xGBIHuxtml4nZON5ghRAbTE6mRV37ZV11dLS7o8Jomoh2AVtY+d2cSAsiU6tRvlaxU/ogEobDvZg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sxUdx-0004eC-HS for guix-patches@gnu.org; Sun, 06 Oct 2024 13:02:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#68150] [PATCH v2 8/8] gnu: hime: Dehardcode #:modules. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 06 Oct 2024 17:02:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68150 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68150@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 68150-submit@debbugs.gnu.org id=B68150.172823408717740 (code B ref 68150); Sun, 06 Oct 2024 17:02:05 +0000 Received: (at 68150) by debbugs.gnu.org; 6 Oct 2024 17:01:27 +0000 Received: from localhost ([127.0.0.1]:42208 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxUdL-0004c3-1M for submit@debbugs.gnu.org; Sun, 06 Oct 2024 13:01:27 -0400 Received: from wolfsden.cz ([37.205.8.62]:53436) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1sxUdF-0004bI-Oe for 68150@debbugs.gnu.org; Sun, 06 Oct 2024 13:01:22 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id 0B3E1321016; Sun, 6 Oct 2024 17:01:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234075; bh=zvWsa7Fnpm3dSSjuQeCQ4qpNg76QQdCXsBmMqcY0eeU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=yfLOy0BhGDWDR95qP195jIU1tSVfRMj8QzTe1WTJiNRxT+zTX7emRXDseF0pgp3lP t40KzrFh5NfTmkX29rdplCQVIqtTQc68MbI7OaZahRSOxN8WRL5H9dVDAQwnIORS6j 2sBOBTkhxDRQbejq+r/irY1hB7uzwh2Jo1SbgLUsSZ8Cs9ci0njAhmAi1XbPkRxeAo 3Kj8rg8lkcxZc+jW4O6SRjhwIXlvb6US7ZDE4XsbRElQFvW8dcFXYreXh5T1GOUsA/ UhBuZm16KPhhH2edZ5mYv+lId9niTSbK9Xhy1U9K0GbHHOxuW6UUd6UBRSXTG+U4aM PA9jHyhrWE5IHFXdQLwHawPoffP2Sfeau2EVXxIt4+P2BlyxWcXYZqzh+0+asRYHcF FKS/lGeiR6nkYnTsGUcWSOFYymW4Jj+jP5eC2QzHVDtz9bNXuilB+fnouFEOHikSpk 4tFLUQS2Jj6aD5ViTssU5EHftZ8SLJtaH2UOKlR6NSLixAXRrydgErNqNwf+WcbcJO mUh4OmNw+dvgn8iKTg576wT4ND+tRusgxtz54riJzStmSjn4fpg2trVJhh/fc4wArl dyPlBmsOv+WKT08S6K1VkKukl8bF1bwMEFxXqrQJdOFb1f5snpDX5sw2Z6EoXXyJSv k5BqvwJzyGEgYoFpe5DJIjxk= Received: from localhost (unknown [146.70.134.132]) by wolfsden.cz (Postfix) with ESMTPSA id A153B321012; Sun, 6 Oct 2024 17:01:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1728234074; bh=zvWsa7Fnpm3dSSjuQeCQ4qpNg76QQdCXsBmMqcY0eeU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=SbW3MaV7IyvP6xCBU/2NuU4jmCDn2YN9nu7zoGie9Sf1/xatgwdjmFrGIdOi4djit J3febKjWM6A4MmdjBRXu5gtoXLESOI1E++0lneTnTvdyjkFLNCwKeLkTlVjQ/Y078v wiQW0m8W7XVYLTnFg/vp6DMN0m59p5AmJz2B/T51ymA2EDqrFEdJkXEObqUDkPJMuC 4R45+sQ7/CoDo2VV9SsztxURJemkfT659283fr801s2TNM1d5loTnmHOjZExkalFBZ Q3VLmaSGmSs5MePJK9uM1qbu+KwJnfolct7ZL5cGH0fHAY7whhfpGEPtL/oMX3F/8o 91oInSkq6rChlIOK5sq+sAaBos74denhPzs5dhM/bewlel09CXY2XSYpOLhypl8eUu O+XYMpRydTSMurxpTwP4ECyfcm86SjxMEWWC1ozuCxie6JGYngJQM3oNrVE+q8Nx9w xyF6H6KXYAXUauErOiUrjD0rZ6Sd1aafIOFTR1wK0ccaquHsvbDsrGqMP+CfWvJGen rTkd2Dn8afAc06zpBpX3UVKB8fxnEurkC5+P4kG34cLccyqI1EK04Hw02Bkz/nPAnN lJ9jf3XXU2sW7xXQEV2QmGaaU8sGU7wiHIUv6NMO13D5/x3K0d7hX7nylXnYtKhAXM Qdvec0/ub96esiCytwe+BFec= From: Tomas Volf <~@wolfsden.cz> Date: Sun, 6 Oct 2024 19:00:31 +0200 Message-ID: <9199fb3edff0e5ebfd28dfead197e8f8228096f2.1728234031.git.~@wolfsden.cz> X-Mailer: git-send-email 2.46.0 In-Reply-To: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> References: <44f290956d9b581e384d4ceb8859dc863190e376.1728234031.git.~@wolfsden.cz> MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/language.scm (hime)[arguments]<#:modules>: Replace the hardcoded list with %glib-or-gtk-build-system-default-modules. Change-Id: I5360c0000173b293e9e24290a2e8eaed84e05750 --- Rebase on latest master. gnu/packages/language.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.46.0 diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 2d522f6877..fb8d090fa3 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -218,10 +218,8 @@ (define-public hime (guix build qt-build-system) (guix build qt-utils)) #:modules - ((guix build glib-or-gtk-build-system) - ((guix build qt-build-system) - #:prefix qt:) - (guix build utils)) + (((guix build qt-build-system) #:prefix qt:) + ,@%glib-or-gtk-build-system-default-modules) #:configure-flags (list ;; FIXME