From be6bf3afea3211b0db1ad54091b584e72f7f2516 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 28 May 2020 11:52:12 -0400 Subject: [PATCH 7/7] gnu: font-cantarell: Update package definition. * gnu/packages/fonts.scm (font-cantarell): Rename package. [name]: Change from font-abattis-cantarell to font-cantarell. * gnu/packages/fonts.scm (font-abattis-cantarell): New variable for deprecated-package name font-abattis-cantarell. --- gnu/packages/fonts.scm | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 9284609373..bb39da1f23 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -195,25 +195,30 @@ itself.")))) (define-public font-cantarell (package - (name "font-abattis-cantarell") + (name "font-cantarell") (version "0.201") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/cantarell-fonts/" - (version-major+minor version) - "/cantarell-fonts-" version ".tar.xz")) - (sha256 - (base32 - "0qwqmkczqy09fdj8l11nr841ks0dwsydqg55qyms12m4yvjn87xn")))) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/cantarell-fonts/" + (version-major+minor version) + "/cantarell-fonts-" version ".tar.xz")) + (sha256 + (base32 + "0qwqmkczqy09fdj8l11nr841ks0dwsydqg55qyms12m4yvjn87xn")))) (build-system meson-build-system) (native-inputs - `(("gettext" ,gettext-minimal))) ; for msgfmt - (home-page "https://wiki.gnome.org/Projects/CantarellFonts") + `(("gettext" ,gettext-minimal))) (synopsis "Cantarell sans-serif typeface") (description "The Cantarell font family is a contemporary Humanist sans-serif designed for on-screen reading. It is used by GNOME@tie{}3.") + (home-page "https://wiki.gnome.org/Projects/CantarellFonts") (license license:silofl1.1))) +(define-public font-abattis-cantarell + (deprecated-package "font-abattis-cantarell" font-cantarell)) + (define-public font-lato (package (name "font-lato") -- 2.26.2