From patchwork Mon Oct 30 01:09:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 55639 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 22FF927BBEA; Sun, 29 Oct 2023 22:14:49 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS 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 9D72C27BBE9 for ; Sun, 29 Oct 2023 22:14:47 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxE2U-0000BR-JH; Sun, 29 Oct 2023 18:13:46 -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 1qxE2N-00005z-IX for guix-patches@gnu.org; Sun, 29 Oct 2023 18:13:40 -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 1qxE2L-0001Bd-HV for guix-patches@gnu.org; Sun, 29 Oct 2023 18:13:38 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qxE2s-0005pC-9T for guix-patches@gnu.org; Sun, 29 Oct 2023 18:14:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66827] [PATCH 66/67] gnu: actionlint: Update to 1.6.26. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 29 Oct 2023 22:14:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66827 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66827@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 66827-submit@debbugs.gnu.org id=B66827.169861763222217 (code B ref 66827); Sun, 29 Oct 2023 22:14:10 +0000 Received: (at 66827) by debbugs.gnu.org; 29 Oct 2023 22:13:52 +0000 Received: from localhost ([127.0.0.1]:43948 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxE2Z-0005mC-LC for submit@debbugs.gnu.org; Sun, 29 Oct 2023 18:13:52 -0400 Received: from mail-lj1-x22a.google.com ([2a00:1450:4864:20::22a]:57415) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxE02-0005YH-L4 for 66827@debbugs.gnu.org; Sun, 29 Oct 2023 18:11:16 -0400 Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2c504a5e1deso56792361fa.2 for <66827@debbugs.gnu.org>; Sun, 29 Oct 2023 15:10:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698617436; x=1699222236; darn=debbugs.gnu.org; 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=DxRAlP1OCiHYqNPtWvEJBrileqFfzBSxPtZtBzHJ7og=; b=jUXbe1DRGAXf3K9LPDGhl0kneKpPm/lG7JCm5QxOBnX8hTbMtLCZ/rRgJ0akJlJqap MUJ75zHySDDsNPokqP0Q6YcZ5IuWUW2gzmQoVWAAW3GG8RGAiBZIN31Cn9TYSNLyXUFj ofLQ6Ex+U8Dxr67478L3PLFl70HBi8Rj6siRRLTgNyH5IxUWDAB6XsuRv+vv17Mh2Gnh K7SdkCSV2JgYrtS+VhxdCCbTb/Zr8b75LtDpml3LWh4JRPUQWt4p1t4Q7tzlfE2/QNxX MlMro+6CRX1Lql7VUgbObESnaHXkWlSmi37fixGSoehTa5QT82YaJmy4L0Fs2iOutfPW g/0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698617436; x=1699222236; 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=DxRAlP1OCiHYqNPtWvEJBrileqFfzBSxPtZtBzHJ7og=; b=MzvE1g6/qlFXoJUcsbtFFml1wNJkErk1pv8mixvmU/RMP9JK7/LuqJgkUvF3iu+8pv ge7WWAcCw2A9q1+oPUE5wmYO3jVnLZecdH5JsMMyEWgdJVsDV2CQRShSv/TUPSqr0ul3 MoMDcv65QlPbcanpwWZb77SWoQ0bMCW1swQjyoKOQNUh5NMVIdezaQ0jD0tsngSon+om 3bXLcFlNX2FqFdAyI3rzZ/VN9dzpn8Ik56zhSTp56twJ+lelokxwe+gXw2/aXALVWPM6 E11u80pNFknGgqDbvZ1FVY1qubE3UTQI9Vjwj602DVm/lDGZUSKrTWpirshhCHSUsPOO PFZw== X-Gm-Message-State: AOJu0YxZT2yg9Zw/+COhqGRfirZ/VLJVY5rICcljhSAJB/9jWdNph/w/ BQp21JPJ7VUnye0GOEKYZOusM3Mn6PpVLw== X-Google-Smtp-Source: AGHT+IFXyhALtnhqbx6XY4Tf2DkZfRISHjuQbWkLGhu76MLMsRBfUsYcOwsaSFbaRoF+DnQ9ifyZfQ== X-Received: by 2002:a05:651c:38c:b0:2c5:2df8:d31c with SMTP id e12-20020a05651c038c00b002c52df8d31cmr5736811ljp.21.1698617436011; Sun, 29 Oct 2023 15:10:36 -0700 (PDT) Received: from localhost.localdomain (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id 3-20020a05600c234300b004063cced50bsm7527511wmq.23.2023.10.29.15.10.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 15:10:35 -0700 (PDT) From: Sharlatan Hellseher Date: Mon, 30 Oct 2023 01:09:20 +0000 Message-ID: <51390734cd158679f9cd0fc2c7d04edd43fc5a65.1698627461.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 * gnu/packages/check.scm (actionlint): Update to 1.6.26. [inputs]: Swap go-github-com-robfig-cron-1.2 to go-github-com-robfig-cron * gnu/packages/golang.scm (go-github-com-robfig-cron-1.2): Delete variable. Change-Id: Ie2c25254ffefb99f8808f74ae4a9d85bbbcb6437 --- gnu/packages/check.scm | 8 ++++---- gnu/packages/golang.scm | 18 ------------------ 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index cf26196a24..fc338394bf 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -39,7 +39,7 @@ ;;; Copyright © 2021 Hugo Lecomte ;;; Copyright © 2022 Maxime Devos ;;; Copyright © 2022, 2023 David Elsing -;;; Copyright © 2022 Sharlatan Hellseher +;;; Copyright © 2022, 2023 Sharlatan Hellseher ;;; Copyright © 2022 jgart ;;; Copyright © 2023 Luis Felipe López Acevedo ;;; Copyright © 2023 Timo Wilken @@ -1069,7 +1069,7 @@ (define-public cpputest (define-public actionlint (package (name "actionlint") - (version "1.6.23") + (version "1.6.26") (source (origin (method git-fetch) (uri (git-reference @@ -1078,7 +1078,7 @@ (define-public actionlint (file-name (git-file-name name version)) (sha256 (base32 - "07is4920a40zrl7mfldg0az2pisi7f6dv4vh3ijn3nzb4i7fqbni")))) + "0j4ni2cryvqn3qim1r6q6sargh0wig6l4vjjwc40cgqvvkrdla04")))) (build-system go-build-system) (arguments '(#:import-path "github.com/rhysd/actionlint/cmd/actionlint" @@ -1087,7 +1087,7 @@ (define-public actionlint (inputs (list go-github-com-fatih-color go-github-com-mattn-go-colorable go-github-com-mattn-go-runewidth - go-github-com-robfig-cron-1.2 + go-github-com-robfig-cron go-golang.org-x-sync-errgroup go-golang.org-x-sync-semaphore go-gopkg-in-yaml-v3)) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 740ddbe440..cdf0f23a90 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7164,24 +7164,6 @@ (define-public go-github-com-robfig-cron a cron spec parser and job runner.") (license license:expat))) -;; Required by actionlint. The version of `go-github-com-robfig-cron' -;; packaged in Guix is newer and changed some error messages, causing -;; unit tests in actionlint to fail. -(define-public go-github-com-robfig-cron-1.2 - (package - (inherit go-github-com-robfig-cron) - (name "go-github-com-robfig-cron") - (version "1.2.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/robfig/cron") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0nv31m3940d9kf38lw2zs4hpj435bdi9mmim098rb3n4l07qrvva")))))) - (define-public go-github-com-shirou-gopsutil (let ((commit "47ef3260b6bf6ead847e7c8fc4101b33c365e399") (revision "0"))