From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 0FzyOtAUlGFC+wAAgWs5BA (envelope-from ) for ; Tue, 16 Nov 2021 21:30:08 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id yMmCNtAUlGGZQwAAbx9fmQ (envelope-from ) for ; Tue, 16 Nov 2021 20:30:08 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 904E832962 for ; Tue, 16 Nov 2021 21:30:08 +0100 (CET) Received: from localhost ([::1]:51762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mn55j-0008Vb-Mi for larch@yhetil.org; Tue, 16 Nov 2021 15:30:07 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54508) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mn55e-0008VS-Ju for guix-patches@gnu.org; Tue, 16 Nov 2021 15:30:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:47762) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mn55e-00030v-Ay for guix-patches@gnu.org; Tue, 16 Nov 2021 15:30:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mn55e-0004EZ-70 for guix-patches@gnu.org; Tue, 16 Nov 2021 15:30:02 -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: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Nov 2021 20:30:02 +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: phodina Cc: 51774@debbugs.gnu.org, "jlicht@fsfe.org" Received: via spool by 51774-submit@debbugs.gnu.org id=B51774.163709459916244 (code B ref 51774); Tue, 16 Nov 2021 20:30:02 +0000 Received: (at 51774) by debbugs.gnu.org; 16 Nov 2021 20:29:59 +0000 Received: from localhost ([127.0.0.1]:59308 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mn55b-0004Dw-EC for submit@debbugs.gnu.org; Tue, 16 Nov 2021 15:29:59 -0500 Received: from mail-wm1-f43.google.com ([209.85.128.43]:35576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mn55a-0004DZ-2a for 51774@debbugs.gnu.org; Tue, 16 Nov 2021 15:29:58 -0500 Received: by mail-wm1-f43.google.com with SMTP id 77-20020a1c0450000000b0033123de3425so3038719wme.0 for <51774@debbugs.gnu.org>; Tue, 16 Nov 2021 12:29:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:subject:from:to:cc:date:in-reply-to:references :user-agent:mime-version:content-transfer-encoding; bh=K8LW3l6pJ6JqOkhj8HO3IQbrC20nLVm8Hm/YNcOrXdU=; b=GF0e6YeA6Qe9MClKvZ1sIQqVle738ROBCp6s0XdKbN0xTF1L+WHV59R66hJBg9igKw D7ps7cU1blBZbo/e4txBbWiwFXO7Cz9Zaa8p9Bkm6vOySmc0L5Yn3Y7NhRGfsgKOozn3 UUDFUqaLm2xN7O9foD8J0pYwtAQRsXw+fBki6HytKR6WOSq8wB/tMa8T+hzANUtTfegk qxkYwwIf4pL6KwxjltY6PCww2kSx+br7/gjVOYuL078dEGo9UxsTq1buR3teYL3/a1fh aVBv40c5UdqPsHlwaTb4kxFlI6qqemmViGhQlpaWo0N5WYDtirPF+0nzndbxgKTReW4l Gatw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:subject:from:to:cc:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=K8LW3l6pJ6JqOkhj8HO3IQbrC20nLVm8Hm/YNcOrXdU=; b=Mj1acGmFDnGu4S9TAVB/ujcwT479bCRr6FZsXLQofQoMqsIekO21fgULQBlLPasqvs KnIHX2FuUNIKzm3k9UPlP076fh2UVhnMaj5gevsdygdDpN0gu4ir9VWlA9TQ5QYAfGu+ B/oAsz3g9r70d3TeeTCQQpTBF/jUX308DZGtZXTON+wXwYy+5gBOvXfQPOZGMVF08PLt k1Iy5D4OTK79IiVh7JaRfa+Y1OkXNHcZRkCeAOSVkMJrx8KHCrNFRLsF10hBubWN9YjU e2ieuLtsK+hm5MGoR9pi8LqPo6sSiSVt1LHGlymCkU3hemOHCR112y0WLRUpbLwl9j1A NC5A== X-Gm-Message-State: AOAM532vmsVeyC7mG7sn3lNxEboDU/Yhuhq5DQufsS2i0yLU0xzT2P2l PMCxmkY7N6dXkKFPrNadyuI= X-Google-Smtp-Source: ABdhPJze/nqrL3Odek355BjlwWw8z/EGJ4Qfo+sTSf8yU9gnVkWC41mRy0wliL/W0OglKdJzlahC6w== X-Received: by 2002:a05:600c:1d91:: with SMTP id p17mr11250516wms.193.1637094591705; Tue, 16 Nov 2021 12:29:51 -0800 (PST) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id l21sm9187956wrb.38.2021.11.16.12.29.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Nov 2021 12:29:51 -0800 (PST) Message-ID: From: Liliana Marie Prikler Date: Tue, 16 Nov 2021 21:29:49 +0100 In-Reply-To: <70rnBf4hiAtWtLXEZPbo9WBALUmUha4qT-xxVwBX-Z-TnfVEp5b6M-3cZ9H-oIg-VXpfqgP_4lSCX1Vzgy3IAFcYplL6gMeXI3L1gu_cNlI=@protonmail.com> References: <70rnBf4hiAtWtLXEZPbo9WBALUmUha4qT-xxVwBX-Z-TnfVEp5b6M-3cZ9H-oIg-VXpfqgP_4lSCX1Vzgy3IAFcYplL6gMeXI3L1gu_cNlI=@protonmail.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1637094608; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=K8LW3l6pJ6JqOkhj8HO3IQbrC20nLVm8Hm/YNcOrXdU=; b=ZShNgOYUwErhh8vUDs/BA/dPN7WD5n3VZln0Ix9XktnaSP4/jIadsxbhw2GPAhwEiLCMas 4NoUrDDe1gZZPjSuun7drgx/UO0NSRS5QeP1zlPFZPpeI4abEvoWSoPGD9wqHotOWqik4R Xa1r6Inc/fquQBZLqRK7tzbHm/f/aA8QS77upnqOxyVVWY9dGDrDSis9FbcQ5mJru5oJPz SoC+/QAU8wP5LX2wN0aeSmaUJALet49vFO6MUKmw9NtYK54aACzTlSHocQZ14ISThcd1AF 913sEJyiIAj5VsSWU4SGwFDI91Tm/rbRr8BGXsjyNNNTg7HK84fqiiKaYgd1KQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1637094608; a=rsa-sha256; cv=none; b=Z6mYgIpczt+nEcLkwSC0p3waUAebpZIp83HnjCWuAB7xzoswoEeGAY6j7VG3x4rHnuKpUz C799ANgI9jayWoXML0NMXlVcBvGmqXizJW/T9J4Z7O2Y2CmeRfqcTQyNchgW2+VjjEHYYM KUYEnmlMHLXHv+pTKnfpxEBGNsep/x2lILtSTpuq0KNE1Il8BUHT9jmLqqqexVpC683ZA/ yFv106fsyQEBV3Nk3mdftiwbxhv+N/nPoNIhXPMrWIHKfuSdAFXsl2kIz6jpXGmCbA7dQ8 aL+EAsnb22MEdEAReh4KzvKF1J6DSIKqDv/3phacSCDuAt9kX9bB6ZogFx9mGQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=GF0e6YeA; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.85 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=GF0e6YeA; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 904E832962 X-Spam-Score: -1.85 X-Migadu-Scanner: scn0.migadu.com X-TUID: ERTNqirCAXmK Hi, Am Dienstag, den 16.11.2021, 19:07 +0000 schrieb phodina: > Hi, > > Jelle pointed out, that this font is already packaged as adobe- > source-code-pro. Thanks, indeed it is. > > Unfortunately since the version string changed (another backslash) > the regexp now looks horrible. Maybe it would be better to define it > with let to keep the code cleaner. What do you think? In principle both are fine solutions to me, but the implementation matters. Perhaps someone else has another reason why to use one or the other, but that's it for me. As for the implementation here, see below. > * gnu/packages/fonts (font-adobe-source-code-pro): Update to > 2.032R-ro-1.052R-it-1.012R-VAR and update regexp in commit. Normally, you'd insert two dashes here and comments after that. These lines don't appear in the commit log or the diff. > diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm > index 3f36a71bdd..eddbeaba7e 100644 > --- a/gnu/packages/fonts.scm > +++ b/gnu/packages/fonts.scm > @@ -975,19 +975,20 @@ (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) > (uri (git-reference > (url "https://github.com/adobe-fonts/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)))) > + (commit (regexp-substitute/global #f "it-" (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) 'pre "it/" > + 'post)))) 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.