From patchwork Wed Nov 8 00:41:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 56087 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 9B69A27BBE2; Tue, 7 Nov 2023 21:47:46 +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 2C59227BBF5 for ; Tue, 7 Nov 2023 21:47:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0Ts9-0002Kn-Qd; Tue, 07 Nov 2023 16:44:33 -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 1r0Ts8-0002Hh-Fy for guix-patches@gnu.org; Tue, 07 Nov 2023 16:44:32 -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 1r0Ts8-0007vF-8H for guix-patches@gnu.org; Tue, 07 Nov 2023 16:44:32 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r0Tsk-0000pU-CH for guix-patches@gnu.org; Tue, 07 Nov 2023 16:45:10 -0500 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: Tue, 07 Nov 2023 21:45: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.16993934742947 (code B ref 66827); Tue, 07 Nov 2023 21:45:10 +0000 Received: (at 66827) by debbugs.gnu.org; 7 Nov 2023 21:44:34 +0000 Received: from localhost ([127.0.0.1]:43682 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0TsA-0000lL-Bg for submit@debbugs.gnu.org; Tue, 07 Nov 2023 16:44:34 -0500 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:54708) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r0TrP-0000aL-Qt for 66827@debbugs.gnu.org; Tue, 07 Nov 2023 16:43:48 -0500 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-32f7c44f6a7so3659825f8f.1 for <66827@debbugs.gnu.org>; Tue, 07 Nov 2023 13:43:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699393384; x=1699998184; 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=VZwKnPRYd6SlGswB+vBRqRcIqLisMj5C4tg8GheUmQ4GMy1+2yHAL+pgn6c5O+8brQ 4UUjw5LySgLXY5ZsQmH+1sLY7sRR2yxqoKI+p+ym/CPcuZwv1HwhMPPs9yCD/hlAvNu2 3dTvNtWdqvs2mJW6aMc+yjtf61ynEmGdnAZP0ojdoY2kKyr6UgqtMd7X3LlALYF7iyF7 7iDAQV543ENncHoV8svqtV+6Oi6OEQ5OTHDRyFbDfARjiT9UUieMWuNHfyTXk/R0yGVn MmzxwXvbafJx5Od5VRXT28r0NDLLqbCTHLQkyIqlzcef/qZAmuPojP1eEnUufI2T+gAU 6X3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699393384; x=1699998184; 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=V1x0V/zgtnP3K+PFYXeB+f0EDMFnKtv419g7or9xu9JiQkRtSr0CIpouORGX/IKa0O 6WecTp+kZE9BVopJsYZZUBFwx8HVvSnEIcLreETmUOqZNVPN4/m8ceGfRmxiD7RnluOG QCGtPh3deegdj+zr+wor+dxNpcKHEzyaqxdls5wRJBqT9WeA+WzWSMaAorYwxqldj7sJ 9dT+BtQ80nKOs5XQqofP00JyeKwzUUA7E3FavIaGT79a78JMHrUDZcI1Lh1YSxVYPoAt iClEr05X4/bhceHPIGxu08+t9+u6Izxzkwzxt5Zw8K29YwDZmUawejSr6o+nYpDuL6mY mMKw== X-Gm-Message-State: AOJu0Yxdk3zd5qy3FAQp4U+TOz6e2L1POWhJHvKmxextEc+P9rC18/HH crJOIeqYnB39Q0e4TwYjobynDwMX4aCh7w== X-Google-Smtp-Source: AGHT+IE1dAcOK4gBGAqTyOjQe8SSJs+s8dqxBPMcAldj7OKo7YM7J4cX7VIORn1B0YUmKDsebUnRfQ== X-Received: by 2002:adf:f3c3:0:b0:32f:7f17:b049 with SMTP id g3-20020adff3c3000000b0032f7f17b049mr39083wrp.39.1699393383893; Tue, 07 Nov 2023 13:43:03 -0800 (PST) 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 p2-20020adfce02000000b0032f9688ea48sm3310178wrn.10.2023.11.07.13.43.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 13:43:03 -0800 (PST) From: Sharlatan Hellseher Date: Wed, 8 Nov 2023 00:41:43 +0000 Message-ID: <146d0817c9568cee0bc5b15cb58e3fc094fd195a.1699403993.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <0117df90b1ef43a67d4fa86e5b58e60f7c0a52e5.1699403992.git.sharlatanus@gmail.com> References: <0117df90b1ef43a67d4fa86e5b58e60f7c0a52e5.1699403992.git.sharlatanus@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 * 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"))