From patchwork Wed Nov 29 22:35:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 57110 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 7E0DA27BBEC; Wed, 29 Nov 2023 19:41:07 +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 55A2827BBF5 for ; Wed, 29 Nov 2023 19:41:00 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8QPm-0001PM-Al; Wed, 29 Nov 2023 14:40:06 -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 1r8QPd-0001Cl-K9 for guix-patches@gnu.org; Wed, 29 Nov 2023 14:39:58 -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 1r8QPd-00012P-BY for guix-patches@gnu.org; Wed, 29 Nov 2023 14:39:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8QPk-0006C0-Ur; Wed, 29 Nov 2023 14:40:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#66827] [PATCH v3 66/66] gnu: actionlint: Update to 1.6.26. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: cox.katherine.e+guix@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 29 Nov 2023 19:40:04 +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 , Katherine Cox-Buday X-Debbugs-Original-Xcc: Katherine Cox-Buday Received: via spool by 66827-submit@debbugs.gnu.org id=B66827.170128679623723 (code B ref 66827); Wed, 29 Nov 2023 19:40:04 +0000 Received: (at 66827) by debbugs.gnu.org; 29 Nov 2023 19:39:56 +0000 Received: from localhost ([127.0.0.1]:51472 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8QPb-0006AS-MZ for submit@debbugs.gnu.org; Wed, 29 Nov 2023 14:39:56 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:59765) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8QN1-0005uP-62 for 66827@debbugs.gnu.org; Wed, 29 Nov 2023 14:37:16 -0500 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-332fd78fa9dso101060f8f.3 for <66827@debbugs.gnu.org>; Wed, 29 Nov 2023 11:37:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701286622; x=1701891422; 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=i70gHjVGUwqFIHePJN9UU66dcO1t8vWtBniK3ZkFCFk=; b=gM2sV5cEVpMwu4BieAgz9taeOjsudyWFxIaeZbZh8d6d20CuqzGM/81oTAT2FYUmb4 alCaGvbe3gBNKeoAQCPHRQyQ4kroeXWNpBr3ULCwARvtcCSofsUZXzB49YS120qZTEWt Vb2/Jg+VIq2hdDYZiNp3dELISYCBJIOS7DKfZmv10gQOXkaIKn2JFkfvsr+3ZTEOBMpw izTJNy0JJKn0m6KholFVYe68qupsOpa/ktX/puYUGYeolIWvbZPtZAjhOEKxTuI5bbYy NXPXawWz5SSEWT9EETWRpoxl5EI98JD26ed6KuK4VgdMBLqJhBXUUsuxrhc6Zq6LtCRm o+mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701286622; x=1701891422; 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=i70gHjVGUwqFIHePJN9UU66dcO1t8vWtBniK3ZkFCFk=; b=sZ+T/bHPrR9SWEDrfd4zX+AWbzQtz7GS/yqD81blXVB3+PtDxl7Xgni67gRQAACNvf OUmgpeqdZIHNdOsgqV/XoJ9iunZpGtxAu+AKCGexkLqcn4vuEI/9QGWAcWmjYEM6KL0H njMmpvwjsj//po6vnDLJq8KXHzEW52OQc69J74BoTGP3275zioknbebgzBx4Xdg4Urjg HlCR4TBXmLQOFUDlJMYYeYbwe0amRq1wWkleZgpiKW+n34zSLdShICoELAFlVCIeE934 dpZ9ZYGrp0GmKr00CX0pRRidgf+B0D6UvAedJKEoaD2J6LtfE0ThzK01dkZmNbj+kMYD 0h+A== X-Gm-Message-State: AOJu0YxSoXXUaOt+BPzyIXJ7GMLlKqvB9ZiPatoGaqObuPS4I9Woqq44 FZc2yMASmAGiMzDuSev/Faxak15VjI/Wwg== X-Google-Smtp-Source: AGHT+IFSvdA0GSE7V2Ph5GqDod8WCxXJAC2LyD2BIR64epwUh98Y7fiOYdTZDlChOXdSpUMF2Atpdg== X-Received: by 2002:a05:6000:92f:b0:332:fd68:6651 with SMTP id cx15-20020a056000092f00b00332fd686651mr7901265wrb.54.1701286621677; Wed, 29 Nov 2023 11:37:01 -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 q17-20020a05600c46d100b0040836519dd9sm3239674wmo.25.2023.11.29.11.37.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 11:37:01 -0800 (PST) From: Sharlatan Hellseher Date: Wed, 29 Nov 2023 22:35:44 +0000 Message-ID: <58e69550a27bc7a2ad67ca5d5b2df611172ceb4f.1701297273.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <123a0b9b76c24c29184c527dabb652384f7be762.1701297273.git.sharlatanus@gmail.com> References: <123a0b9b76c24c29184c527dabb652384f7be762.1701297273.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 1f5b886977..a2fdde903e 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 77a0d98c6e..2262f6011d 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7277,24 +7277,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"))