From patchwork Wed Dec 13 08:00:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 57562 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 DA2BC27BBE9; Wed, 13 Dec 2023 08:02:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E1F4627BBE2 for ; Wed, 13 Dec 2023 08:02:10 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rDKBr-00058F-9t; Wed, 13 Dec 2023 03:01:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rDKBh-00057b-IJ for guix-patches@gnu.org; Wed, 13 Dec 2023 03:01:50 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rDKBd-0001pV-VE for guix-patches@gnu.org; Wed, 13 Dec 2023 03:01:47 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rDKBt-00034L-Oj for guix-patches@gnu.org; Wed, 13 Dec 2023 03:02:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67808] [PATCH 1/5] guix: build-system: font: Accept license-file-regexp keyword argument Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 13 Dec 2023 08:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67808 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67808@debbugs.gnu.org Cc: Saku Laesvuori X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170245450211762 (code B ref -1); Wed, 13 Dec 2023 08:02:01 +0000 Received: (at submit) by debbugs.gnu.org; 13 Dec 2023 08:01:42 +0000 Received: from localhost ([127.0.0.1]:58115 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDKBZ-00033d-LI for submit@debbugs.gnu.org; Wed, 13 Dec 2023 03:01:41 -0500 Received: from lists.gnu.org ([2001:470:142::17]:38370) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDKBX-00033K-Hy for submit@debbugs.gnu.org; Wed, 13 Dec 2023 03:01:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rDKB0-000542-2j for guix-patches@gnu.org; Wed, 13 Dec 2023 03:01:08 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101] helo=mail.laesvuori.fi) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rDKAt-0000c9-My for guix-patches@gnu.org; Wed, 13 Dec 2023 03:01:04 -0500 Received: from X-kone.org.aalto.fi (unknown [130.233.144.30]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 2E6FC3400DF; Wed, 13 Dec 2023 09:00:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1702454451; bh=bqLbwKETgTGIUORNEpaA1Yi4HybgidiZAcI5N87FVec=; h=From:To:Cc:Subject:Date; b=SlrNu68gOowZKKSRheMJlhT5WJrj6U25bLlr6n57KSDTHDscduGhJ5kEKMWPATXKc HJ87SL1CvY0KyyPDQkMQSvdqZ4EFjSmOEfeVJXkVAZXMHhxH3nXPWQKBZwdbd6G+Fl kYbQJMuXbZloh8zlorhO2GcHszVykCunOHQISbEg= Date: Wed, 13 Dec 2023 10:00:35 +0200 Message-ID: <123127b6a5bf1c94ff62b0779837a6e54975c81f.1702454367.git.saku@laesvuori.fi> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=75.119.130.101; envelope-from=saku@laesvuori.fi; helo=mail.laesvuori.fi 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, T_SCC_BODY_TEXT_LINE=-0.01 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: Saku Laesvuori X-ACL-Warn: , Saku Laesvuori via Guix-patches X-Patchwork-Original-From: Saku Laesvuori via Guix-patches via From: Saku Laesvuori Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/build-system/font.scm: (font-build): Pass license-file-regexp keyword argument to font-build. * guix/build-system/gnu.scm: Export %license-file-regexp. Change-Id: I4e9378cbed9a8c3b9838efcd448e9bfec8ba97be --- guix/build-system/font.scm | 2 ++ guix/build-system/gnu.scm | 1 + 2 files changed, 3 insertions(+) base-commit: 4bf4e340b74b66a0fc319aeb100fb1f948a67211 diff --git a/guix/build-system/font.scm b/guix/build-system/font.scm index c57c304f52..893e9f635e 100644 --- a/guix/build-system/font.scm +++ b/guix/build-system/font.scm @@ -81,6 +81,7 @@ (define* (font-build name inputs (search-paths '()) (system (%current-system)) (guile #f) + (license-file-regexp %license-file-regexp) (imported-modules %font-build-system-modules) (modules '((guix build font-build-system) (guix build utils)))) @@ -94,6 +95,7 @@ (define* (font-build name inputs #~(font-build #:name #$name #:source #+source #:configure-flags #$configure-flags + #:license-file-regexp #$license-file-regexp #:system #$system #:test-target #$test-target #:tests? #$tests? diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index cdbb547773..b8082354b9 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -28,6 +28,7 @@ (define-module (guix build-system gnu) #:use-module (srfi srfi-1) #:use-module (ice-9 match) #:export (%gnu-build-system-modules + %license-file-regexp %strip-flags %strip-directories gnu-build From patchwork Wed Dec 13 08:02:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 57566 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 9337527BBE9; Wed, 13 Dec 2023 08:04:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E472B27BBE2 for ; Wed, 13 Dec 2023 08:04:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rDKDf-0005hy-GZ; Wed, 13 Dec 2023 03:03:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rDKDc-0005gE-NC for guix-patches@gnu.org; Wed, 13 Dec 2023 03:03:49 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rDKDc-0002Ae-D5 for guix-patches@gnu.org; Wed, 13 Dec 2023 03:03:48 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rDKDp-00038X-P5; Wed, 13 Dec 2023 03:04:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67808] [PATCH 2/5] gnu: Add font-jetbrains-mono-nerd-font Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: all_but_last@163.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Wed, 13 Dec 2023 08:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67808 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67808@debbugs.gnu.org Cc: Saku Laesvuori , Zhu Zihao , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Zhu Zihao , =?utf-8?b?5a6L5paH?= =?utf-8?b?5q2m?= Received: via spool by 67808-submit@debbugs.gnu.org id=B67808.170245460211961 (code B ref 67808); Wed, 13 Dec 2023 08:04:01 +0000 Received: (at 67808) by debbugs.gnu.org; 13 Dec 2023 08:03:22 +0000 Received: from localhost ([127.0.0.1]:58120 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDKDC-00036q-6i for submit@debbugs.gnu.org; Wed, 13 Dec 2023 03:03:22 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101]:35568 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDKD9-00036e-Ab for 67808@debbugs.gnu.org; Wed, 13 Dec 2023 03:03:21 -0500 Received: from X-kone.org.aalto.fi (unknown [130.233.144.30]) by mail.laesvuori.fi (Postfix) with ESMTPSA id B64583400DF; Wed, 13 Dec 2023 09:03:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1702454586; bh=z7t/SpkIDh+fbH7AQ+8/APEO9b5sthk0rCztIwT2/kk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=gxXlGsYY//4zP2rDCRt7lCd5jnSUyxjTy5WGkB86gQJ9ZZjTstH9c7lbey0gPhQit r6jWUUJFZ2llrfqubWHc5/BgYZt4Wl24ugz0HDNx2cK33U+IVk5Uedze6OyzyZGUWg Zh7jH33mY7bwm0VOtzGV7QNLr1fYm+nM5diqkp5o= Date: Wed, 13 Dec 2023 10:02:35 +0200 Message-ID: <7be7f388a88ecf4ce0e0bbad26398b4c8637345f.1702454367.git.saku@laesvuori.fi> X-Mailer: git-send-email 2.41.0 In-Reply-To: <123127b6a5bf1c94ff62b0779837a6e54975c81f.1702454367.git.saku@laesvuori.fi> References: <123127b6a5bf1c94ff62b0779837a6e54975c81f.1702454367.git.saku@laesvuori.fi> MIME-Version: 1.0 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: Saku Laesvuori X-ACL-Warn: , Saku Laesvuori via Guix-patches X-Patchwork-Original-From: Saku Laesvuori via Guix-patches via From: Saku Laesvuori Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/fonts.scm (font-jetbrains-mono-nerd-font): New variable. Change-Id: I52e3e3fda5fa83b6b0e865b9e56f008f91a4465c --- gnu/packages/fonts.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 813367be8a..f88a715fae 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -59,6 +59,7 @@ ;;; Copyright © 2023 Denis 'GNUtoo' Carikli ;;; Copyright © 2023 chris ;;; Copyright © 2023 Luis Felipe López Acevedo +;;; Copyright © 2023 Saku Laesvuori ;;; ;;; This file is part of GNU Guix. ;;; @@ -2526,6 +2527,29 @@ (define-public font-jetbrains-mono in small sizes, the text looks crisper.") (license license:asl2.0))) +(define-public font-jetbrains-mono-nerd-font + (package + (name "font-jetbrains-mono-nerd-font") + (version "3.1.1") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/ryanoasis/nerd-fonts/releases/" + "download/v" version "/JetBrainsMono.tar.xz")) + (sha256 + (base32 + "1f8xi8kgyik59ahjm3pcrb2s02c9a9i6kwf5b4651zpjmjy5l8lj")))) + (build-system font-build-system) + (arguments '(#:license-file-regexp "^OFL\\.txt$")) + (home-page "https://nerdfonts.com") + (synopsis "Mono typeface for developers with Nerd Fonts patching") + (description + "JetBrains Mono is a font family dedicated to developers. JetBrains +Mono’s typeface forms are simple and free from unnecessary details. Rendered +in small sizes, the text looks crisper. Nerd Fonts patching adds a high number +of extra glyphs.") + (license license:silofl1.1))) + (define-public font-juliamono (package (name "font-juliamono") From patchwork Wed Dec 13 08:02:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 57565 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 0D46127BBEA; Wed, 13 Dec 2023 08:04:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9035727BBE2 for ; Wed, 13 Dec 2023 08:04:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rDKDg-0005ib-Rf; Wed, 13 Dec 2023 03:03:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rDKDd-0005gL-8J for guix-patches@gnu.org; Wed, 13 Dec 2023 03:03:49 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rDKDc-0002B7-UZ for guix-patches@gnu.org; Wed, 13 Dec 2023 03:03:48 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rDKDq-00038e-7V; Wed, 13 Dec 2023 03:04:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67808] [PATCH 3/5] gnu: font-jetbrains-mono: Use license-file-regexp argument Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: all_but_last@163.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Wed, 13 Dec 2023 08:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67808 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67808@debbugs.gnu.org Cc: Saku Laesvuori , Zhu Zihao , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Zhu Zihao , =?utf-8?b?5a6L5paH?= =?utf-8?b?5q2m?= Received: via spool by 67808-submit@debbugs.gnu.org id=B67808.170245460711986 (code B ref 67808); Wed, 13 Dec 2023 08:04:02 +0000 Received: (at 67808) by debbugs.gnu.org; 13 Dec 2023 08:03:27 +0000 Received: from localhost ([127.0.0.1]:58124 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDKDG-00037F-M0 for submit@debbugs.gnu.org; Wed, 13 Dec 2023 03:03:27 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101]:49756 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDKDC-00036r-Ka for 67808@debbugs.gnu.org; Wed, 13 Dec 2023 03:03:23 -0500 Received: from X-kone.org.aalto.fi (unknown [130.233.144.30]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 0C2CE3400DF; Wed, 13 Dec 2023 09:03:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1702454590; bh=06GdeqLHPpWNAIl/mZoJw7YpeB4gevrauCAoeO/pxUU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=M+zTLbZO6731FaXq1lTn2zMNTebpkZZomtdIpyB2sb9x3f8VjXyv0S1ZaRNh8qNDj 9wmnjCBLO5K3YmBZ63FhNUsXPJuXMhkkwuwL/UsF+ceCjL3oLF8YHl85KPAtKio7sT 9PQEPwKljncb049gZoxgQiOZ+bL8E1bMKffaeMaE= Date: Wed, 13 Dec 2023 10:02:36 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <123127b6a5bf1c94ff62b0779837a6e54975c81f.1702454367.git.saku@laesvuori.fi> References: <123127b6a5bf1c94ff62b0779837a6e54975c81f.1702454367.git.saku@laesvuori.fi> MIME-Version: 1.0 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: Saku Laesvuori X-ACL-Warn: , Saku Laesvuori via Guix-patches X-Patchwork-Original-From: Saku Laesvuori via Guix-patches via From: Saku Laesvuori Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/fonts.scm (font-jetbrains-mono)[arguments]: Replace custom 'install-license-files build phase with license-file-regexp argument. Change-Id: Ie8b851b04c84c63c5e1abb1e75c9312b4729be57 --- gnu/packages/fonts.scm | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index f88a715fae..3f4f5ae847 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -2512,13 +2512,8 @@ (define-public font-jetbrains-mono ;; Find the license file outside of the default subdirectory. (lambda _ (chdir "..") - #t)) - (replace 'install-license-files - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/doc/" ,name "-" ,version))) - (install-file "OFL.txt" doc) - #t)))))) + #t))) + #:license-file-regexp "^OFL\\.txt$")) (home-page "https://www.jetbrains.com/lp/mono/") (synopsis "Mono typeface for developers") (description From patchwork Wed Dec 13 08:02:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 57563 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 4F17727BBE9; Wed, 13 Dec 2023 08:04:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 211B927BBE2 for ; Wed, 13 Dec 2023 08:04:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rDKDf-0005hx-HO; Wed, 13 Dec 2023 03:03:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rDKDc-0005gF-N6 for guix-patches@gnu.org; Wed, 13 Dec 2023 03:03:49 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rDKDc-0002Ad-D5 for guix-patches@gnu.org; Wed, 13 Dec 2023 03:03:48 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rDKDq-00038k-OJ; Wed, 13 Dec 2023 03:04:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67808] [PATCH 4/5] gnu: font-jetbrains-mono: Use the correct license. Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: all_but_last@163.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Wed, 13 Dec 2023 08:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67808 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67808@debbugs.gnu.org Cc: Saku Laesvuori , Zhu Zihao , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Zhu Zihao , =?utf-8?b?5a6L5paH?= =?utf-8?b?5q2m?= Received: via spool by 67808-submit@debbugs.gnu.org id=B67808.170245460711993 (code B ref 67808); Wed, 13 Dec 2023 08:04:02 +0000 Received: (at 67808) by debbugs.gnu.org; 13 Dec 2023 08:03:27 +0000 Received: from localhost ([127.0.0.1]:58126 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDKDH-00037J-5X for submit@debbugs.gnu.org; Wed, 13 Dec 2023 03:03:27 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101]:49758 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDKDF-000375-7d for 67808@debbugs.gnu.org; Wed, 13 Dec 2023 03:03:25 -0500 Received: from X-kone.org.aalto.fi (unknown [130.233.144.30]) by mail.laesvuori.fi (Postfix) with ESMTPSA id B88A93400DF; Wed, 13 Dec 2023 09:03:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1702454592; bh=q2gFpFsyUxGwGymW35bvwDW54BkWHHFg9D7R3HcuYV8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CciWlVljUd2RhEXylMBtj1lxCJVf2zJL+nF4y03c1J0FrRXMY0R7g8uqyxSe0vDb3 U6qx+Dh3FOfYuVh7S3AUgc6SdqYvzoVSyuf/lfwv3PQPyrMq496FzI8Mpx5pWlGEZT vK4XPpOMT2ef5SNX8OZR5XiLuW0w9dfM9EC9lJIY= Date: Wed, 13 Dec 2023 10:02:37 +0200 Message-ID: <96d08c872e805bd3fdd3612c0f9c2baa0ed9c302.1702454367.git.saku@laesvuori.fi> X-Mailer: git-send-email 2.41.0 In-Reply-To: <123127b6a5bf1c94ff62b0779837a6e54975c81f.1702454367.git.saku@laesvuori.fi> References: <123127b6a5bf1c94ff62b0779837a6e54975c81f.1702454367.git.saku@laesvuori.fi> MIME-Version: 1.0 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: Saku Laesvuori X-ACL-Warn: , Saku Laesvuori via Guix-patches X-Patchwork-Original-From: Saku Laesvuori via Guix-patches via From: Saku Laesvuori Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The build scripts are licensed under asl2.0 but the packaged font files are licensed under silofl1.1. * gnu/packages/fonts.scm (font-jetbrains-mono)[license]: Use silofl1.1 instead of asl2.0. Change-Id: I256a89b6e4bdb368c9cc94cae0808f72c76e7599 --- gnu/packages/fonts.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 3f4f5ae847..52e9cb0987 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -2520,7 +2520,7 @@ (define-public font-jetbrains-mono "JetBrains Mono is a font family dedicated to developers. JetBrains Mono’s typeface forms are simple and free from unnecessary details. Rendered in small sizes, the text looks crisper.") - (license license:asl2.0))) + (license license:silofl1.1))) (define-public font-jetbrains-mono-nerd-font (package From patchwork Wed Dec 13 08:02:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 57564 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 92DB027BBEA; Wed, 13 Dec 2023 08:04:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D054F27BBE2 for ; Wed, 13 Dec 2023 08:04:09 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rDKDk-0005k5-PE; Wed, 13 Dec 2023 03:03:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rDKDi-0005it-KR for guix-patches@gnu.org; Wed, 13 Dec 2023 03:03:54 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rDKDi-0002CL-BB for guix-patches@gnu.org; Wed, 13 Dec 2023 03:03:54 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rDKDr-00038r-5z; Wed, 13 Dec 2023 03:04:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67808] [PATCH 5/5] gnu: font-jetbrains-mono: Update to 2.304 Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: all_but_last@163.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Wed, 13 Dec 2023 08:04:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67808 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67808@debbugs.gnu.org Cc: Saku Laesvuori , Zhu Zihao , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Zhu Zihao , =?utf-8?b?5a6L5paH?= =?utf-8?b?5q2m?= Received: via spool by 67808-submit@debbugs.gnu.org id=B67808.170245460912009 (code B ref 67808); Wed, 13 Dec 2023 08:04:03 +0000 Received: (at 67808) by debbugs.gnu.org; 13 Dec 2023 08:03:29 +0000 Received: from localhost ([127.0.0.1]:58129 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDKDJ-00037c-GD for submit@debbugs.gnu.org; Wed, 13 Dec 2023 03:03:29 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101]:49766 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDKDI-00037U-90 for 67808@debbugs.gnu.org; Wed, 13 Dec 2023 03:03:28 -0500 Received: from X-kone.org.aalto.fi (unknown [130.233.144.30]) by mail.laesvuori.fi (Postfix) with ESMTPSA id BC3643400DF; Wed, 13 Dec 2023 09:03:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1702454595; bh=TDUD5Am3S0cN7tw6KLUkeyW7pW2ztjFLMYuY5SyxVLw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CkGTH4PaEKhOGSCpxitWsochVXl0hsKSSz1Df+J6mHn/tl3ICtG8IHNNSrJGxlprP DqvZBOs/h1moX7odSQLA25/hsbqoEqZlmMo4AO9tmEmQ26hyfFAfc627oesC7DAS1r BfY2GhiytoBO8MM2uyMtSUA4TFVf6GFqonva3R2Y= Date: Wed, 13 Dec 2023 10:02:38 +0200 Message-ID: <85eb65309f34d0594b086347fc672a08af67c5de.1702454367.git.saku@laesvuori.fi> X-Mailer: git-send-email 2.41.0 In-Reply-To: <123127b6a5bf1c94ff62b0779837a6e54975c81f.1702454367.git.saku@laesvuori.fi> References: <123127b6a5bf1c94ff62b0779837a6e54975c81f.1702454367.git.saku@laesvuori.fi> MIME-Version: 1.0 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: Saku Laesvuori X-ACL-Warn: , Saku Laesvuori via Guix-patches X-Patchwork-Original-From: Saku Laesvuori via Guix-patches via From: Saku Laesvuori Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/fonts.scm (font-jetbrains-mono): Update to version 2.304. Change-Id: Id325fda8f9b50cf830107823c6ca1b439a6bdca0 --- gnu/packages/fonts.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 52e9cb0987..a2bb8a1065 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -2495,7 +2495,7 @@ (define-public font-sil-ezra (define-public font-jetbrains-mono (package (name "font-jetbrains-mono") - (version "2.242") + (version "2.304") (source (origin (method url-fetch) @@ -2503,7 +2503,7 @@ (define-public font-jetbrains-mono (string-append "https://github.com/JetBrains/JetBrainsMono/releases/" "download/v" version "/JetBrainsMono-" version ".zip")) (sha256 - (base32 "17qs985v38x3rcg3v4av3qynwr4gvixrj50vjzy7zkkny575ncaf")))) + (base32 "1gvv5w0vfzndzp8k7g15j5i3yvnpr5z3imrwjs5flq19xp37cqvg")))) (build-system font-build-system) (arguments `(#:phases