From patchwork Wed Nov 17 12:25:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: phodina X-Patchwork-Id: 34571 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 9584E27BBE3; Wed, 17 Nov 2021 12:26:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED 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 5C8D727BBE1 for ; Wed, 17 Nov 2021 12:26:13 +0000 (GMT) Received: from localhost ([::1]:51460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mnK0y-0005A1-Ia for patchwork@mira.cbaines.net; Wed, 17 Nov 2021 07:26:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50918) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mnK0o-00059i-CF for guix-patches@gnu.org; Wed, 17 Nov 2021 07:26:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48834) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mnK0o-0003SV-1W for guix-patches@gnu.org; Wed, 17 Nov 2021 07:26:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mnK0n-0004pQ-PM for guix-patches@gnu.org; Wed, 17 Nov 2021 07:26:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51774] [PATCH v2] gnu: font-adobe-source-code-pro: Update to 2.032R-ro-1.052R-it-1.012R-VAR. Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Nov 2021 12:26:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51774 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: 51774@debbugs.gnu.org, "jlicht@fsfe.org" Received: via spool by 51774-submit@debbugs.gnu.org id=B51774.163715192018481 (code B ref 51774); Wed, 17 Nov 2021 12:26:01 +0000 Received: (at 51774) by debbugs.gnu.org; 17 Nov 2021 12:25:20 +0000 Received: from localhost ([127.0.0.1]:60379 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnK08-0004o1-38 for submit@debbugs.gnu.org; Wed, 17 Nov 2021 07:25:20 -0500 Received: from mail-40133.protonmail.ch ([185.70.40.133]:20524) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mnK03-0004nV-9Z for 51774@debbugs.gnu.org; Wed, 17 Nov 2021 07:25:19 -0500 Date: Wed, 17 Nov 2021 12:25:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1637151904; bh=HteZ9Ev3sMfcPqkDLB3eO8ct/ETx2WLByLK8rTvfQK0=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=gmmjL/hc7MTYj84pgEg31eEHOLTo51TQ8p3q6dKFQNTe5Y21XLK1wnoKL2mhRTB3G rjvYORMFF0lJT3E7YjOfxrqKLtSTrzc9uNiagxbjNBIX8ZKlg1N1BIQD0xqNBwvaP6 9uvOmyy4u6+yIlXpNsSOPGptBe9rVQApsIyP83iE= Message-ID: In-Reply-To: References: <70rnBf4hiAtWtLXEZPbo9WBALUmUha4qT-xxVwBX-Z-TnfVEp5b6M-3cZ9H-oIg-VXpfqgP_4lSCX1Vzgy3IAFcYplL6gMeXI3L1gu_cNlI=@protonmail.com> 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: phodina X-ACL-Warn: , phodina via Guix-patches X-Patchwork-Original-From: phodina via Guix-patches via From: phodina X-getmail-retrieved-from-mailbox: Patches Hi Liliana, > This regexp could be simplified by noticing that it's always > > R-/R-/R-, whereas we use > > R--R--R-. So simply use a > > regexp that matches R-- and then replace just the dash > > with a slash. That being said, I'm not sure how much cleaner this is > > compared to let-binding > > Cheers. Thanks. I saw the pattern just I have issue writing down the regexp in Guile. Now you made me learn them properly :-D * gnu/packages/fonts (font-adobe-source-code-pro): Update to 2.032R-ro-1.052R-it-1.012R-VAR and update regexp in commit. --- 2.33.0 diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 3f36a71bdd..c3ad57f203 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -975,7 +975,7 @@ (define-public font-hack (define-public font-adobe-source-code-pro (package (name "font-adobe-source-code-pro") - (version "2.030R-ro-1.050R-it") + (version "2.032R-ro-1.052R-it-1.012R-VAR") (source (origin (method git-fetch) @@ -984,10 +984,12 @@ (define-public font-adobe-source-code-pro (commit (regexp-substitute/global ;; The upstream tag uses "/" between the roman and italic ;; versions, so substitute our "-" separator here. - #f "R-ro-" version 'pre "R-ro/" 'post)))) + #f "((R-ro)|(R-it))(-)" version + 'pre 1 "/" 'post + )))) (file-name (git-file-name name version)) (sha256 - (base32 "0hc5kflr8xzqgdm0c3gbgb1paygznxmnivkylid69ipc7wnicx1n")))) + (base32 "1lqchm8z0ah5y675ycmciqvr8y1v1gcj22ysfs443gm291vy0z4v")))) (build-system font-build-system) (home-page "https://github.com/adobe-fonts/source-code-pro") (synopsis