From patchwork Thu Aug 15 01:34:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: jgart X-Patchwork-Id: 67027 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 35FBA27BBEA; Thu, 15 Aug 2024 02:35:56 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 36A9F27BBE2 for ; Thu, 15 Aug 2024 02:35:55 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sePOs-0006eL-Kd; Wed, 14 Aug 2024 21:35:38 -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 1sePOi-0006cW-DM for guix-patches@gnu.org; Wed, 14 Aug 2024 21:35:30 -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 1sePOi-0000SA-33 for guix-patches@gnu.org; Wed, 14 Aug 2024 21:35:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=CZUQuN9Iq4UHE5fEiWA8Rf0EHgrK2s0Ue+jB3PA3TSk=; b=GrM50nbVfr1XtHVNiRc+gmFhL1TgfLsfiokP4PpuQwmkdPcwAvK1wjyxTHZTvzppFb1A/UhtbkxN/Kx1UJeg/nzRNiMA4WMRp4pbdJyBN6BeZc+V0wbIukGLxQGZjdfrgGWrvUpyc9h3QlC27WNCD0mWwIdaHcfvxWcGSwFR/Kcm3K+EHYtpkoxvt04+6hY4mL530uY6Zc8uuPS0+pFd4bSCME7KnWOVRAtt6pqX3GpMU85CnSf6fSSxYbXEYBd7qBRlBE0MPjRuvbRSs+vtgiqk+EjMzcoG8AgOukgYZ+GO1tenRpeD3oQHywoZTfDlcb7rIHqacOn4Q8FKdNGlIw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sePPG-0002Iu-Az; Wed, 14 Aug 2024 21:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72631] [PATCH] gnu: shellcheck: Update to 0.10.0. Resent-From: jgart Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, guix-patches@gnu.org Resent-Date: Thu, 15 Aug 2024 01:36:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72631 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72631@debbugs.gnu.org Cc: jgart , Lars-Dominik Braun X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Lars-Dominik Braun Received: via spool by submit@debbugs.gnu.org id=B.17236857168782 (code B ref -1); Thu, 15 Aug 2024 01:36:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Aug 2024 01:35:16 +0000 Received: from localhost ([127.0.0.1]:47871 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sePOW-0002HX-3H for submit@debbugs.gnu.org; Wed, 14 Aug 2024 21:35:16 -0400 Received: from lists.gnu.org ([209.51.188.17]:55348) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sePOU-0002HP-23 for submit@debbugs.gnu.org; Wed, 14 Aug 2024 21:35:14 -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 1sePNt-0006Yo-So for guix-patches@gnu.org; Wed, 14 Aug 2024 21:34:38 -0400 Received: from mx2.dismail.de ([159.69.191.136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sePNq-0000D7-Bn for guix-patches@gnu.org; Wed, 14 Aug 2024 21:34:37 -0400 Received: from mx2.dismail.de (localhost [127.0.0.1]) by mx2.dismail.de (OpenSMTPD) with ESMTP id b9a4513a for ; Thu, 15 Aug 2024 03:34:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h=from:to:cc :subject:date:message-id:mime-version:content-type :content-transfer-encoding; s=20190914; bh=APf8arGpGElg4ytbumIWM hY/EcnFYg13uBVJQGtdViE=; b=PiznOBbptyMrlHLzMmlzgTaKTq5iPlHc+i9Us aWLdy0MWUbWG9nl5+vAoB69xJViegCcc0qHNZ1jXHzrV0mlMFGt3kZDRlZeWviF/ CY/HgeEeeZW0mMP6VUAxTSUSCl4LnKENTCI810dhPNCFThS/x8SyOPYgZrN8sKeK r6VKQ5onRS/t1gsp1mnyUKX5/vbGzdzUVdrFpEs72omEapOwlHcEJs6IOlcYQaVs tXe+y5VL3hbu1nQB+8QtCVFPdv/2GzL0W+FMXlXlFOFoFndC/Qni/r8hXEF0nkTM Adlmcf/uzLhv1f/ePDivGubL8mgiXoKg4ZZEspMMzQMak+CfQ== Received: from smtp2.dismail.de ( [10.240.26.12]) by mx2.dismail.de (OpenSMTPD) with ESMTP id ced20955 for ; Thu, 15 Aug 2024 03:34:28 +0200 (CEST) Received: from smtp2.dismail.de (localhost [127.0.0.1]) by smtp2.dismail.de (OpenSMTPD) with ESMTP id f7dd0f7a for ; Thu, 15 Aug 2024 03:34:28 +0200 (CEST) Received: by dismail.de (OpenSMTPD) with ESMTPSA id c05ab643 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 15 Aug 2024 03:34:22 +0200 (CEST) Date: Wed, 14 Aug 2024 20:34:02 -0500 Message-ID: <3652bbe6695114b8ee29fb3e42c591468e64099e.1723685642.git.jgart@dismail.de> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Received-SPF: pass client-ip=159.69.191.136; envelope-from=jgart@dismail.de; helo=mx2.dismail.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-to: jgart X-ACL-Warn: , jgart via Guix-patches X-Patchwork-Original-From: jgart via Guix-patches via From: jgart 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/haskell-apps.scm (shellcheck): Update to 0.10.0. [arguments]: Use modern style and make manpage script executable. Change-Id: Id9dd03df4f8f0033dd3fc9a23b0b4d65ea1a73c6 --- gnu/packages/haskell-apps.scm | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) base-commit: 936928fe38946a7496273e636ca8888914d100a9 diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 43c12fd71c..e428e79047 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2021 Stefan Reichör ;;; Copyright © 2021 Morgan Smith ;;; Copyright © 2022 David Thompson +;;; Copyright © 2024 jgart ;;; ;;; This file is part of GNU Guix. ;;; @@ -921,30 +922,31 @@ (define-public scroll (define-public shellcheck (package (name "shellcheck") - (version "0.9.0") + (version "0.10.0") (source (origin (method url-fetch) (uri (hackage-uri "ShellCheck" version)) (sha256 - (base32 "071k2gc8rzpg9lwq9g10c9xx0zm1wcgsf8v4n1csj9fm56vy7gmb")) + (base32 "08bdjcdl457xz2vh8y2w29bcwh1k7sfzyvszln3498vm5m1xn22d")) (file-name (string-append name "-" version ".tar.gz")))) (build-system haskell-build-system) (arguments - '(#:haddock? #f ; TODO: Fails to build. - #:phases - (modify-phases %standard-phases - (add-after 'build 'build-man-page - (lambda _ - (invoke "./manpage"))) - (add-after 'install 'install-man-page - (lambda* (#:key outputs #:allow-other-keys) - (install-file "shellcheck.1" - (string-append (assoc-ref outputs "out") - "/share/man/man1/")))) - (add-after 'register 'remove-libraries - (lambda* (#:key outputs #:allow-other-keys) - (delete-file-recursively (string-append (assoc-ref outputs "out") "/lib"))))))) + (list #:haddock? #f ; TODO: Fails to build. + #:phases + #~(modify-phases %standard-phases + (add-after 'build 'build-man-page + (lambda _ + (chmod "manpage" #o555) + (invoke "./manpage"))) + (add-after 'install 'install-man-page + (lambda* (#:key outputs #:allow-other-keys) + (install-file "shellcheck.1" + (string-append #$output + "/share/man/man1/")))) + (add-after 'register 'remove-libraries + (lambda* (#:key outputs #:allow-other-keys) + (delete-file-recursively (string-append #$output "/lib"))))))) (native-inputs (list pandoc)) (inputs