From patchwork Mon Aug 21 18:06:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 53083 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 4F3D727BBEA; Mon, 21 Aug 2023 19:12:10 +0100 (BST) 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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS 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 9043127BBE2 for ; Mon, 21 Aug 2023 19:12:09 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qY9MV-0005e5-Rk; Mon, 21 Aug 2023 14:10:48 -0400 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 1qY9Ll-0005Md-NL for guix-patches@gnu.org; Mon, 21 Aug 2023 14:10:06 -0400 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 1qY9Ll-0004na-EH; Mon, 21 Aug 2023 14:10:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qY9Ln-0007Vm-38; Mon, 21 Aug 2023 14:10:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65230] [PATCH v3 04/10] gnu-maintenance: Fix indentation. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Mon, 21 Aug 2023 18:10:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65230 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65230@debbugs.gnu.org Cc: Maxim Cournoyer , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 65230-submit@debbugs.gnu.org id=B65230.169264135128692 (code B ref 65230); Mon, 21 Aug 2023 18:10:03 +0000 Received: (at 65230) by debbugs.gnu.org; 21 Aug 2023 18:09:11 +0000 Received: from localhost ([127.0.0.1]:57683 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qY9Kw-0007SW-IG for submit@debbugs.gnu.org; Mon, 21 Aug 2023 14:09:11 -0400 Received: from mail-qk1-x731.google.com ([2607:f8b0:4864:20::731]:61505) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qY9Kq-0007Qy-Lw for 65230@debbugs.gnu.org; Mon, 21 Aug 2023 14:09:08 -0400 Received: by mail-qk1-x731.google.com with SMTP id af79cd13be357-76d93cf8e13so214566885a.2 for <65230@debbugs.gnu.org>; Mon, 21 Aug 2023 11:09:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692641336; x=1693246136; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NChkL5OrIwj9vZ+wWHvnTwIVDB6osNDrfs6xUqJhXf0=; b=dZcHCTna5sSBqHfK2JdqGf2DwNuq/LsbAobrm7EvZiH2tMIm7Q76ugKj4HQJTo37cC ahJ0e/lZssotPi7pcVdIrkCgctIuKzwRV6ryKhgAsf4ofW6X5jGOEgaUrxPlS/Old0zZ 4tgZp0gC9/BKxY1EGV3gZpdd2l7QZvjsZ7zDOnPqGdfUMpsObRxiWDo5cegoCWNTCRa/ Bf26kDp3l0D/bGkODnfeG5iRVTFoMdwus59LRR2voibK8DPVEVZLCzvSTdZy2TiCCBOC 5I8gDBsm9UytO/1v5t2/eHSnYQVJrn3LuXUaE4vzRfvN/sOJT1FEQSY7i3+NO4DZ6SFm PKGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692641336; x=1693246136; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NChkL5OrIwj9vZ+wWHvnTwIVDB6osNDrfs6xUqJhXf0=; b=d5j6HWkvdJiFUL1GKuzrKyVSDkC8bHcV+3YacT/W1KnOAj7pnEgYGHX+GiY5euQM+/ xDoIOcb6xXTyNEoN6olO+M/GgUxp4cbqXBpfWtctuBOC9vMYOdQpAu+9lbcKrwse5Bw4 xzItu+7E40lCXHh11MBAtQ+Z+PPc6cNLLxXlVazM728sjjEaludLDAttJs4UF3NaCptL 3QWZK80TzO6fZpQ9CdgusgEIlpYPWe2Hpf1ipKCD9stdN5xNXDERO5VIXN3rvtl95imq W0HLzuDIvp1VE081lmFPvVY3Wvitn1fJAC7m/fRU/Xa+PWMWtRm2dT0EkvEkaL04WvjE PZaw== X-Gm-Message-State: AOJu0YxQGFYy3UOXeuIr7IfPM/A+56fjtqDo0T4+4xxGCynv1vxHdmId YI3nyB8oIah+VmZQbL+C2ALptgkgGXM= X-Google-Smtp-Source: AGHT+IEk5qTix8tXeKuq3LI7kmBHRASOZoXfKJdIsRazkozUI/imoplNiQ/Axc+KIBHFEqAMtUMqCw== X-Received: by 2002:a05:620a:40c6:b0:76c:ecef:28c with SMTP id g6-20020a05620a40c600b0076cecef028cmr10446562qko.57.1692641336642; Mon, 21 Aug 2023 11:08:56 -0700 (PDT) Received: from localhost.localdomain (dsl-10-148-105.b2b2c.ca. [72.10.148.105]) by smtp.gmail.com with ESMTPSA id t16-20020a05620a035000b00767303dc070sm2635523qkm.8.2023.08.21.11.08.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 11:08:56 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 21 Aug 2023 14:06:08 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <5465490ad96f27fecbb69f9bd6f1607d29af6c23.1692641173.git.maxim.cournoyer@gmail.com> References: <5465490ad96f27fecbb69f9bd6f1607d29af6c23.1692641173.git.maxim.cournoyer@gmail.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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/gnu-maintenance.scm: Re-indent file. --- (no changes since v1) guix/gnu-maintenance.scm | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 2e0fc3e8ab..67abbc1c5a 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -578,11 +578,11 @@ (define* (import-html-release base-url package (coalesce-sources candidates)) ;; Select the most recent release and return it. (reduce (lambda (r1 r2) - (if (version>? (upstream-source-version r1) - (upstream-source-version r2)) - r1 r2)) - first - (coalesce-sources candidates))))))) + (if (version>? (upstream-source-version r1) + (upstream-source-version r2)) + r1 r2)) + first + (coalesce-sources candidates))))))) ;;; @@ -656,20 +656,20 @@ (define* (import-gnu-release package #:key (version #f)) (tarballs (filter (lambda (file) (string=? version (tarball->version file))) relevant))) - (match tarballs - (() #f) - (_ - (upstream-source - (package name) - (version version) - (urls (map (lambda (file) - (string-append "mirror://gnu/" - (string-drop file - (string-length "/gnu/")))) - ;; Sort so that the tarball with the same compression - ;; format as currently used in PACKAGE comes first. - (sort tarballs better-tarball?))) - (signature-urls (map (cut string-append <> ".sig") urls)))))))) + (match tarballs + (() #f) + (_ + (upstream-source + (package name) + (version version) + (urls (map (lambda (file) + (string-append "mirror://gnu/" + (string-drop file + (string-length "/gnu/")))) + ;; Sort so that the tarball with the same compression + ;; format as currently used in PACKAGE comes first. + (sort tarballs better-tarball?))) + (signature-urls (map (cut string-append <> ".sig") urls)))))))) (define %package-name-rx ;; Regexp for a package name, e.g., "foo-X.Y". Since TeXmacs uses