From patchwork Wed Dec 13 08:00:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 57562 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 DA2BC27BBE9; Wed, 13 Dec 2023 08:02:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED 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 E1F4627BBE2 for ; Wed, 13 Dec 2023 08:02:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rDKBr-00058F-9t; Wed, 13 Dec 2023 03:01:59 -0500 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 1rDKBh-00057b-IJ for guix-patches@gnu.org; Wed, 13 Dec 2023 03:01:50 -0500 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 1rDKBd-0001pV-VE for guix-patches@gnu.org; Wed, 13 Dec 2023 03:01:47 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rDKBt-00034L-Oj for guix-patches@gnu.org; Wed, 13 Dec 2023 03:02:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67808] [PATCH 1/5] guix: build-system: font: Accept license-file-regexp keyword argument Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Dec 2023 08:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67808 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67808@debbugs.gnu.org Cc: Saku Laesvuori X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170245450211762 (code B ref -1); Wed, 13 Dec 2023 08:02:01 +0000 Received: (at submit) by debbugs.gnu.org; 13 Dec 2023 08:01:42 +0000 Received: from localhost ([127.0.0.1]:58115 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDKBZ-00033d-LI for submit@debbugs.gnu.org; Wed, 13 Dec 2023 03:01:41 -0500 Received: from lists.gnu.org ([2001:470:142::17]:38370) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDKBX-00033K-Hy for submit@debbugs.gnu.org; Wed, 13 Dec 2023 03:01:40 -0500 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 1rDKB0-000542-2j for guix-patches@gnu.org; Wed, 13 Dec 2023 03:01:08 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101] helo=mail.laesvuori.fi) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rDKAt-0000c9-My for guix-patches@gnu.org; Wed, 13 Dec 2023 03:01:04 -0500 Received: from X-kone.org.aalto.fi (unknown [130.233.144.30]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 2E6FC3400DF; Wed, 13 Dec 2023 09:00:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1702454451; bh=bqLbwKETgTGIUORNEpaA1Yi4HybgidiZAcI5N87FVec=; h=From:To:Cc:Subject:Date; b=SlrNu68gOowZKKSRheMJlhT5WJrj6U25bLlr6n57KSDTHDscduGhJ5kEKMWPATXKc HJ87SL1CvY0KyyPDQkMQSvdqZ4EFjSmOEfeVJXkVAZXMHhxH3nXPWQKBZwdbd6G+Fl kYbQJMuXbZloh8zlorhO2GcHszVykCunOHQISbEg= Date: Wed, 13 Dec 2023 10:00:35 +0200 Message-ID: <123127b6a5bf1c94ff62b0779837a6e54975c81f.1702454367.git.saku@laesvuori.fi> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=75.119.130.101; envelope-from=saku@laesvuori.fi; helo=mail.laesvuori.fi X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-to: Saku Laesvuori X-ACL-Warn: , Saku Laesvuori via Guix-patches X-Patchwork-Original-From: Saku Laesvuori via Guix-patches via From: Saku Laesvuori 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 * guix/build-system/font.scm: (font-build): Pass license-file-regexp keyword argument to font-build. * guix/build-system/gnu.scm: Export %license-file-regexp. Change-Id: I4e9378cbed9a8c3b9838efcd448e9bfec8ba97be --- guix/build-system/font.scm | 2 ++ guix/build-system/gnu.scm | 1 + 2 files changed, 3 insertions(+) base-commit: 4bf4e340b74b66a0fc319aeb100fb1f948a67211 diff --git a/guix/build-system/font.scm b/guix/build-system/font.scm index c57c304f52..893e9f635e 100644 --- a/guix/build-system/font.scm +++ b/guix/build-system/font.scm @@ -81,6 +81,7 @@ (define* (font-build name inputs (search-paths '()) (system (%current-system)) (guile #f) + (license-file-regexp %license-file-regexp) (imported-modules %font-build-system-modules) (modules '((guix build font-build-system) (guix build utils)))) @@ -94,6 +95,7 @@ (define* (font-build name inputs #~(font-build #:name #$name #:source #+source #:configure-flags #$configure-flags + #:license-file-regexp #$license-file-regexp #:system #$system #:test-target #$test-target #:tests? #$tests? diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index cdbb547773..b8082354b9 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -28,6 +28,7 @@ (define-module (guix build-system gnu) #:use-module (srfi srfi-1) #:use-module (ice-9 match) #:export (%gnu-build-system-modules + %license-file-regexp %strip-flags %strip-directories gnu-build