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