[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: gnu: font-abattis-cantarell: Update variable name.
|
From: |
guix-commits |
|
Subject: |
02/02: gnu: font-abattis-cantarell: Update variable name. |
|
Date: |
Fri, 15 Oct 2021 12:40:59 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 44469ffd83f8dd48355954eee50002efbbe58503
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Fri Oct 15 18:10:33 2021 +0200
gnu: font-abattis-cantarell: Update variable name.
* gnu/packages/fonts.scm (font-cantarell): Rename to…
(font-abattis-cantarell): …this.
* gnu/packages/gnome.scm (gnome)[propagated-inputs]: Adjust accordingly.
* gnu/packages/mate.scm (mate)[inputs]: Likewise.
* gnu/services/xorg.scm (<gdm-configuration>): Likewise.
---
gnu/packages/fonts.scm | 6 +++---
gnu/packages/gnome.scm | 2 +-
gnu/packages/gtk.scm | 2 +-
gnu/packages/mate.scm | 2 +-
gnu/services/xorg.scm | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 5cf2393..de1acc5 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -197,10 +197,10 @@ includes lining and old-style numerals, tabular and
proportional. Greek,
Cyrillic, Canadian Syllabics and most Latin based languages are supported.")
(license license:cc0)))
-(define-public font-cantarell
+(define-public font-abattis-cantarell
(package
(name "font-abattis-cantarell")
- (version "0.301")
+ (version "0.303")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/cantarell-fonts/"
@@ -208,7 +208,7 @@ Cyrillic, Canadian Syllabics and most Latin based languages
are supported.")
"/cantarell-fonts-" version ".tar.xz"))
(sha256
(base32
- "10sycxscs9kzl451mhygyj2qj8qlny8pamskb86np7izq05dnd9x"))))
+ "11sycxscs9kzl451mhygyj2qj8qlny8pamskb86np7izq05dnd9x"))))
(build-system meson-build-system)
(native-inputs
`(("gettext" ,gettext-minimal))) ; for msgfmt
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 17fb2e0..20c0be8 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9242,7 +9242,7 @@ world.")
;; Packages not part of GNOME proper but that are needed for a good
;; experience. See <https://bugs.gnu.org/39646>.
;; XXX: Find out exactly which ones are needed and why.
- ("font-cantarell" ,font-cantarell)
+ ("font-abattis-cantarell" ,font-abattis-cantarell)
("font-dejavu" ,font-dejavu)
("at-spi2-core" ,at-spi2-core)
("dbus" ,dbus)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 2a587d9..243a7de 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -331,7 +331,7 @@ applications.")
(add-after 'unpack 'disable-cantarell-tests
(lambda _
(substitute* "tests/meson.build"
- ;; XXX FIXME: These tests require "font-cantarell", but
+ ;; XXX FIXME: These tests require
"font-abattis-cantarell", but
;; adding it here would introduce a circular dependency.
(("\\[ 'test-harfbuzz'.*") "")
(("\\[ 'test-itemize'.*") "")
diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index 82b2d6e..ede37fe 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -1545,7 +1545,7 @@ used to bring up authentication dialogs.")
("dconf" ,dconf)
("engrampa" ,engrampa)
("eom" ,eom)
- ("font-cantarell" ,font-cantarell)
+ ("font-abattis-cantarell" ,font-abattis-cantarell)
("glib-networking" ,glib-networking)
("gnome-keyring" ,gnome-keyring)
("gvfs" ,gvfs)
diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm
index d5c5316..930927e 100644
--- a/gnu/services/xorg.scm
+++ b/gnu/services/xorg.scm
@@ -879,7 +879,7 @@ the GNOME desktop environment.")
(debug? gdm-configuration-debug? (default #f))
(default-user gdm-configuration-default-user (default #f))
(gnome-shell-assets gdm-configuration-gnome-shell-assets
- (default (list adwaita-icon-theme font-cantarell)))
+ (default (list adwaita-icon-theme
font-abattis-cantarell)))
(xorg-configuration gdm-configuration-xorg
(default (xorg-configuration)))
(x-session gdm-configuration-x-session