From patchwork Fri Feb 3 12:42:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 46642 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 712AE27BBED; Fri, 3 Feb 2023 12:45:08 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 C445927BBE9 for ; Fri, 3 Feb 2023 12:45:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pNvQI-0005l2-DB; Fri, 03 Feb 2023 07:44:10 -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 1pNvQB-0005cz-Bw for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pNvQA-0004Xk-R2 for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pNvQA-0004Jv-8p for guix-patches@gnu.org; Fri, 03 Feb 2023 07:44:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61253] [PATCH core-updates 01/19] build-system/font: Add #:license-file-regexp argument. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 Feb 2023 12:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61253 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61253@debbugs.gnu.org Received: via spool by 61253-submit@debbugs.gnu.org id=B61253.167542820616336 (code B ref 61253); Fri, 03 Feb 2023 12:44:02 +0000 Received: (at 61253) by debbugs.gnu.org; 3 Feb 2023 12:43:26 +0000 Received: from localhost ([127.0.0.1]:36694 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPZ-0004FO-Qh for submit@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:26 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:44050) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pNvPY-0004EY-Cm for 61253@debbugs.gnu.org; Fri, 03 Feb 2023 07:43:24 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 2DCB5684FF for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:19 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo07-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo07-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id H5x4F-yT-hZA for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:18 +0000 (UTC) Received: from localhost.localdomain (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id E399C68253 for <61253@debbugs.gnu.org>; Fri, 3 Feb 2023 12:43:18 +0000 (UTC) From: Simon South Date: Fri, 3 Feb 2023 07:42:58 -0500 Message-Id: <045f4cd33542a6540a70cc1218b4f5bfab10b492.1675425307.git.simon@simonsouth.net> X-Mailer: git-send-email 2.38.0 In-Reply-To: References: 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 * guix/build-system/font.scm (font-build): Add #:license-file-regexp argument and honour it. * guix/build/font-build-system.scm (%license-file-regexp): New variable, duplicated from (gnu build gnu-build-system). --- guix/build-system/font.scm | 2 ++ guix/build/font-build-system.scm | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/guix/build-system/font.scm b/guix/build-system/font.scm index c43fb9a542..45933b138f 100644 --- a/guix/build-system/font.scm +++ b/guix/build-system/font.scm @@ -77,6 +77,7 @@ (define* (font-build name inputs (tests? #t) (test-target "test") (configure-flags ''()) + (license-file-regexp '%license-file-regexp) (phases '%standard-phases) (outputs '("out")) (search-paths '()) @@ -98,6 +99,7 @@ (define builder #:system #$system #:test-target #$test-target #:tests? #$tests? + #:license-file-regexp #$license-file-regexp #:phases #$(if (pair? phases) (sexp->gexp phases) phases) diff --git a/guix/build/font-build-system.scm b/guix/build/font-build-system.scm index e4784bc17d..8418ada1d2 100644 --- a/guix/build/font-build-system.scm +++ b/guix/build/font-build-system.scm @@ -23,6 +23,7 @@ (define-module (guix build font-build-system) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:export (%standard-phases + %license-file-regexp font-build)) ;; Commentary: @@ -56,6 +57,10 @@ (define* (install #:key outputs #:allow-other-keys) (for-each (cut install-file <> (string-append fonts "/web")) (find-files source "\\.(woff|woff2)$")))) +(define %license-file-regexp + ;; Regexp matching license files. + "^(COPYING.*|LICEN[CS]E.*|[Ll]icen[cs]e.*|Copy[Rr]ight(\\.(txt|md))?)$") + (define %standard-phases (modify-phases gnu:%standard-phases (replace 'unpack unpack)