Package: guix-patches;
Reported by: Kurome <hunt31999 <at> gmail.com>
Date: Mon, 7 Apr 2025 09:04:02 UTC
Severity: normal
Tags: patch
To reply to this bug, email your comments to 77601 AT debbugs.gnu.org.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#77601; Package guix-patches.
(Mon, 07 Apr 2025 09:04:02 GMT) Full text and rfc822 format available.Kurome <hunt31999 <at> gmail.com>:guix-patches <at> gnu.org.
(Mon, 07 Apr 2025 09:04:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Kurome <hunt31999 <at> gmail.com> To: guix-patches <at> gnu.org Cc: Kurome <hunt31999 <at> gmail.com> Subject: [PATCH 0/2] gnu: font-fira-sans: Update to 4.301 Date: Mon, 7 Apr 2025 17:54:50 +0900
The comment mentioned that this is the final version including the source code. However, many fonts included in Guix do not come with source code, so I believe this is acceptable. Additionally, other package distributors also appear to be packaging the latest version (see below). Therefore, I updated it. Please let me know if there is anything wrong. * https://gitlab.archlinux.org/archlinux/packaging/packages/fira-sans/-/blob/main/PKGBUILD?ref_type=heads * https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/by-name/fi/fira-sans/package.nix Other changes: * The license file had been moved, so I made the necessary change. * It was a VCS snapshot, so I changed it to the corresponding format. * Changed to use gexp for arguments Kurome (2): gnu: font-fira-sans: Update to (git-version 4.301 revision commit). gnu: font-fira-mono: Update to (git-version 3.206 revision commit). gnu/packages/fonts.scm | 112 ++++++++++++++++++++--------------------- 1 file changed, 56 insertions(+), 56 deletions(-) -- 2.49.0
guix-patches <at> gnu.org:bug#77601; Package guix-patches.
(Mon, 07 Apr 2025 09:06:02 GMT) Full text and rfc822 format available.Message #8 received at 77601 <at> debbugs.gnu.org (full text, mbox):
From: Kurome <hunt31999 <at> gmail.com> To: 77601 <at> debbugs.gnu.org Cc: Kurome <hunt31999 <at> gmail.com> Subject: [PATCH 1/2] gnu: font-fira-sans: Update to (git-version 4.301 revision commit). Date: Mon, 7 Apr 2025 18:04:54 +0900
* gnu/packages/fonts.scm (font-fira-sans): Update to (git-version 4.301 revision commit).
Change-Id: Ib8e2a4fc194cf1886e0679c0824684700f4e728e
---
gnu/packages/fonts.scm | 92 +++++++++++++++++++++---------------------
1 file changed, 45 insertions(+), 47 deletions(-)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 75b1bee6e2..33456697cd 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -1664,11 +1664,6 @@ (define-public font-microsoft-cascadia
(license license:silofl1.1)))
(define-public font-fira-sans
- ;; Fira Sans v4.203 (which corresponds to Fira Mono v3.206) is the final
- ;; version to include UFO sources. It is the same version packaged by other
- ;; notable distributors, including Google Fonts. Note that the "reserved
- ;; font name" was removed by the copyright holders.
- ;;
;; The upstream release includes a "Fira Code" which "is Fira Mono 3.206
;; with less Line Space (1.0) – does not include programming ligatures". We
;; do not package that: our 'font-fira-code' package (like e.g. Debian's
@@ -1683,48 +1678,51 @@ (define-public font-fira-sans
;; See also:
;; - https://github.com/mozilla/Fira/pull/219
;; - https://github.com/bBoxType/FiraSans/issues/4#issuecomment-695833327
- (package
- (name "font-fira-sans")
- (version "4.203")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/bBoxType/FiraSans")
- (commit "a606927401bcc3951587339fee53aa882856b51b")))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1r9kb7v9jg83nnxwkl6gx9ix1rng3ksr7v33qrm46qb4fhwsyc2n"))))
- (build-system font-build-system)
- (arguments
- `(#:modules
- ((ice-9 match)
- (ice-9 regex)
- (guix build utils)
- (guix build font-build-system))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'chdir
- (lambda* (#:key outputs #:allow-other-keys)
- (define-values (pkg-name _version)
- (package-name->name+version
- (strip-store-file-name (assoc-ref outputs "out"))))
- (define variant
- (string-capitalize
- (match:substring (string-match "fira-([a-z]+)" pkg-name) 1)))
- (match (find-files "." (format #f "^Fira_~a_[0-9]" variant)
- #:directories? #t)
- ((dir)
- (chdir dir)))))
- (add-before 'install-license-files 'enter-license-directory
- (lambda _
- (chdir "../OFL_Licence"))))))
- ;; While the repository has moved,
- ;; this specimen still works well as the home-page:
- (home-page "https://mozilla.github.io/Fira/")
- (synopsis
- "Humanist sans-serif with numerous weights emphasizing legibility")
- (description "Fira Sans is a humanist sans-serif typeface with an emphasis
+ (let ((commit "f54eeb3124c63fe9b5bcd36d09d1cd46788cd15e")
+ (revision "1"))
+ (package
+ (name "font-fira-sans")
+ (version (git-version "4.301" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/bBoxType/FiraSans")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1081x67dbmm2x4ckq67a8d6ia209x6jp70swl4w9v9nl1ci03jn3"))))
+ (build-system font-build-system)
+ (arguments
+ (list
+ #:modules
+ '((ice-9 match)
+ (ice-9 regex)
+ (guix build utils)
+ (guix build font-build-system))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'chdir
+ (lambda* (#:key outputs #:allow-other-keys)
+ (define-values (pkg-name _version)
+ (package-name->name+version
+ (strip-store-file-name (assoc-ref outputs "out"))))
+ (define variant
+ (string-capitalize
+ (match:substring (string-match "fira-([a-z]+)" pkg-name) 1)))
+ (match (find-files "." (format #f "^Fira_~a_[0-9]" variant)
+ #:directories? #t)
+ ((dir)
+ (chdir dir)))))
+ (add-before 'install-license-files 'enter-license-directory
+ (lambda _
+ (chdir ".."))))))
+ ;; While the repository has moved,
+ ;; this specimen still works well as the home-page:
+ (home-page "https://mozilla.github.io/Fira/")
+ (synopsis
+ "Humanist sans-serif with numerous weights emphasizing legibility")
+ (description "Fira Sans is a humanist sans-serif typeface with an emphasis
on legibility, commissioned by Mozilla from Erik Spiekermann and Ralph du
Carrois. The large family includes 2,709 glyphs in normal, condensed, and
compressed cuts at 11 weights (plus 6 experimental weights), each with
--
2.49.0
guix-patches <at> gnu.org:bug#77601; Package guix-patches.
(Mon, 07 Apr 2025 09:06:02 GMT) Full text and rfc822 format available.Message #11 received at 77601 <at> debbugs.gnu.org (full text, mbox):
From: Kurome <hunt31999 <at> gmail.com> To: 77601 <at> debbugs.gnu.org Cc: Kurome <hunt31999 <at> gmail.com> Subject: [PATCH 2/2] gnu: font-fira-mono: Update to (git-version 3.206 revision commit). Date: Mon, 7 Apr 2025 18:04:55 +0900
* gnu/packages/fonts.scm (font-fira-mono): Update to (git-version 3.206 revision commit).
Change-Id: I125749cfac3c3f0a27c6c9326c66830ae36553f4
---
gnu/packages/fonts.scm | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 33456697cd..d602f73581 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -1729,18 +1729,20 @@ (define variant
corresponding italics.
The package @code{font-fira-mono} provides a corresponding monospace cut.")
- (license license:silofl1.1)))
+ (license license:silofl1.1))))
(define-public font-fira-mono
- (package
- (inherit font-fira-sans)
- (name "font-fira-mono")
- (version "3.206")
- (synopsis "Monospace cut of Fira Sans")
- (description
- "Fira Mono is a monospace cut of Fira Sans (see @code{font-fira-sans}).
+ (let ((commit "f54eeb3124c63fe9b5bcd36d09d1cd46788cd15e")
+ (revision "1"))
+ (package
+ (inherit font-fira-sans)
+ (name "font-fira-mono")
+ (version (git-version "3.206" revision commit))
+ (synopsis "Monospace cut of Fira Sans")
+ (description
+ "Fira Mono is a monospace cut of Fira Sans (see @code{font-fira-sans}).
It includes regular, medium, and bold weights.")
- (license license:silofl1.1)))
+ (license license:silofl1.1))))
(define-public font-fira-go
(package
--
2.49.0
guix-patches <at> gnu.org:bug#77601; Package guix-patches.
(Mon, 07 Apr 2025 14:54:01 GMT) Full text and rfc822 format available.Message #14 received at 77601 <at> debbugs.gnu.org (full text, mbox):
From: Kurome <hunt31999 <at> gmail.com> To: 77601 <at> debbugs.gnu.org Cc: Kurome <hunt31999 <at> gmail.com> Subject: [PATCH v2 0/2] gnu: Update font-fira-sans Date: Mon, 7 Apr 2025 23:52:56 +0900
Fixed commit message. Kurome (2): gnu: font-fira-sans: Update to 4.301-1.f54eeb3 gnu: font-fira-mono: Add revision number. gnu/packages/fonts.scm | 112 ++++++++++++++++++++--------------------- 1 file changed, 56 insertions(+), 56 deletions(-) -- 2.49.0
guix <at> cbaines.net, ludo <at> gnu.org, othacehe <at> gnu.org, zimon.toutoune <at> gmail.com, me <at> tobias.gr, jgart <at> dismail.de, guix-patches <at> gnu.org:bug#77601; Package guix-patches.
(Mon, 07 Apr 2025 14:58:01 GMT) Full text and rfc822 format available.Message #17 received at 77601 <at> debbugs.gnu.org (full text, mbox):
From: Kurome <hunt31999 <at> gmail.com> To: 77601 <at> debbugs.gnu.org Cc: Kurome <hunt31999 <at> gmail.com> Subject: [PATCH v2 1/2] gnu: font-fira-sans: Update to 4.301-1.f54eeb3 Date: Mon, 7 Apr 2025 23:55:56 +0900
The former comment mentioned that this is the final version including the
source code. However, many fonts included in Guix do not come with source
code, so I believe this is acceptable.
* gnu/packages/fonts.scm (font-fira-sans): Update to 4.301-1.f54eeb3. Add
revision number.
[version]: Use git-version.
[arguments]: Use G-Expression.
<#:phases>: Modify 'enter-license-directory because the license
directory has changed.
Change-Id: Ib8e2a4fc194cf1886e0679c0824684700f4e728e
---
gnu/packages/fonts.scm | 92 +++++++++++++++++++++---------------------
1 file changed, 45 insertions(+), 47 deletions(-)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 75b1bee6e2..33456697cd 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -1664,11 +1664,6 @@ (define-public font-microsoft-cascadia
(license license:silofl1.1)))
(define-public font-fira-sans
- ;; Fira Sans v4.203 (which corresponds to Fira Mono v3.206) is the final
- ;; version to include UFO sources. It is the same version packaged by other
- ;; notable distributors, including Google Fonts. Note that the "reserved
- ;; font name" was removed by the copyright holders.
- ;;
;; The upstream release includes a "Fira Code" which "is Fira Mono 3.206
;; with less Line Space (1.0) – does not include programming ligatures". We
;; do not package that: our 'font-fira-code' package (like e.g. Debian's
@@ -1683,48 +1678,51 @@ (define-public font-fira-sans
;; See also:
;; - https://github.com/mozilla/Fira/pull/219
;; - https://github.com/bBoxType/FiraSans/issues/4#issuecomment-695833327
- (package
- (name "font-fira-sans")
- (version "4.203")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/bBoxType/FiraSans")
- (commit "a606927401bcc3951587339fee53aa882856b51b")))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1r9kb7v9jg83nnxwkl6gx9ix1rng3ksr7v33qrm46qb4fhwsyc2n"))))
- (build-system font-build-system)
- (arguments
- `(#:modules
- ((ice-9 match)
- (ice-9 regex)
- (guix build utils)
- (guix build font-build-system))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'chdir
- (lambda* (#:key outputs #:allow-other-keys)
- (define-values (pkg-name _version)
- (package-name->name+version
- (strip-store-file-name (assoc-ref outputs "out"))))
- (define variant
- (string-capitalize
- (match:substring (string-match "fira-([a-z]+)" pkg-name) 1)))
- (match (find-files "." (format #f "^Fira_~a_[0-9]" variant)
- #:directories? #t)
- ((dir)
- (chdir dir)))))
- (add-before 'install-license-files 'enter-license-directory
- (lambda _
- (chdir "../OFL_Licence"))))))
- ;; While the repository has moved,
- ;; this specimen still works well as the home-page:
- (home-page "https://mozilla.github.io/Fira/")
- (synopsis
- "Humanist sans-serif with numerous weights emphasizing legibility")
- (description "Fira Sans is a humanist sans-serif typeface with an emphasis
+ (let ((commit "f54eeb3124c63fe9b5bcd36d09d1cd46788cd15e")
+ (revision "1"))
+ (package
+ (name "font-fira-sans")
+ (version (git-version "4.301" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/bBoxType/FiraSans")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1081x67dbmm2x4ckq67a8d6ia209x6jp70swl4w9v9nl1ci03jn3"))))
+ (build-system font-build-system)
+ (arguments
+ (list
+ #:modules
+ '((ice-9 match)
+ (ice-9 regex)
+ (guix build utils)
+ (guix build font-build-system))
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'chdir
+ (lambda* (#:key outputs #:allow-other-keys)
+ (define-values (pkg-name _version)
+ (package-name->name+version
+ (strip-store-file-name (assoc-ref outputs "out"))))
+ (define variant
+ (string-capitalize
+ (match:substring (string-match "fira-([a-z]+)" pkg-name) 1)))
+ (match (find-files "." (format #f "^Fira_~a_[0-9]" variant)
+ #:directories? #t)
+ ((dir)
+ (chdir dir)))))
+ (add-before 'install-license-files 'enter-license-directory
+ (lambda _
+ (chdir ".."))))))
+ ;; While the repository has moved,
+ ;; this specimen still works well as the home-page:
+ (home-page "https://mozilla.github.io/Fira/")
+ (synopsis
+ "Humanist sans-serif with numerous weights emphasizing legibility")
+ (description "Fira Sans is a humanist sans-serif typeface with an emphasis
on legibility, commissioned by Mozilla from Erik Spiekermann and Ralph du
Carrois. The large family includes 2,709 glyphs in normal, condensed, and
compressed cuts at 11 weights (plus 6 experimental weights), each with
--
2.49.0
guix <at> cbaines.net, ludo <at> gnu.org, othacehe <at> gnu.org, zimon.toutoune <at> gmail.com, me <at> tobias.gr, jgart <at> dismail.de, guix-patches <at> gnu.org:bug#77601; Package guix-patches.
(Mon, 07 Apr 2025 14:58:02 GMT) Full text and rfc822 format available.Message #20 received at 77601 <at> debbugs.gnu.org (full text, mbox):
From: Kurome <hunt31999 <at> gmail.com> To: 77601 <at> debbugs.gnu.org Cc: Kurome <hunt31999 <at> gmail.com> Subject: [PATCH v2 2/2] gnu: font-fira-mono: Add revision number. Date: Mon, 7 Apr 2025 23:55:57 +0900
* gnu/packages/fonts.scm (font-fira-mono): Add revision number.
[version]: Use git-version.
Change-Id: I125749cfac3c3f0a27c6c9326c66830ae36553f4
---
gnu/packages/fonts.scm | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 33456697cd..d602f73581 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -1729,18 +1729,20 @@ (define variant
corresponding italics.
The package @code{font-fira-mono} provides a corresponding monospace cut.")
- (license license:silofl1.1)))
+ (license license:silofl1.1))))
(define-public font-fira-mono
- (package
- (inherit font-fira-sans)
- (name "font-fira-mono")
- (version "3.206")
- (synopsis "Monospace cut of Fira Sans")
- (description
- "Fira Mono is a monospace cut of Fira Sans (see @code{font-fira-sans}).
+ (let ((commit "f54eeb3124c63fe9b5bcd36d09d1cd46788cd15e")
+ (revision "1"))
+ (package
+ (inherit font-fira-sans)
+ (name "font-fira-mono")
+ (version (git-version "3.206" revision commit))
+ (synopsis "Monospace cut of Fira Sans")
+ (description
+ "Fira Mono is a monospace cut of Fira Sans (see @code{font-fira-sans}).
It includes regular, medium, and bold weights.")
- (license license:silofl1.1)))
+ (license license:silofl1.1))))
(define-public font-fira-go
(package
--
2.49.0
guix-patches <at> gnu.org:bug#77601; Package guix-patches.
(Tue, 08 Apr 2025 07:41:02 GMT) Full text and rfc822 format available.Message #23 received at 77601 <at> debbugs.gnu.org (full text, mbox):
From: krm sry <hunt31999 <at> gmail.com> To: 77601 <at> debbugs.gnu.org Subject: GNU FSDG Date: Tue, 8 Apr 2025 16:39:50 +0900
[Message part 1 (text/plain, inline)]
Probably this is not acceptable by GNU FSDG criteria. If so, please abort this patch.
[Message part 2 (text/html, inline)]
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.