diff options
author | Marius Bakke <mbakke@fastmail.com> | 2018-02-01 13:18:47 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2018-02-01 13:18:47 +0100 |
commit | bee7bb315cd0b4529a4117b6220c29ca297fc023 (patch) | |
tree | fe4741f257e50782e51bc2955ad4480cd2ba6396 /gnu/packages/fonts.scm | |
parent | c2f0e5a44b537632c2655f97a2539c3bf02c8a63 (diff) | |
parent | 8a4644336d5063fd0bf43e90e3c0823c76e82e4e (diff) | |
download | guix-patches-bee7bb315cd0b4529a4117b6220c29ca297fc023.tar guix-patches-bee7bb315cd0b4529a4117b6220c29ca297fc023.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/fonts.scm')
-rw-r--r-- | gnu/packages/fonts.scm | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 231f51fb3f..ccf05fec2d 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -7,11 +7,11 @@ ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr> ;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016 Leo Famulari <leo@famulari.name> -;;; Copyright © 2016, 2017 ng0 <ng0@infotropique.org> +;;; Copyright © 2016, 2017, 2018 ng0 <ng0@n0.is> ;;; Copyright © 2016 Jookia <166291@gmail.com> ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016 Dmitry Nikolaev <cameltheman@gmail.com> -;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016 Toni Reina <areina@riseup.net> ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr> @@ -865,7 +865,7 @@ designed to work well in user interface environments.") (base32 "1z65x0dw5dq6rs6p9wyfrir50rlh95vgzsxr8jcd40nqazw4jhpi")))) (build-system font-build-system) - (home-page "http://mozilla.github.io/Fira/") + (home-page "https://mozilla.github.io/Fira/") (synopsis "Mozilla's monospace font") (description "This is the typeface used by Mozilla in Firefox OS.") (license license:silofl1.1))) @@ -883,11 +883,34 @@ designed to work well in user interface environments.") (base32 "1r6zdnqqp4bgq5nmgqbj0vvj7x1h9w912851ggbl9wc7fdjnjqnq")))) (build-system font-build-system) - (home-page "http://mozilla.github.io/Fira/") + (home-page "https://mozilla.github.io/Fira/") (synopsis "Mozilla's Fira Sans Font") (description "This is the typeface used by Mozilla in Firefox OS.") (license license:silofl1.1))) +(define-public font-fira-code + (package + (name "font-fira-code") + (version "1.204") + (source (origin + (method url-fetch/zipbomb) + (uri (string-append "https://github.com/tonsky/FiraCode/releases/" + "download/" version + "/FiraCode_" version ".zip")) + (sha256 + (base32 + "17wky221b3igrqhmxgmqiyv1xdfn0nw471vzhpkrvv1w2w1w1k18")))) + (build-system font-build-system) + (home-page "https://mozilla.github.io/Fira/") + (synopsis "Monospaced font with programming ligatures") + (description + "Fira Code is an extension of the Fira Mono font containing a set of ligatures +for common programming multi-character combinations. This is just a font rendering +feature: underlying code remains ASCII-compatible. This helps to read and understand +code faster. For some frequent sequences like .. or //, ligatures allow us to +correct spacing.") + (license license:silofl1.1))) + (define-public font-awesome (package (name "font-awesome") |