all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Simon South <simon@simonsouth.net>
To: 61253@debbugs.gnu.org
Subject: [bug#61253] [PATCH core-updates 01/19] build-system/font: Add #:license-file-regexp argument.
Date: Fri,  3 Feb 2023 07:42:58 -0500	[thread overview]
Message-ID: <045f4cd33542a6540a70cc1218b4f5bfab10b492.1675425307.git.simon@simonsouth.net> (raw)
In-Reply-To: <cover.1675425307.git.simon@simonsouth.net>

* 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)
-- 
2.39.1





  reply	other threads:[~2023-02-03 12:45 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-03 12:38 [bug#61253] [PATCH core-updates 00/19] Add license files missing from font packages Simon South
2023-02-03 12:42 ` Simon South [this message]
2023-02-03 12:42 ` [bug#61253] [PATCH core-updates 02/19] build-system/font: Customize %license-file-regexp Simon South
2023-02-03 12:43 ` [bug#61253] [PATCH core-updates 03/19] gnu: font-canada1500: Install license file Simon South
2023-02-03 12:43 ` [bug#61253] [PATCH core-updates 04/19] gnu: font-lato: " Simon South
2023-02-03 12:43 ` [bug#61253] [PATCH core-updates 05/19] gnu: font-linuxlibertine: Install all license files Simon South
2023-02-03 12:43 ` [bug#61253] [PATCH core-updates 06/19] gnu: font-wqy-zenhei: " Simon South
2023-02-03 12:43 ` [bug#61253] [PATCH core-updates 07/19] gnu: font-wqy-microhei: " Simon South
2023-02-03 12:43 ` [bug#61253] [PATCH core-updates 08/19] gnu: font-fira-sans: Install license file Simon South
2023-02-03 12:43 ` [bug#61253] [PATCH core-updates 09/19] gnu: font-fira-go: " Simon South
2023-02-03 12:43 ` [bug#61253] [PATCH core-updates 10/19] gnu: font-comic-neue: " Simon South
2023-02-03 12:43 ` [bug#61253] [PATCH core-updates 11/19] gnu: font-space-grotesk: Remove obsolete phase Simon South
2023-02-03 12:43 ` [bug#61253] [PATCH core-updates 12/19] gnu: font-go: Install license files Simon South
2023-02-03 12:43 ` [bug#61253] [PATCH core-updates 13/19] gnu: font-dosis: Remove extraneous files; install license file Simon South
2023-02-03 12:43 ` [bug#61253] [PATCH core-updates 14/19] gnu: font-culmus: Install all license files Simon South
2023-02-03 12:43 ` [bug#61253] [PATCH core-updates 15/19] gnu: font-dseg: Simplify "install" phase Simon South
2023-02-03 12:43 ` [bug#61253] [PATCH core-updates 16/19] gnu: font-dseg: Install license file Simon South
2023-02-03 12:43 ` [bug#61253] [PATCH core-updates 17/19] gnu: font-jetbrains-mono: Remove obsolete phase Simon South
2023-02-03 12:43 ` [bug#61253] [PATCH core-updates 18/19] gnu: font-fontna-yasashisa-antique: Install license file Simon South
2023-02-03 12:43 ` [bug#61253] [PATCH core-updates 19/19] gnu: font-charter: " Simon South
2024-01-22  4:37 ` bug#61253: [PATCH core-updates 00/19] Add license files missing from font packages Maxim Cournoyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=045f4cd33542a6540a70cc1218b4f5bfab10b492.1675425307.git.simon@simonsouth.net \
    --to=simon@simonsouth.net \
    --cc=61253@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.