From patchwork Sun Jun 6 23:35:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 29986 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6B29327BC81; Mon, 7 Jun 2021 02:32:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED,URIBL_SBL,URIBL_SBL_A autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C30A527BC78 for ; Mon, 7 Jun 2021 02:32:20 +0100 (BST) Received: from localhost ([::1]:60892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lq47n-0004Zn-NG for patchwork@mira.cbaines.net; Sun, 06 Jun 2021 21:32:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52848) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lq47W-000455-DS for guix-patches@gnu.org; Sun, 06 Jun 2021 21:32:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42625) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lq47W-0008P7-4j for guix-patches@gnu.org; Sun, 06 Jun 2021 21:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lq47W-00089E-Cc for guix-patches@gnu.org; Sun, 06 Jun 2021 21:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48891] [PATCH] gnu: Iosevka fonts: Update to 7.0.3. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Jun 2021 01:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48891 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48891@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.162302946331202 (code B ref -1); Mon, 07 Jun 2021 01:32:02 +0000 Received: (at submit) by debbugs.gnu.org; 7 Jun 2021 01:31:03 +0000 Received: from localhost ([127.0.0.1]:54163 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lq46T-00086j-9r for submit@debbugs.gnu.org; Sun, 06 Jun 2021 21:31:03 -0400 Received: from lists.gnu.org ([209.51.188.17]:46274) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lq46O-00086J-LX for submit@debbugs.gnu.org; Sun, 06 Jun 2021 21:30:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lq40H-0003uU-VO for guix-patches@gnu.org; Sun, 06 Jun 2021 21:24:33 -0400 Received: from mail-4321.protonmail.ch ([185.70.43.21]:62805) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lq40B-0003ic-Jv for guix-patches@gnu.org; Sun, 06 Jun 2021 21:24:33 -0400 Received: from mail-02.mail-europe.com (mail-0201.mail-europe.com [51.77.79.158]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by mail-4321.protonmail.ch (Postfix) with ESMTPS id 4FytDH42TPz4x1Z1 for ; Sun, 6 Jun 2021 23:35:59 +0000 (UTC) Authentication-Results: mail-4321.protonmail.ch; dkim=pass (2048-bit key) header.d=apatience.com header.i=@apatience.com header.b="vCfJ2IPm" Date: Sun, 06 Jun 2021 23:35:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail3; t=1623022507; bh=TKf+HspOSAslAdHT13fGEhjUYlt8+2XR1p/qe8+Nss4=; h=Date:To:From:Reply-To:Subject:From; b=vCfJ2IPmj2zcVaU4QBORLy16soJERxMu8fvVPSITSiAURk8+Wkba9yaXe9mH4N4tS NfzUu7gIwzFFBGx1jW7Wy2NkhrSw01vISuMbK5RC+Tk1ByOlQotOTDhbSTXyu0bUCM gwMMeb85CUY6xclXXSbcAmZ1kD4C36u2thnyfZR2Nbxnn7Xanfq+RKTxrvlNet07nv qMXYLEBAf3I4BAT+yw+EW6XFUquUf/xt0xrCp23JxcN9RJ4KyhNa8DZfMdBEYMWd5c eAB7f2JeJn0lQOVfv66ID4nzT3Ym0B8OXaCMUIxojdO2f++yO26qWhZV13I9ltwbrI nCaAHOis4xCpw== From: "Paul A. Patience" Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.43.21; envelope-from=paul@apatience.com; helo=mail-4321.protonmail.ch 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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This patch supersedes the previous one [1]. (The latest Iosevka version has increased since then.) [1]: https://lists.gnu.org/archive/html/guix-patches/2021-05/msg01249.html From 0af374ea10f9516654689e27e39d213bb63053e4 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Sun, 6 Jun 2021 19:18:53 -0400 Subject: [PATCH] gnu: Iosevka fonts: Update to 7.0.3. * gnu/packages/fonts.scm (font-iosevka, font-iosevka-slab, font-iosevka-term, font-iosevka-term-slab, font-iosevka-aile, font-iosevka-curly, font-iosevka-curly-slab, font-iosevka-etoile): Update to 7.0.3. (font-iosevka-sparkle): Delete variable. --- gnu/packages/fonts.scm | 81 +++++++++++++++++++++++++++++------------- 1 file changed, 56 insertions(+), 25 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 973393acc4..e41444271c 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -40,6 +40,7 @@ ;;; Copyright © 2020 Nicolò Balzarotti ;;; Copyright © 2021 Antoine Côté ;;; Copyright © 2021 Sergiu Ivanov +;;; Copyright © 2021 Paul A. Patience ;;; ;;; This file is part of GNU Guix. ;;; @@ -1211,11 +1212,55 @@ later hand-tweaked with the gbdfed(1) editor: typeface, by mimicking Comic Sans while fixing its most obvious shortcomings.") (license license:silofl1.1))) +;; When updating the version (and hash) of font-iosevka, also update the hash +;; of the Iosevka variants further below. +;; The following script downloads all Iosevka variants to the store and prints +;; their hash at the end. +#| +guix repl <nix-base32-string + (file-sha256 file)) + iosevka-hashes)) + (set! iosevka-fails (cons font iosevka-fails))))) + (list font-iosevka + font-iosevka-slab + font-iosevka-term + font-iosevka-term-slab + font-iosevka-aile + font-iosevka-curly + font-iosevka-curly-slab + font-iosevka-etoile)) + (for-each (lambda (hash) + (format #t "~a: ~a~%" (car hash) (cdr hash))) + iosevka-hashes) + (for-each (lambda (fail) + (format #t "~a: failed to download latest version~%" fail)) + iosevka-fails)) +EOF +|# (define-public font-iosevka (package (name "font-iosevka") - ;; When updating, also update the hash of the Iosevka variant(s) below. - (version "4.0.3") + (version "7.0.3") (source (origin (method url-fetch/zipbomb) @@ -1223,7 +1268,7 @@ typeface, by mimicking Comic Sans while fixing its most obvious shortcomings.") "/releases/download/v" version "/ttc-iosevka-" version ".zip")) (sha256 - (base32 "1xc45rs09aj899wz9ghyizq6ddbgxpkqq5bl1jc89hls5laf7qjb")))) + (base32 "08n1c2j38vd1qrf18ilgvq6rl7z9yrsyq9ljf037yiw6zlphx4da")))) (build-system font-build-system) (home-page "https://be5invis.github.io/Iosevka/") (synopsis "Coders' typeface, built from code") @@ -1231,7 +1276,7 @@ typeface, by mimicking Comic Sans while fixing its most obvious shortcomings.") "Iosevka is a slender monospace sans-serif or slab-serif typeface inspired by Pragmata Pro, M+, and PF DIN Mono, designed to be the ideal font for programming. Iosevka is completely generated from its source code.") - (license (list license:silofl1.1 ; build artifacts (i.e. the fonts) + (license (list license:silofl1.1 ; build artifacts (i.e., the fonts) license:bsd-3)))) ; supporting code (define-public font-iosevka-slab @@ -1246,7 +1291,7 @@ programming. Iosevka is completely generated from its source code.") "/releases/download/v" version "/ttc-iosevka-slab-" version ".zip")) (sha256 - (base32 "0qpfzyi050zca0bwhb460nvcaarij4srhify0rb8sf9ygpzyvnjh")))))) + (base32 "1ggrbl8gi2hv8yiw7vw8cajlv7nkz8i975165cayyzppjlrfs3nr")))))) (define-public font-iosevka-term (package @@ -1260,7 +1305,7 @@ programming. Iosevka is completely generated from its source code.") "/releases/download/v" version "/ttf-iosevka-term-" version ".zip")) (sha256 - (base32 "092ygzv24wbi8cjjsmq0jkxdf4cm7wqlfj7jkn0cip7nlbyskl3h")))) + (base32 "1jmbp3hni99l92653b356nbmj45kd54kbl6c6ws1k5jxydrjglrh")))) (arguments `(#:phases (modify-phases %standard-phases @@ -1281,7 +1326,7 @@ programming. Iosevka is completely generated from its source code.") "releases/download/v" version "/" "ttf-iosevka-term-slab-" version ".zip")) (sha256 - (base32 "157kdxrxz981ympd2iww66v50vm2cxd7z98vvb36rii94hf30k7x")))) + (base32 "19fc6jbkv0aif6ds9ddxaarz2ambzln7y6k2qjsczwlbznr8cf09")))) (arguments `(#:phases (modify-phases %standard-phases @@ -1302,7 +1347,7 @@ programming. Iosevka is completely generated from its source code.") "/releases/download/v" version "/ttc-iosevka-aile-" version ".zip")) (sha256 - (base32 "0n52lfn7awc28a4f5yh4my8q4ikzza705kp69chfw9jm2xx79npc")))))) + (base32 "1bkrk4dqkj45fbaac2n61a5kwxs3bk6sdm5hanw7g2h4xb83fi8d")))))) (define-public font-iosevka-curly (package @@ -1316,7 +1361,7 @@ programming. Iosevka is completely generated from its source code.") "releases/download/v" version "/" "ttc-iosevka-curly-" version ".zip")) (sha256 - (base32 "0m51r0bc25khllq8nsfgsldhwfs7kzl8kqasivjlm14mpv5080fn")))))) + (base32 "12jdb38dlbwa58q0b0sf9sp1dcafzp9dcf71jf1wrlnn8047vxyx")))))) (define-public font-iosevka-curly-slab (package @@ -1330,7 +1375,7 @@ programming. Iosevka is completely generated from its source code.") "releases/download/v" version "/" "ttc-iosevka-curly-slab-" version ".zip")) (sha256 - (base32 "0ffiz2kg43kc2dxv48sjji33ra3kc6sy8vlard93c601fqjmrjws")))))) + (base32 "0zn21bxyj0ni4vbdarwam2piixzvkdk769vg3k4fl3h03q56cj24")))))) (define-public font-iosevka-etoile (package @@ -1344,21 +1389,7 @@ programming. Iosevka is completely generated from its source code.") "/releases/download/v" version "/ttc-iosevka-etoile-" version ".zip")) (sha256 - (base32 "1fj8g7sjp9idjh14iqk4wsz3rdarlmq7amcdsr0dznwyivx8a9wx")))))) - -(define-public font-iosevka-sparkle - (package - (inherit font-iosevka) - (name "font-iosevka-sparkle") - (version (package-version font-iosevka)) - (source - (origin - (method url-fetch/zipbomb) - (uri (string-append "https://github.com/be5invis/Iosevka" - "/releases/download/v" version - "/ttc-iosevka-sparkle-" version ".zip")) - (sha256 - (base32 "00dw894930xdikai8bcaimp0a3720diwi0r7ii52jwl4d70w53dx")))))) + (base32 "0lnpdvv20g2bg6rwl0gv83bkbgfmkbyfxshhpw9vprfs2g8k6lil")))))) (define-public font-sarasa-gothic (package -- 2.31.1