GNU bug report logs - #67808
[PATCH 1/5] guix: build-system: font: Accept license-file-regexp keyword argument

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Package: guix-patches; Reported by: Saku Laesvuori <saku@HIDDEN>; Keywords: patch; dated Wed, 13 Dec 2023 08:02:01 UTC; Maintainer for guix-patches is guix-patches@HIDDEN.

Message received at 67808 <at> debbugs.gnu.org:


Received: (at 67808) by debbugs.gnu.org; 14 Dec 2023 14:02:16 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 14 09:02:16 2023
Received: from localhost ([127.0.0.1]:49034 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rDmI3-0004bE-Rk
	for submit <at> debbugs.gnu.org; Thu, 14 Dec 2023 09:02:16 -0500
Received: from vmi571514.contaboserver.net ([75.119.130.101]:60678
 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <saku@HIDDEN>) id 1rDmI1-0004b5-QZ
 for 67808 <at> debbugs.gnu.org; Thu, 14 Dec 2023 09:02:14 -0500
Received: from X-kone.org.aalto.fi (unknown [130.233.144.30])
 by mail.laesvuori.fi (Postfix) with ESMTPSA id 59524343635;
 Thu, 14 Dec 2023 15:02:18 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail;
 t=1702562538; bh=fl/a8of0V0zqe/vB/LbqqcSnRElSp5qBl+S4EqH+rW4=;
 h=From:To:Cc:Subject:Date:In-Reply-To:References;
 b=pWVvV36WVC+gigqd1xYpN2orxCeplrYPTmwZy4joRnn1A7bGNVBPxT8l8e7UZ9RXs
 lekD/ZfJSntvw9YIfUijgWfhpFJMCitO4JxWrJe8rbiNOnjnYyfq9LaBWK99tC3bV0
 6EmvqfDbbHUpdxpb+5PsvrbJzDUYj/YQ5bPDEo/s=
From: Saku Laesvuori <saku@HIDDEN>
To: 67808 <at> debbugs.gnu.org
Subject: [PATCH v3 3/3] gnu: Add font-jetbrains-mono-nerd-font
Date: Thu, 14 Dec 2023 16:01:14 +0200
Message-ID: <6b637a574c69bb422240ddda6de7073b36d3012a.1702561323.git.saku@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <173b07571f7417cc23d53e9557e7ce2871075346.1702561323.git.saku@HIDDEN>
References: <173b07571f7417cc23d53e9557e7ce2871075346.1702561323.git.saku@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Zhu Zihao <all_but_last@HIDDEN>, 宋文武 <iyzsong@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 67808
Cc: Saku Laesvuori <saku@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/fonts.scm (font-jetbrains-mono-nerd-font): New variable.

Change-Id: I61b356b1ac57a030e6fa3f8236afcb07daf02c9f
---
 gnu/packages/fonts.scm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 3568f38c60..bcddf71d27 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -2580,6 +2580,9 @@ (define-public font-jetbrains-mono
 (define-public font-jetbrains-mono-nerd-font
   (patch-nerd-font font-jetbrains-mono))
 
+(define-public font-jetbrains-mono-nerd-font
+  (patch-nerd-font font-jetbrains-mono))
+
 (define-public font-juliamono
   (package
     (name "font-juliamono")
-- 
2.41.0
Information forwarded to all_but_last@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:
bug#67808; Package guix-patches. Full text available.

Message received at 67808 <at> debbugs.gnu.org:


Received: (at 67808) by debbugs.gnu.org; 14 Dec 2023 14:02:12 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 14 09:02:12 2023
Received: from localhost ([127.0.0.1]:49031 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rDmI0-0004ax-BJ
	for submit <at> debbugs.gnu.org; Thu, 14 Dec 2023 09:02:12 -0500
Received: from vmi571514.contaboserver.net ([75.119.130.101]:50762
 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <saku@HIDDEN>) id 1rDmHx-0004ao-CD
 for 67808 <at> debbugs.gnu.org; Thu, 14 Dec 2023 09:02:11 -0500
Received: from X-kone.org.aalto.fi (unknown [130.233.144.30])
 by mail.laesvuori.fi (Postfix) with ESMTPSA id 19B66343635;
 Thu, 14 Dec 2023 15:02:14 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail;
 t=1702562534; bh=TRlLAWASiH0hmPGYysqsVdkCugcgC2d/wXrDFiO25bk=;
 h=From:To:Cc:Subject:Date:In-Reply-To:References;
 b=mZo4UB8Btsv2G3n8046qVzxVPNmBe0WvKUN8Ve+4OMPCqySmS1vpCN469KBnO8T0l
 DgBVXsK7tEcMF7tG5nz1D5xNofLwWzlsUgO0e18tCa32RqHEqB58S1MdbC/5zty2O7
 Qbccb4AfxJLgmhgJmzV0Nk3LCnFl0bsKs6bn0Mjo=
From: Saku Laesvuori <saku@HIDDEN>
To: 67808 <at> debbugs.gnu.org
Subject: [PATCH v3 2/3] gnu: Add Nerd Font patching procedure
Date: Thu, 14 Dec 2023 16:01:13 +0200
Message-ID: <f9d5a9688aac069792860f92a642949db1f77204.1702561323.git.saku@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <173b07571f7417cc23d53e9557e7ce2871075346.1702561323.git.saku@HIDDEN>
References: <173b07571f7417cc23d53e9557e7ce2871075346.1702561323.git.saku@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Zhu Zihao <all_but_last@HIDDEN>, 宋文武 <iyzsong@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 67808
Cc: Saku Laesvuori <saku@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/fonts.scm (patch-nerd-font): New variable.

Change-Id: Id830424ec68836df7622535207818ff3445c21d4
---
 gnu/packages/fonts.scm | 54 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 813367be8a..3568f38c60 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -59,6 +59,7 @@
 ;;; Copyright © 2023 Denis 'GNUtoo' Carikli <GNUtoo@HIDDEN>
 ;;; Copyright © 2023 chris <chris@HIDDEN>
 ;;; Copyright © 2023 Luis Felipe López Acevedo <sirgazil@HIDDEN>
+;;; Copyright © 2023 Saku Laesvuori <saku@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -103,6 +104,56 @@ (define-module (gnu packages fonts)
   #:use-module (gnu packages sdl)
   #:use-module (gnu packages xorg))
 
+(define-public (patch-nerd-font font-package)
+  "Return a package that contains the same files as FONT-PACKAGE, except
+that all font files are Nerd Fonts patched."
+  (package
+    (name (string-append (package-name font-package) "-nerd-font"))
+    (version (package-version font-package))
+    (source #f)
+    (build-system trivial-build-system)
+    (arguments
+     (list
+      #:builder
+      (with-imported-modules '((guix build utils))
+        #~(begin
+            (use-modules (guix build utils))
+
+            (define (font-file? filename)
+              ;; The regexp's are from guix/build/font-build-system.scm (install)
+              ;; woff2 is excluded because the fontforge in guix is not compiled
+              ;; with support for it
+              ((file-name-predicate "\\.(tt[fc]|ot[fc]|woff)$")
+               filename #f)) ;the 2. argument is stat but it is unused
+
+            (define (output-path source-path)
+              (let* ((name-version/path (strip-store-file-name source-path))
+                     (path-pieces (string-split name-version/path
+                                                file-name-separator?))
+                     (path-in-package (string-join (cdr path-pieces)
+                                                   file-name-separator-string
+                                                   'prefix)))
+                (string-append #$output (dirname path-in-package))))
+
+            (define (install-and-patch-file file)
+              (if (font-file? file)
+                (invoke (string-append #$(this-package-native-input "nerd-font-patcher")
+                                       "/bin/font-patcher")
+                        file "-o" (output-path file) "--complete")
+                (install-file file (output-path file))))
+
+            (for-each install-and-patch-file
+                      (find-files #$(this-package-native-input
+                                      (package-name font-package))))))))
+    (native-inputs (list nerd-font-patcher font-package))
+    (synopsis
+     (string-append (package-synopsis font-package) " (Nerd Fonts patched)"))
+    (description
+     (string-append (package-description font-package)
+                    " Nerd Fonts patching adds thousands of symbolic glyphs."))
+    (home-page (package-home-page font-package))
+    (license (package-license font-package))))
+
 (define-public font-artifika
   (package
     (name "font-artifika")
@@ -2526,6 +2577,9 @@ (define-public font-jetbrains-mono
 in small sizes, the text looks crisper.")
     (license license:asl2.0)))
 
+(define-public font-jetbrains-mono-nerd-font
+  (patch-nerd-font font-jetbrains-mono))
+
 (define-public font-juliamono
   (package
     (name "font-juliamono")
-- 
2.41.0
Information forwarded to all_but_last@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:
bug#67808; Package guix-patches. Full text available.

Message received at 67808 <at> debbugs.gnu.org:


Received: (at 67808) by debbugs.gnu.org; 14 Dec 2023 14:02:08 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 14 09:02:08 2023
Received: from localhost ([127.0.0.1]:49028 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rDmHv-0004af-Ll
	for submit <at> debbugs.gnu.org; Thu, 14 Dec 2023 09:02:08 -0500
Received: from vmi571514.contaboserver.net ([75.119.130.101]:50752
 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <saku@HIDDEN>) id 1rDmHt-0004aU-7q
 for 67808 <at> debbugs.gnu.org; Thu, 14 Dec 2023 09:02:06 -0500
Received: from X-kone.org.aalto.fi (unknown [130.233.144.30])
 by mail.laesvuori.fi (Postfix) with ESMTPSA id DBACF343635;
 Thu, 14 Dec 2023 15:02:09 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail;
 t=1702562530; bh=ggb90R0vV2ypGbqjwJBrj6hD1vSsKUxXB0W4c6wZ2Cw=;
 h=From:To:Cc:Subject:Date;
 b=Mkd+8VOxgysuCB5+MWWCh2eyf9ZgpacjgNylm+gNUr8hS6MeMRIefQo34YMnhN6Hp
 K5tgzxT1ewnNLz8Iu2rwTOox4MN7hhYWkJ/j6l+G9Nv3+UsFtP1opeKQ99fND/5mL2
 KDKPsJ73DsBd8lAIRMDUHUq+ut4QH6qBgoZRwdDk=
From: Saku Laesvuori <saku@HIDDEN>
To: 67808 <at> debbugs.gnu.org
Subject: [PATCH v3 1/3] gnu: Add nerd-font-patcher
Date: Thu, 14 Dec 2023 16:01:12 +0200
Message-ID: <173b07571f7417cc23d53e9557e7ce2871075346.1702561323.git.saku@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
X-Debbugs-Cc: Lars-Dominik Braun <lars@HIDDEN>, Marius Bakke <marius@HIDDEN>,
 Munyoki Kilyungi <me@HIDDEN>, jgart <jgart@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 67808
Cc: Saku Laesvuori <saku@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/python-xyz.scm (nerd-font-patcher): New variable.
* gnu/packages/patches/nerd-font-patcher-convert-to-python-package.patch:
New file

Change-Id: I5f0b99b5120dfa8835727f4ea9f01c235962eed9
---
 ...nt-patcher-convert-to-python-package.patch | 85 +++++++++++++++++++
 gnu/packages/python-xyz.scm                   | 47 ++++++++++
 2 files changed, 132 insertions(+)
 create mode 100644 gnu/packages/patches/nerd-font-patcher-convert-to-python-package.patch

diff --git a/gnu/packages/patches/nerd-font-patcher-convert-to-python-package.patch b/gnu/packages/patches/nerd-font-patcher-convert-to-python-package.patch
new file mode 100644
index 0000000000..400c608f88
--- /dev/null
+++ b/gnu/packages/patches/nerd-font-patcher-convert-to-python-package.patch
@@ -0,0 +1,85 @@
+This patch
+
+* Creates a pyproject.toml file
+* Changes paths to be more sensible.
+
+It requires extra work in a snippet to work properly, because moving the
+files in a patch would effectively duplicate all the code.
+
+ font-patcher                               | 13 ++++---------
+ bin/scripts/name_parser/FontnameParser.py |  2 +-
+ pyproject.toml                             | 13 +++++++++++++
+ 3 files changed, 18 insertions(+), 10 deletions(-)
+ create mode 100644 pyproject.toml
+
+diff --git a/font-patcher b/font-patcher
+index 4cbf46c..89ae402 100755
+--- a/font-patcher
++++ b/font-patcher
+@@ -38,13 +38,9 @@ except ImportError:
+         )
+     )
+ 
+-sys.path.insert(0, os.path.abspath(os.path.dirname(sys.argv[0])) + '/bin/scripts/name_parser/')
+-try:
+-    from FontnameParser import FontnameParser
+-    from FontnameTools import FontnameTools
+-    FontnameParserOK = True
+-except ImportError:
+-    FontnameParserOK = False
++from nerd_font_patcher.name_parser.FontnameParser import FontnameParser
++from nerd_font_patcher.name_parser.FontnameTools import FontnameTools
++FontnameParserOK = True
+ 
+ class TableHEADWriter:
+     """ Access to the HEAD table without external dependencies """
+@@ -1897,7 +1893,7 @@ def setup_arguments():
+     expert_group.add_argument('--custom',                                  dest='custom',           default=False, type=str,            help='Specify a custom symbol font, all glyphs will be copied; absolute path suggested')
+ 
+     expert_group.add_argument('--dry',                                     dest='dry_run',          default=False, action='store_true', help='Do neither patch nor store the font, to check naming')
+-    expert_group.add_argument('--glyphdir',                                dest='glyphdir',         default=__dir__ + "/src/glyphs/", type=str, help='Path to glyphs to be used for patching')
++    expert_group.add_argument('--glyphdir',                                dest='glyphdir',         default=__dir__ + "/share/fonts/nerd-font-glyphs", type=str, help='Path to glyphs to be used for patching')
+     expert_group.add_argument('--has-no-italic',                           dest='noitalic',         default=False, action='store_true', help='Font family does not have Italic (but Oblique), to help create correct RIBBI set')
+     expert_group.add_argument('-l', '--adjust-line-height',                dest='adjustLineHeight', default=False, action='store_true', help='Whether to adjust line heights (attempt to center powerline separators more evenly)')
+     expert_group.add_argument('--metrics',                                 dest='metrics',          default=None, choices=get_metrics_names(), help='Select vertical metrics source (for problematic cases)')
+@@ -2068,5 +2064,4 @@ def main():
+ 
+ 
+ if __name__ == "__main__":
+-    __dir__ = os.path.dirname(os.path.abspath(__file__))
+     main()
+diff --git a/bin/scripts/name_parser/FontnameParser.py b/bin/scripts/name_parser/FontnameParser.py
+index 5768c42..1d95fdc 100644
+--- a/bin/scripts/name_parser/FontnameParser.py
++++ b/bin/scripts/name_parser/FontnameParser.py
+@@ -2,7 +2,7 @@
+ # coding=utf8
+ 
+ import re
+-from FontnameTools import FontnameTools
++from nerd_font_patcher.name_parser.FontnameTools import FontnameTools
+ 
+ class FontnameParser:
+     """Parse a font name and generate all kinds of names"""
+diff --git a/pyproject.toml b/pyproject.toml
+new file mode 100644
+index 0000000..e039e68
+--- /dev/null
++++ b/pyproject.toml
+@@ -0,0 +1,13 @@
++[build-system]
++requires = ["setuptools"]
++build-backend = "setuptools.build_meta"
++
++[project]
++name = "font_patcher"
++version = "3.1.1"
++
++[project.scripts]
++font-patcher = "nerd_font_patcher:main"
++
++[tool.setuptools]
++packages = ["nerd_font_patcher", "nerd_font_patcher.name_parser"]
+-- 
+2.41.0
+
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 86f8d81689..320fd4cb69 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -146,6 +146,7 @@
 ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@HIDDEN>
 ;;; Copyright © 2023 Attila Lendvai <attila@HIDDEN>
 ;;; Copyright © 2023 Troy Figiel <troy@HIDDEN>
+;;; Copyright © 2023 Saku Laesvuori <saku@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -13611,6 +13612,52 @@ (define-public python-fonttools
              python-zopfli))
       (properties (alist-delete 'hidden? (package-properties base))))))
 
+(define-public nerd-font-patcher
+  (package
+    (name "nerd-font-patcher")
+    (version "3.1.1")
+    (source
+     (origin
+       (method url-fetch/zipbomb)
+       (uri
+        (string-append
+         "https://github.com/ryanoasis/nerd-fonts/releases/download/v"
+         version "/FontPatcher.zip"))
+       (sha256
+        (base32 "1wp41ljxa5sjgxhw97cm06icw9n03nmpygr3j9qq3zs5wsxvs4bv"))
+       (snippet #~(begin
+                    (rename-file "bin/scripts" "nerd_font_patcher")
+                    (rename-file "font-patcher" "nerd_font_patcher/__init__.py")))
+       (patches
+        (search-patches "nerd-font-patcher-convert-to-python-package.patch"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:tests? #f ;no tests available
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'build 'patch-__dir__
+            (lambda _
+              (substitute* "nerd_font_patcher/__init__.py"
+                (("__dir__")
+                 (string-append "\"" #$output "\"\n")))))
+          (add-after 'install 'install-glyphs
+            (lambda _
+              (let ((font-directory (string-append #$output "/share/fonts")))
+                (mkdir-p font-directory)
+                (copy-recursively "src/glyphs" (string-append font-directory "/nerd-font-glyphs"))))))))
+    (inputs (list python fontforge))
+    (native-inputs (list python-setuptools))
+    (home-page "https://github.com/ryanoasis/nerd-fonts/#option-9-patch-your-own-font")
+    (synopsis "Script for adding Nerd Fonts glyphs into fonts")
+    (description "This package provides a python script that can be used to add the
+Nerd Fonts glyphs to any font file.")
+    (license (list license:asl2.0
+                   license:cc-by4.0
+                   license:expat
+                   license:silofl1.1
+                   license:unlicense))))
+
 (define-public python-ly
   (package
     (name "python-ly")

base-commit: 4bf4e340b74b66a0fc319aeb100fb1f948a67211
-- 
2.41.0
Information forwarded to lars@HIDDEN, marius@HIDDEN, me@HIDDEN, jgart@HIDDEN, guix-patches@HIDDEN:
bug#67808; Package guix-patches. Full text available.

Message received at 67808 <at> debbugs.gnu.org:


Received: (at 67808) by debbugs.gnu.org; 14 Dec 2023 14:02:01 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 14 09:02:01 2023
Received: from localhost ([127.0.0.1]:49022 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rDmHp-0004Zp-B8
	for submit <at> debbugs.gnu.org; Thu, 14 Dec 2023 09:02:01 -0500
Received: from vmi571514.contaboserver.net ([75.119.130.101]:38820
 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <saku@HIDDEN>) id 1rDmHm-0004Zg-RR
 for 67808 <at> debbugs.gnu.org; Thu, 14 Dec 2023 09:02:00 -0500
Received: from X-kone.org.aalto.fi (unknown [130.233.144.30])
 by mail.laesvuori.fi (Postfix) with ESMTPSA id 7613F343635;
 Thu, 14 Dec 2023 15:02:02 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail;
 t=1702562522; bh=IZeY2Wcv/vVfcx0IElZPO3D+rjGovdrsf/O5OVB8/a8=;
 h=From:To:Cc:Subject:Date;
 b=rkjkcElCsAXIqUOGdEbSvilMo5mQpGqBh0n3zECmEQljVQGVdDdCcmY+K5hIWfkCa
 nizNW5SZLBvWRpwm7/hmKOmZeRrgANrp7V1kAt5Lbgwr9tZxvND4ix0o+iE05+/pym
 Da6m/E2amuGVBKN942btSLLx6Ej6u4/tUU3wo9dc=
From: Saku Laesvuori <saku@HIDDEN>
To: 67808 <at> debbugs.gnu.org
Subject: [PATCH v3 0/3] Add procedure for patching Nerd Fonts
Date: Thu, 14 Dec 2023 16:01:11 +0200
Message-ID: <cover.1702560042.git.saku@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
X-Debbugs-Cc: Zhu Zihao <all_but_last@HIDDEN>, 宋文武 <iyzsong@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 67808
Cc: Saku Laesvuori <saku@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

I had originally planned to package the script that the Nerd Fonts
project uses to patch their fonts and use it to patch the JetBrains Mono
font. Unfortunately, the script is just an unpackaged script and I had
trouble making a sane package definition for it until now.

This series packages that script, adds a procedure for creating a Nerd
Fonts patched copy of an arbitrary package and uses it to package the
JetBrainsMono Nerd Font.

This doesn't depend on the patch series adding missing license files to
many font packages [1] anymore. Changes from the series updating
font-jetbrains-mono[2] that split from this series are independent but
also improve the font-jetbrains-mono-nerd-font package.

[1]: https://issues.guix.gnu.org/61253
[2]: https://issues.guix.gnu.org/67821

Saku Laesvuori (3):
  gnu: Add nerd-font-patcher
  gnu: Add Nerd Font patching procedure
  gnu: Add font-jetbrains-mono-nerd-font

 gnu/packages/fonts.scm                        | 54 ++++++++++++
 ...nt-patcher-convert-to-python-package.patch | 85 +++++++++++++++++++
 gnu/packages/python-xyz.scm                   | 47 ++++++++++
 3 files changed, 186 insertions(+)
 create mode 100644 gnu/packages/patches/nerd-font-patcher-convert-to-python-package.patch


base-commit: 4bf4e340b74b66a0fc319aeb100fb1f948a67211
-- 
2.41.0
Information forwarded to all_but_last@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:
bug#67808; Package guix-patches. Full text available.

Message received at 67808 <at> debbugs.gnu.org:


Received: (at 67808) by debbugs.gnu.org; 14 Dec 2023 07:36:45 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 14 02:36:45 2023
Received: from localhost ([127.0.0.1]:60106 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rDgGy-0002Dd-F3
	for submit <at> debbugs.gnu.org; Thu, 14 Dec 2023 02:36:45 -0500
Received: from vmi571514.contaboserver.net ([75.119.130.101]:35890
 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <saku@HIDDEN>) id 1rDgGv-0002DU-4h
 for 67808 <at> debbugs.gnu.org; Thu, 14 Dec 2023 02:36:43 -0500
Received: from X-kone.org.aalto.fi (unknown [130.233.144.30])
 by mail.laesvuori.fi (Postfix) with ESMTPSA id 56ACF342469;
 Thu, 14 Dec 2023 08:36:28 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail;
 t=1702539388; bh=I1yhYc6an/3hYKH3+P2xOkliIadwyCjyuBfLhYHa+bE=;
 h=From:To:Cc:Subject:Date:In-Reply-To:References;
 b=J78j0JTLcPXSyqNxDNR4/LVzvSQGUBwKfkneAKZQLc4ymFpzd6d3rapEg0i4Wzoxv
 IlSIEFyMNCNFBccIfEEaTW4HF0FnYQJf43sVI4wOvz924aE95yUvfHPnujxTmm/nhg
 Nm/yni1Zr1KxA5gOH0WxzSjOMUSRPoieTYAJRA1c=
From: Saku Laesvuori <saku@HIDDEN>
To: 67808 <at> debbugs.gnu.org
Subject: [PATCH v2 1/1] gnu: Add font-jetbrains-mono-nerd-font
Date: Thu, 14 Dec 2023 09:35:36 +0200
Message-ID: <dbd06e7d31e83e7cbd602ea8f6b5ecdeb2d855d9.1702538852.git.saku@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1702538852.git.saku@HIDDEN>
References: <cover.1702538852.git.saku@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Zhu Zihao <all_but_last@HIDDEN>, 宋文武 <iyzsong@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 67808
Cc: Saku Laesvuori <saku@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/fonts.scm (font-jetbrains-mono-nerd-font): New variable.

Change-Id: I52e3e3fda5fa83b6b0e865b9e56f008f91a4465c
---
 gnu/packages/fonts.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 1cb0576974..e1324bded1 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -59,6 +59,7 @@
 ;;; Copyright © 2023 Denis 'GNUtoo' Carikli <GNUtoo@HIDDEN>
 ;;; Copyright © 2023 chris <chris@HIDDEN>
 ;;; Copyright © 2023 Luis Felipe López Acevedo <sirgazil@HIDDEN>
+;;; Copyright © 2023 Saku Laesvuori <saku@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2532,6 +2533,29 @@ (define-public font-jetbrains-mono
 in small sizes, the text looks crisper.")
     (license license:asl2.0)))
 
+(define-public font-jetbrains-mono-nerd-font
+  (package
+    (name "font-jetbrains-mono-nerd-font")
+    (version "3.1.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/ryanoasis/nerd-fonts/releases/"
+                    "download/v" version "/JetBrainsMono.tar.xz"))
+              (sha256
+               (base32
+                "1f8xi8kgyik59ahjm3pcrb2s02c9a9i6kwf5b4651zpjmjy5l8lj"))))
+    (build-system font-build-system)
+    (arguments '(#:license-file-regexp "^OFL\\.txt$"))
+    (home-page "https://nerdfonts.com")
+    (synopsis "Mono typeface for developers with Nerd Fonts patching")
+    (description
+     "JetBrains Mono is a font family dedicated to developers.  JetBrains
+Mono’s typeface forms are simple and free from unnecessary details.  Rendered
+in small sizes, the text looks crisper. Nerd Fonts patching adds a high number
+of extra glyphs.")
+    (license license:silofl1.1)))
+
 (define-public font-juliamono
   (package
     (name "font-juliamono")
-- 
2.41.0
Information forwarded to all_but_last@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:
bug#67808; Package guix-patches. Full text available.

Message received at 67808 <at> debbugs.gnu.org:


Received: (at 67808) by debbugs.gnu.org; 14 Dec 2023 07:36:40 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 14 02:36:40 2023
Received: from localhost ([127.0.0.1]:60103 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rDgGu-0002DM-2C
	for submit <at> debbugs.gnu.org; Thu, 14 Dec 2023 02:36:40 -0500
Received: from vmi571514.contaboserver.net ([75.119.130.101]:36202
 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <saku@HIDDEN>) id 1rDgGr-0002DA-3f
 for 67808 <at> debbugs.gnu.org; Thu, 14 Dec 2023 02:36:38 -0500
Received: from X-kone.org.aalto.fi (unknown [130.233.144.30])
 by mail.laesvuori.fi (Postfix) with ESMTPSA id 2586E342469;
 Thu, 14 Dec 2023 08:36:24 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail;
 t=1702539384; bh=OoDVCNljIrupU3J98JGgS6jaERg7RaZuOV0toxaILFg=;
 h=From:To:Cc:Subject:Date;
 b=hYbky9vi8Nv+CLNAjWLbZPW0RrZNaSk/5ckW+ZCAcXVk3nP/ujGtg8dOgPT3+R6VN
 Mb95MzPqlrUDUF4kObc/QWyxkfWWGXFner8AcQjJC5pGSJml7R8gFLlVKOiSTotxLv
 A7PvCrYkQg95wycb3AiuTm+VvS/oI6wSoIrf+6jQ=
From: Saku Laesvuori <saku@HIDDEN>
To: 67808 <at> debbugs.gnu.org
Subject: [PATCH v2 0/1] Add JetBrainsMono Nerd Font
Date: Thu, 14 Dec 2023 09:35:35 +0200
Message-ID: <cover.1702538852.git.saku@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
X-Debbugs-Cc: Zhu Zihao <all_but_last@HIDDEN>, 宋文武 <iyzsong@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 67808
Cc: Saku Laesvuori <saku@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

The commits from the earlier serires that don't require the patches
adding the #:license-file-regexp argument have been split to issue
https://issues.guix.gnu.org/67821.

This remaining patch has been rebased on the patch series in
https://issues.guix.gnu.org/61253, which provides a more complete
implementation of #:license-file-regexp and uses it in more packages
that are currently missing license files or require extra phases to
install them.

Saku Laesvuori (1):
  gnu: Add font-jetbrains-mono-nerd-font

 gnu/packages/fonts.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)


base-commit: 4bf4e340b74b66a0fc319aeb100fb1f948a67211
prerequisite-patch-id: f1a3748021e8151006183f5bf8a3453d95348e4f
prerequisite-patch-id: d0efcb0bae4e140993f7357be85bafc7db2a03a9
prerequisite-patch-id: 32722a903edb46f733a99b5f89a8f0d42ee34f6c
prerequisite-patch-id: 3194c603473c81f60dde6feb43a27b3c1660835f
prerequisite-patch-id: 509e75f9191fadc38ec04f2ab989eba0405f2098
prerequisite-patch-id: 0d5568f0f56d4a9aa42259674c1192e1f8341aaf
prerequisite-patch-id: d925c21152992d98567fe4c97fd938aebb86e52c
prerequisite-patch-id: 79976cb8b9c9b844821cfdec23ed13c8b65f1023
prerequisite-patch-id: bace71a67a9b9f31d3a1e3b724329542e82b9beb
prerequisite-patch-id: 0e3995a7ff4d3ee174db5ad470f514fbbed81c88
prerequisite-patch-id: bfee1b31479e96ab5673a3c7a6b29072808b9b26
prerequisite-patch-id: 60ebfde4db3da5ce38eb2d5ea6b4be5e8d8fe1e5
prerequisite-patch-id: 0cdc659948d06ec8ecf0334524fb1475e03476fe
prerequisite-patch-id: e3792b37a113e83822d5193054da424f9f4bccf4
prerequisite-patch-id: d3e99b0184547ac5fc8447594a2401d737bdc95b
prerequisite-patch-id: 46f87c03fa136a6565462a9f9221c129b98e408b
prerequisite-patch-id: bc4cabfd0780e673a604a408aa97fcebe912be68
prerequisite-patch-id: d981276b0d3b8aa436bdaf28e4f9d5afcd781d66
prerequisite-patch-id: 31e1fa56623253a275f7cb65f60adfaa91b4cf59
-- 
2.41.0
Information forwarded to all_but_last@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:
bug#67808; Package guix-patches. Full text available.

Message received at 67808 <at> debbugs.gnu.org:


Received: (at 67808) by debbugs.gnu.org; 14 Dec 2023 06:47:21 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Dec 14 01:47:21 2023
Received: from localhost ([127.0.0.1]:60051 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rDfVA-0000qD-Uz
	for submit <at> debbugs.gnu.org; Thu, 14 Dec 2023 01:47:21 -0500
Received: from vmi571514.contaboserver.net ([75.119.130.101]:43554
 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <saku@HIDDEN>) id 1rDfV7-0000q2-79
 for 67808 <at> debbugs.gnu.org; Thu, 14 Dec 2023 01:47:19 -0500
Received: from X-kone (unknown [130.233.144.30])
 by mail.laesvuori.fi (Postfix) with ESMTPSA id 5544C342469;
 Thu, 14 Dec 2023 07:47:03 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail;
 t=1702536423; bh=8Su2UAk70cTNbaHbIEu7Zf+Vw+QIBoWNlQFq96vtGfg=;
 h=Date:From:To:Cc:Subject:References:In-Reply-To;
 b=wDJ/97zIIwEuIfuh6Ea2ION54fp9/XKU9Qw53Aq75USI7n7PoHXtdMr35ekPH11aT
 3SxtgjrkYodhJLpg6rhLLJKuGGh2UhwH9JyA7N2mME852wEQpmo0MyNPHrJH+beZbX
 VMsPxECeeg1LRPygGtybJ4CHU8BuO8/cwAmvK1cA=
Date: Thu, 14 Dec 2023 08:46:55 +0200
From: Saku Laesvuori <saku@HIDDEN>
To: Simon South <simon@HIDDEN>
Subject: Re: [bug#67808] [PATCH 1/5] guix: build-system: font: Accept
 license-file-regexp keyword argument
Message-ID: <b6irijuetbr4halj2lhcafnpxcecbdr7qhwekdvsfnpsx4bhgb@xqpgpdbwi2id>
References: <123127b6a5bf1c94ff62b0779837a6e54975c81f.1702454367.git.saku@HIDDEN>
 <87zfye2mvd.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature"; boundary="dgrljdmjqexued7b"
Content-Disposition: inline
In-Reply-To: <87zfye2mvd.fsf@HIDDEN>
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 67808
Cc: 67808 <at> debbugs.gnu.org
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)


--dgrljdmjqexued7b
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

> Thanks for raising this again, Saku.
>=20
> The issue of the font-build-system not exposing its %license-file-regexp
> argument affects a number of font packages that either define a
> redundant phase or simply fail to install the right license files from
> their distribution.  I attempted to address the problem comprehensively
> with the patches in issue 61253:
>=20
> https://issues.guix.gnu.org/61253
>=20
> In addition to exposing the "%license-file-regexp" argument the changes
> there also provide a default value that matches common font-license file
> names (including "OFL.txt") and correct the 29 font packages I found to
> have issues.

That looks like a much more complete fix/improvement than mine. Great!

> If there's interest in fixing this, I'm willing to review those patches
> to verify they fix the problem globally.  Saku's update to the
> font-jetbrains-mono package and addition of font-jetbrains-mono-nerd
> could then (and maybe should) be handled each as a separate issue.

Sounds good to me. I'll rebase those patches onto your's now and again
later if needed.

--dgrljdmjqexued7b
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEoMkZR3NPB29fCOn/JX0oSiodOjIFAmV6pN8ACgkQJX0oSiod
OjKuaA/+MpoJ8HV5SvgjxmT+jTaUPFG/rYi6KTm1FZmxPNglM0Nwz8CwO2k/1GGV
/6sqACSb2NhweWf2iJr+ixE946HupYgLuDn8/TXJTcddwhNIKhCTTQSUZ91sAQwc
0fy4rHZKsJZ3nmyTdK0yb3em/tS/8WbRcpTYvUjQGfqqj1a85t6YeovnjGtubkRU
mFl79zF/k+evAz3iaAwURsR6nPyrIjgOAcMsSNayA6kiHmfFpc4qsPqTObiAEO0W
NRrg5HqzHHfW1SKRLvjG63ECbnNZUkPG2aI1mCDE+zTB/rdApLYtCHJ8Yrdbagwm
cc7pJ9rLTtRxMuOKrQFmGmaHPvBpk0AMlWI+azvxnbip2mXxN6uVttdGN/qGF2YL
rJ+2UyzHHpeZo3lR6MDcnTw7DqfMTC3sgry/135R47rRAShi3Owv2/63L7CedOtP
MtNsX7T/enMk6JsWuYQSX3+oCaqBlIBkaTUg312aZBqz5lB3HhpI00+GEkDlKnYS
pUnmlHrvnUr8wE+8UNCbgYqLMAL7++a7mjNC/afwk6bs6CiXgMlpFEkdo+PYPEFU
an2dOzk0DIb5yyZ1I03aIMkSAUu6Dk3Hk2rcLxH0i9sg8ONWTGDyk3v3Xj/am3I4
DE4JY6n0fLci/puG55A8cgJzCNikNZokhUb0TL51PXIHNN66Au0=
=40s+
-----END PGP SIGNATURE-----

--dgrljdmjqexued7b--
Information forwarded to guix-patches@HIDDEN:
bug#67808; Package guix-patches. Full text available.

Message received at 67808 <at> debbugs.gnu.org:


Received: (at 67808) by debbugs.gnu.org; 13 Dec 2023 14:34:25 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Dec 13 09:34:25 2023
Received: from localhost ([127.0.0.1]:58490 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rDQJd-00087P-6u
	for submit <at> debbugs.gnu.org; Wed, 13 Dec 2023 09:34:25 -0500
Received: from mailout.easymail.ca ([64.68.200.34]:53840)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <simon@HIDDEN>) id 1rDQJX-000874-HQ
 for 67808 <at> debbugs.gnu.org; Wed, 13 Dec 2023 09:34:24 -0500
Received: from localhost (localhost [127.0.0.1])
 by mailout.easymail.ca (Postfix) with ESMTP id E1F1665561;
 Wed, 13 Dec 2023 14:33:27 +0000 (UTC)
X-Virus-Scanned: Debian amavisd-new at emo09-pco.easydns.vpn
Received: from mailout.easymail.ca ([127.0.0.1])
 by localhost (emo09-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id KjXC_jQM44FN; Wed, 13 Dec 2023 14:33:27 +0000 (UTC)
Received: from laptop (23-233-96-210.cpe.pppoe.ca [23.233.96.210])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest
 SHA256) (No client certificate requested)
 by mailout.easymail.ca (Postfix) with ESMTPSA id 59EFF6555F;
 Wed, 13 Dec 2023 14:33:27 +0000 (UTC)
From: Simon South <simon@HIDDEN>
To: Saku Laesvuori via Guix-patches via <guix-patches@HIDDEN>
Subject: Re: [bug#67808] [PATCH 1/5] guix: build-system: font: Accept
 license-file-regexp keyword argument
References: <123127b6a5bf1c94ff62b0779837a6e54975c81f.1702454367.git.saku@HIDDEN>
Date: Wed, 13 Dec 2023 09:33:26 -0500
In-Reply-To: <123127b6a5bf1c94ff62b0779837a6e54975c81f.1702454367.git.saku@HIDDEN>
 (Saku Laesvuori via Guix-patches via's message of "Wed, 13 Dec 2023
 10:00:35 +0200")
Message-ID: <87zfye2mvd.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: -2.3 (--)
X-Debbugs-Envelope-To: 67808
Cc: 67808 <at> debbugs.gnu.org, Saku Laesvuori <saku@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)

Thanks for raising this again, Saku.

The issue of the font-build-system not exposing its %license-file-regexp
argument affects a number of font packages that either define a
redundant phase or simply fail to install the right license files from
their distribution.  I attempted to address the problem comprehensively
with the patches in issue 61253:

https://issues.guix.gnu.org/61253

In addition to exposing the "%license-file-regexp" argument the changes
there also provide a default value that matches common font-license file
names (including "OFL.txt") and correct the 29 font packages I found to
have issues.

If there's interest in fixing this, I'm willing to review those patches
to verify they fix the problem globally.  Saku's update to the
font-jetbrains-mono package and addition of font-jetbrains-mono-nerd
could then (and maybe should) be handled each as a separate issue.

-- 
Simon South
simon@HIDDEN
Information forwarded to guix-patches@HIDDEN:
bug#67808; Package guix-patches. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 13 Dec 2023 14:34:13 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Dec 13 09:34:13 2023
Received: from localhost ([127.0.0.1]:58487 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rDQJI-00086i-7x
	for submit <at> debbugs.gnu.org; Wed, 13 Dec 2023 09:34:13 -0500
Received: from lists.gnu.org ([2001:470:142::17]:34814)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <simon@HIDDEN>) id 1rDQJE-00086I-NK
 for submit <at> debbugs.gnu.org; Wed, 13 Dec 2023 09:34:02 -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 <simon@HIDDEN>)
 id 1rDQIn-000060-AO
 for guix-patches@HIDDEN; Wed, 13 Dec 2023 09:33:34 -0500
Received: from mailout.easymail.ca ([64.68.200.34])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <simon@HIDDEN>)
 id 1rDQIk-0008RE-Gw
 for guix-patches@HIDDEN; Wed, 13 Dec 2023 09:33:33 -0500
Received: from localhost (localhost [127.0.0.1])
 by mailout.easymail.ca (Postfix) with ESMTP id E1F1665561;
 Wed, 13 Dec 2023 14:33:27 +0000 (UTC)
X-Virus-Scanned: Debian amavisd-new at emo09-pco.easydns.vpn
Received: from mailout.easymail.ca ([127.0.0.1])
 by localhost (emo09-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id KjXC_jQM44FN; Wed, 13 Dec 2023 14:33:27 +0000 (UTC)
Received: from laptop (23-233-96-210.cpe.pppoe.ca [23.233.96.210])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest
 SHA256) (No client certificate requested)
 by mailout.easymail.ca (Postfix) with ESMTPSA id 59EFF6555F;
 Wed, 13 Dec 2023 14:33:27 +0000 (UTC)
From: Simon South <simon@HIDDEN>
To: Saku Laesvuori via Guix-patches via <guix-patches@HIDDEN>
Subject: Re: [bug#67808] [PATCH 1/5] guix: build-system: font: Accept
 license-file-regexp keyword argument
References: <123127b6a5bf1c94ff62b0779837a6e54975c81f.1702454367.git.saku@HIDDEN>
Date: Wed, 13 Dec 2023 09:33:26 -0500
In-Reply-To: <123127b6a5bf1c94ff62b0779837a6e54975c81f.1702454367.git.saku@HIDDEN>
 (Saku Laesvuori via Guix-patches via's message of "Wed, 13 Dec 2023
 10:00:35 +0200")
Message-ID: <87zfye2mvd.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
Received-SPF: pass client-ip=64.68.200.34; envelope-from=simon@HIDDEN;
 helo=mailout.easymail.ca
X-Spam_score_int: -41
X-Spam_score: -4.2
X-Spam_bar: ----
X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3,
 RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.0 (+)
X-Debbugs-Envelope-To: submit
Cc: 67808 <at> debbugs.gnu.org, Saku Laesvuori <saku@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.0 (/)

Thanks for raising this again, Saku.

The issue of the font-build-system not exposing its %license-file-regexp
argument affects a number of font packages that either define a
redundant phase or simply fail to install the right license files from
their distribution.  I attempted to address the problem comprehensively
with the patches in issue 61253:

https://issues.guix.gnu.org/61253

In addition to exposing the "%license-file-regexp" argument the changes
there also provide a default value that matches common font-license file
names (including "OFL.txt") and correct the 29 font packages I found to
have issues.

If there's interest in fixing this, I'm willing to review those patches
to verify they fix the problem globally.  Saku's update to the
font-jetbrains-mono package and addition of font-jetbrains-mono-nerd
could then (and maybe should) be handled each as a separate issue.

-- 
Simon South
simon@HIDDEN
Information forwarded to guix-patches@HIDDEN:
bug#67808; Package guix-patches. Full text available.

Message received at 67808 <at> debbugs.gnu.org:


Received: (at 67808) by debbugs.gnu.org; 13 Dec 2023 08:03:29 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Dec 13 03:03:29 2023
Received: from localhost ([127.0.0.1]:58129 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rDKDJ-00037c-GD
	for submit <at> debbugs.gnu.org; Wed, 13 Dec 2023 03:03:29 -0500
Received: from vmi571514.contaboserver.net ([75.119.130.101]:49766
 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <saku@HIDDEN>) id 1rDKDI-00037U-90
 for 67808 <at> debbugs.gnu.org; Wed, 13 Dec 2023 03:03:28 -0500
Received: from X-kone.org.aalto.fi (unknown [130.233.144.30])
 by mail.laesvuori.fi (Postfix) with ESMTPSA id BC3643400DF;
 Wed, 13 Dec 2023 09:03:15 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail;
 t=1702454595; bh=TDUD5Am3S0cN7tw6KLUkeyW7pW2ztjFLMYuY5SyxVLw=;
 h=From:To:Cc:Subject:Date:In-Reply-To:References;
 b=CkGTH4PaEKhOGSCpxitWsochVXl0hsKSSz1Df+J6mHn/tl3ICtG8IHNNSrJGxlprP
 DqvZBOs/h1moX7odSQLA25/hsbqoEqZlmMo4AO9tmEmQ26hyfFAfc627oesC7DAS1r
 BfY2GhiytoBO8MM2uyMtSUA4TFVf6GFqonva3R2Y=
From: Saku Laesvuori <saku@HIDDEN>
To: 67808 <at> debbugs.gnu.org
Subject: [PATCH 5/5] gnu: font-jetbrains-mono: Update to 2.304
Date: Wed, 13 Dec 2023 10:02:38 +0200
Message-ID: <85eb65309f34d0594b086347fc672a08af67c5de.1702454367.git.saku@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <123127b6a5bf1c94ff62b0779837a6e54975c81f.1702454367.git.saku@HIDDEN>
References: <123127b6a5bf1c94ff62b0779837a6e54975c81f.1702454367.git.saku@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Zhu Zihao <all_but_last@HIDDEN>, 宋文武 <iyzsong@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 67808
Cc: Saku Laesvuori <saku@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/fonts.scm (font-jetbrains-mono): Update to version 2.304.

Change-Id: Id325fda8f9b50cf830107823c6ca1b439a6bdca0
---
 gnu/packages/fonts.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 52e9cb0987..a2bb8a1065 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -2495,7 +2495,7 @@ (define-public font-sil-ezra
 (define-public font-jetbrains-mono
   (package
     (name "font-jetbrains-mono")
-    (version "2.242")
+    (version "2.304")
     (source
      (origin
        (method url-fetch)
@@ -2503,7 +2503,7 @@ (define-public font-jetbrains-mono
         (string-append "https://github.com/JetBrains/JetBrainsMono/releases/"
                        "download/v" version "/JetBrainsMono-" version ".zip"))
        (sha256
-        (base32 "17qs985v38x3rcg3v4av3qynwr4gvixrj50vjzy7zkkny575ncaf"))))
+        (base32 "1gvv5w0vfzndzp8k7g15j5i3yvnpr5z3imrwjs5flq19xp37cqvg"))))
     (build-system font-build-system)
     (arguments
      `(#:phases
-- 
2.41.0
Information forwarded to all_but_last@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:
bug#67808; Package guix-patches. Full text available.

Message received at 67808 <at> debbugs.gnu.org:


Received: (at 67808) by debbugs.gnu.org; 13 Dec 2023 08:03:27 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Dec 13 03:03:27 2023
Received: from localhost ([127.0.0.1]:58126 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rDKDH-00037J-5X
	for submit <at> debbugs.gnu.org; Wed, 13 Dec 2023 03:03:27 -0500
Received: from vmi571514.contaboserver.net ([75.119.130.101]:49758
 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <saku@HIDDEN>) id 1rDKDF-000375-7d
 for 67808 <at> debbugs.gnu.org; Wed, 13 Dec 2023 03:03:25 -0500
Received: from X-kone.org.aalto.fi (unknown [130.233.144.30])
 by mail.laesvuori.fi (Postfix) with ESMTPSA id B88A93400DF;
 Wed, 13 Dec 2023 09:03:12 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail;
 t=1702454592; bh=q2gFpFsyUxGwGymW35bvwDW54BkWHHFg9D7R3HcuYV8=;
 h=From:To:Cc:Subject:Date:In-Reply-To:References;
 b=CciWlVljUd2RhEXylMBtj1lxCJVf2zJL+nF4y03c1J0FrRXMY0R7g8uqyxSe0vDb3
 U6qx+Dh3FOfYuVh7S3AUgc6SdqYvzoVSyuf/lfwv3PQPyrMq496FzI8Mpx5pWlGEZT
 vK4XPpOMT2ef5SNX8OZR5XiLuW0w9dfM9EC9lJIY=
From: Saku Laesvuori <saku@HIDDEN>
To: 67808 <at> debbugs.gnu.org
Subject: [PATCH 4/5] gnu: font-jetbrains-mono: Use the correct license.
Date: Wed, 13 Dec 2023 10:02:37 +0200
Message-ID: <96d08c872e805bd3fdd3612c0f9c2baa0ed9c302.1702454367.git.saku@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <123127b6a5bf1c94ff62b0779837a6e54975c81f.1702454367.git.saku@HIDDEN>
References: <123127b6a5bf1c94ff62b0779837a6e54975c81f.1702454367.git.saku@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Zhu Zihao <all_but_last@HIDDEN>, 宋文武 <iyzsong@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 67808
Cc: Saku Laesvuori <saku@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

The build scripts are licensed under asl2.0 but the packaged font files
are licensed under silofl1.1.

* gnu/packages/fonts.scm (font-jetbrains-mono)[license]: Use silofl1.1
instead of asl2.0.

Change-Id: I256a89b6e4bdb368c9cc94cae0808f72c76e7599
---
 gnu/packages/fonts.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 3f4f5ae847..52e9cb0987 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -2520,7 +2520,7 @@ (define-public font-jetbrains-mono
      "JetBrains Mono is a font family dedicated to developers.  JetBrains
 Mono’s typeface forms are simple and free from unnecessary details.  Rendered
 in small sizes, the text looks crisper.")
-    (license license:asl2.0)))
+    (license license:silofl1.1)))
 
 (define-public font-jetbrains-mono-nerd-font
   (package
-- 
2.41.0
Information forwarded to all_but_last@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:
bug#67808; Package guix-patches. Full text available.

Message received at 67808 <at> debbugs.gnu.org:


Received: (at 67808) by debbugs.gnu.org; 13 Dec 2023 08:03:27 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Dec 13 03:03:27 2023
Received: from localhost ([127.0.0.1]:58124 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rDKDG-00037F-M0
	for submit <at> debbugs.gnu.org; Wed, 13 Dec 2023 03:03:27 -0500
Received: from vmi571514.contaboserver.net ([75.119.130.101]:49756
 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <saku@HIDDEN>) id 1rDKDC-00036r-Ka
 for 67808 <at> debbugs.gnu.org; Wed, 13 Dec 2023 03:03:23 -0500
Received: from X-kone.org.aalto.fi (unknown [130.233.144.30])
 by mail.laesvuori.fi (Postfix) with ESMTPSA id 0C2CE3400DF;
 Wed, 13 Dec 2023 09:03:10 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail;
 t=1702454590; bh=06GdeqLHPpWNAIl/mZoJw7YpeB4gevrauCAoeO/pxUU=;
 h=From:To:Cc:Subject:Date:In-Reply-To:References;
 b=M+zTLbZO6731FaXq1lTn2zMNTebpkZZomtdIpyB2sb9x3f8VjXyv0S1ZaRNh8qNDj
 9wmnjCBLO5K3YmBZ63FhNUsXPJuXMhkkwuwL/UsF+ceCjL3oLF8YHl85KPAtKio7sT
 9PQEPwKljncb049gZoxgQiOZ+bL8E1bMKffaeMaE=
From: Saku Laesvuori <saku@HIDDEN>
To: 67808 <at> debbugs.gnu.org
Subject: [PATCH 3/5] gnu: font-jetbrains-mono: Use license-file-regexp argument
Date: Wed, 13 Dec 2023 10:02:36 +0200
Message-ID: <e74e5dd436c48a28f62426ba90cae11e771cba64.1702454367.git.saku@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <123127b6a5bf1c94ff62b0779837a6e54975c81f.1702454367.git.saku@HIDDEN>
References: <123127b6a5bf1c94ff62b0779837a6e54975c81f.1702454367.git.saku@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Zhu Zihao <all_but_last@HIDDEN>, 宋文武 <iyzsong@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 67808
Cc: Saku Laesvuori <saku@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/fonts.scm (font-jetbrains-mono)[arguments]: Replace
custom 'install-license-files build phase with license-file-regexp
argument.

Change-Id: Ie8b851b04c84c63c5e1abb1e75c9312b4729be57
---
 gnu/packages/fonts.scm | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index f88a715fae..3f4f5ae847 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -2512,13 +2512,8 @@ (define-public font-jetbrains-mono
            ;; Find the license file outside of the default subdirectory.
            (lambda _
              (chdir "..")
-             #t))
-         (replace 'install-license-files
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (doc (string-append out "/share/doc/" ,name "-" ,version)))
-               (install-file "OFL.txt" doc)
-               #t))))))
+             #t)))
+       #:license-file-regexp "^OFL\\.txt$"))
     (home-page "https://www.jetbrains.com/lp/mono/")
     (synopsis "Mono typeface for developers")
     (description
-- 
2.41.0
Information forwarded to all_but_last@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:
bug#67808; Package guix-patches. Full text available.

Message received at 67808 <at> debbugs.gnu.org:


Received: (at 67808) by debbugs.gnu.org; 13 Dec 2023 08:03:22 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Dec 13 03:03:22 2023
Received: from localhost ([127.0.0.1]:58120 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rDKDC-00036q-6i
	for submit <at> debbugs.gnu.org; Wed, 13 Dec 2023 03:03:22 -0500
Received: from vmi571514.contaboserver.net ([75.119.130.101]:35568
 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <saku@HIDDEN>) id 1rDKD9-00036e-Ab
 for 67808 <at> debbugs.gnu.org; Wed, 13 Dec 2023 03:03:21 -0500
Received: from X-kone.org.aalto.fi (unknown [130.233.144.30])
 by mail.laesvuori.fi (Postfix) with ESMTPSA id B64583400DF;
 Wed, 13 Dec 2023 09:03:06 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail;
 t=1702454586; bh=z7t/SpkIDh+fbH7AQ+8/APEO9b5sthk0rCztIwT2/kk=;
 h=From:To:Cc:Subject:Date:In-Reply-To:References;
 b=gxXlGsYY//4zP2rDCRt7lCd5jnSUyxjTy5WGkB86gQJ9ZZjTstH9c7lbey0gPhQit
 r6jWUUJFZ2llrfqubWHc5/BgYZt4Wl24ugz0HDNx2cK33U+IVk5Uedze6OyzyZGUWg
 Zh7jH33mY7bwm0VOtzGV7QNLr1fYm+nM5diqkp5o=
From: Saku Laesvuori <saku@HIDDEN>
To: 67808 <at> debbugs.gnu.org
Subject: [PATCH 2/5] gnu: Add font-jetbrains-mono-nerd-font
Date: Wed, 13 Dec 2023 10:02:35 +0200
Message-ID: <7be7f388a88ecf4ce0e0bbad26398b4c8637345f.1702454367.git.saku@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <123127b6a5bf1c94ff62b0779837a6e54975c81f.1702454367.git.saku@HIDDEN>
References: <123127b6a5bf1c94ff62b0779837a6e54975c81f.1702454367.git.saku@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Zhu Zihao <all_but_last@HIDDEN>, 宋文武 <iyzsong@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-Debbugs-Envelope-To: 67808
Cc: Saku Laesvuori <saku@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* gnu/packages/fonts.scm (font-jetbrains-mono-nerd-font): New variable.

Change-Id: I52e3e3fda5fa83b6b0e865b9e56f008f91a4465c
---
 gnu/packages/fonts.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 813367be8a..f88a715fae 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -59,6 +59,7 @@
 ;;; Copyright © 2023 Denis 'GNUtoo' Carikli <GNUtoo@HIDDEN>
 ;;; Copyright © 2023 chris <chris@HIDDEN>
 ;;; Copyright © 2023 Luis Felipe López Acevedo <sirgazil@HIDDEN>
+;;; Copyright © 2023 Saku Laesvuori <saku@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2526,6 +2527,29 @@ (define-public font-jetbrains-mono
 in small sizes, the text looks crisper.")
     (license license:asl2.0)))
 
+(define-public font-jetbrains-mono-nerd-font
+  (package
+    (name "font-jetbrains-mono-nerd-font")
+    (version "3.1.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://github.com/ryanoasis/nerd-fonts/releases/"
+                    "download/v" version "/JetBrainsMono.tar.xz"))
+              (sha256
+               (base32
+                "1f8xi8kgyik59ahjm3pcrb2s02c9a9i6kwf5b4651zpjmjy5l8lj"))))
+    (build-system font-build-system)
+    (arguments '(#:license-file-regexp "^OFL\\.txt$"))
+    (home-page "https://nerdfonts.com")
+    (synopsis "Mono typeface for developers with Nerd Fonts patching")
+    (description
+     "JetBrains Mono is a font family dedicated to developers.  JetBrains
+Mono’s typeface forms are simple and free from unnecessary details.  Rendered
+in small sizes, the text looks crisper. Nerd Fonts patching adds a high number
+of extra glyphs.")
+    (license license:silofl1.1)))
+
 (define-public font-juliamono
   (package
     (name "font-juliamono")
-- 
2.41.0
Information forwarded to all_but_last@HIDDEN, iyzsong@HIDDEN, guix-patches@HIDDEN:
bug#67808; Package guix-patches. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 13 Dec 2023 08:01:42 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Dec 13 03:01:42 2023
Received: from localhost ([127.0.0.1]:58115 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1rDKBZ-00033d-LI
	for submit <at> 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 <saku@HIDDEN>) id 1rDKBX-00033K-Hy
 for submit <at> 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 <saku@HIDDEN>) id 1rDKB0-000542-2j
 for guix-patches@HIDDEN; 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 <saku@HIDDEN>) id 1rDKAt-0000c9-My
 for guix-patches@HIDDEN; 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=
From: Saku Laesvuori <saku@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH 1/5] guix: build-system: font: Accept license-file-regexp
 keyword argument
Date: Wed, 13 Dec 2023 10:00:35 +0200
Message-ID: <123127b6a5bf1c94ff62b0779837a6e54975c81f.1702454367.git.saku@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=75.119.130.101; envelope-from=saku@HIDDEN;
 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-Spam-Score: 0.9 (/)
X-Debbugs-Envelope-To: submit
Cc: Saku Laesvuori <saku@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.1 (/)

* 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(+)

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

base-commit: 4bf4e340b74b66a0fc319aeb100fb1f948a67211
-- 
2.41.0
Acknowledgement sent to Saku Laesvuori <saku@HIDDEN>:
New bug report received and forwarded. Copy sent to guix-patches@HIDDEN. Full text available.
Report forwarded to guix-patches@HIDDEN:
bug#67808; Package guix-patches. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Last modified: Sat, 20 Jan 2024 12:30:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.