From patchwork Tue Nov 2 23:23:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 34217 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 B80AE27BBE3; Tue, 2 Nov 2021 23:31:49 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 44DA827BBE1 for ; Tue, 2 Nov 2021 23:31:49 +0000 (GMT) Received: from localhost ([::1]:42226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mi3Fs-0007Fj-Bk for patchwork@mira.cbaines.net; Tue, 02 Nov 2021 19:31:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51636) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mi39K-0004Cb-Af for guix-patches@gnu.org; Tue, 02 Nov 2021 19:25:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54998) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mi39J-00071n-Vr for guix-patches@gnu.org; Tue, 02 Nov 2021 19:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mi39J-0006t1-Qa for guix-patches@gnu.org; Tue, 02 Nov 2021 19:25:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51364] [PATCH] gnu: emacs-flymake-shellcheck: Add shellcheck as an input References: In-Reply-To: Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 Nov 2021 23:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51364 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51364@debbugs.gnu.org Cc: Morgan Smith Received: via spool by 51364-submit@debbugs.gnu.org id=B51364.163589548126437 (code B ref 51364); Tue, 02 Nov 2021 23:25:01 +0000 Received: (at 51364) by debbugs.gnu.org; 2 Nov 2021 23:24:41 +0000 Received: from localhost ([127.0.0.1]:38311 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mi38y-0006sL-MX for submit@debbugs.gnu.org; Tue, 02 Nov 2021 19:24:40 -0400 Received: from mail-dm6nam11olkn2096.outbound.protection.outlook.com ([40.92.19.96]:30464 helo=NAM11-DM6-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mi38w-0006s6-5z for 51364@debbugs.gnu.org; Tue, 02 Nov 2021 19:24:39 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MnZlZgm682/WKuQloaALvA0fVYpuNKn1y15PgLesZ67MbnnraQsOYCbmQg6BsOQXAq3d8SDcjkpE+eroTKKUde/HN+wGtw0/zTNIFeb70sJY+v4Iy9mB8yB7jINACQ1scUAtRVudA098kla3Szsfcd31f+sJ2eRw/APQ/XM0VFvOkobZdnrFZwv+UCP4+VzRHBo75oxeTTtP+URnDFG3mzeHk+V5dg37vijmf+YfWjKoqQ3o5Pdz7RJew3vqJhstL9YGkie7N998ypeMjdR0e+2FzRLQ3mj7IpyrcXGO1ut4JFNWldGTQw2y2zZ2kgVYPeHdSjyALiQjWwqBsfAXLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=I90Fcf+uEtyi0jJsQmlOLt/c3HVCBecGTp6fRSqjDTg=; b=k2/nU3Jbm0g5O/SXJl+Rv2Vh0t0iW5zm6W6T5rsQS4F0xHs9sthdfR98Pm5hSQBG8QzAWlRDAlzI1NhsxeFdQALugmxtxDtHDC38tmfISM2MOIgn+QFpZogAguMV2DAnmVhhL/51G9VnKRdm9IKVzNGmd+ZwCchjUBGLe3xPk0imDsAXHwXLDL2tAEVe3FannXIveaWRGnBm4p6B6bRmQtnQb/ROC+K+fXnB8RKKOCxUpXDTZiWOhnkzZXA8TRf/uUFjR1PpKyuG4+iy6/Wk+4C0dMx+5zAdtvlsqV7n6ce4R0tGXMzHVMFrlqwBCvTZ2F2Pd125ZNOwBO7fDc0i3g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=I90Fcf+uEtyi0jJsQmlOLt/c3HVCBecGTp6fRSqjDTg=; b=u5QUfgC1ZwFF69R/vmP+8wEZDSv58P1MzyCS0S3mNtk+aAf62pyhLAy6TsvOiXYyP1qS89YWWi/8cTWJmMGMlaR4sK9IdtyswBEK95gXFO+TMt22AWNp1Bh2+GAfvr+fmRdvaDY4PxtidfC6BjOZzBz5OZQ2lfBcvfBG1o/mqn0UFJuhf7tm5syl+m+EuLguAZmVZpekKTCchAh7NLPcecxHXJ2Z5F4esMmAAfXnXV9pm4MSoNvLg7jPjEgR8rRAGXIU2BrtdPYEmHa45kCQitGAh0cIn5DqSyR7TFX25ADAiGySqAQ2R7FZITnHpPtCceGECkkY8C/xfmPcUqTfAg== Received: from BYAPR05MB4023.namprd05.prod.outlook.com (2603:10b6:a02:87::30) by SJ0PR05MB7359.namprd05.prod.outlook.com (2603:10b6:a03:28b::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.4; Tue, 2 Nov 2021 23:24:31 +0000 Received: from BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::745d:ce8d:67ec:5154]) by BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::745d:ce8d:67ec:5154%6]) with mapi id 15.20.4669.010; Tue, 2 Nov 2021 23:24:31 +0000 From: Morgan.J.Smith@outlook.com Date: Tue, 2 Nov 2021 19:23:50 -0400 Message-ID: X-Mailer: git-send-email 2.33.1 X-TMN: [JVfNUe2S9KYQpDsbxj+n4g/sd+6wMDbp] X-ClientProxiedBy: YQBPR0101CA0223.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:66::12) To BYAPR05MB4023.namprd05.prod.outlook.com (2603:10b6:a02:87::30) X-Microsoft-Original-Message-ID: <20211102232349.30593-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from workpad.hitronhub.home (170.52.80.188) by YQBPR0101CA0223.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:66::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.15 via Frontend Transport; Tue, 2 Nov 2021 23:24:31 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e2128192-434a-449d-bfae-08d99e57ec68 X-MS-Exchange-SLBlob-MailProps: NS9Gj58uCj2rFEzRidwWlqhcSEBHqh7oS6GBr/u+jalse6DP4B5faCYqH+3aPLjCDDew+vwHIx9Hjns1Cw2kyZYLE+nVELIK++AK41/gKrcAn0pjin/Qv6LsqfRIyHwFesObU4rDpHeQ6lQDQPPcTiNy1g5orHzC7ZRhetBtalRVpAFnnWROpzQC5U1rvhaFX6q6yeBvOMgGPK3wrYlBcDVecoNulIN5TDElGj+LEzvwr0YNf10FliAUhdQmjAa1yqa9tF5VV0RG4V4Xv0dGm1o95oywFm/6gYjeZ9aobetLIMV8AyexlZ+6HgOCLEZab4ClRrrLx4teP2QyknMrqB/yQ/icH1YenHdV7WvVcdmN/WT/a/ro4Y4E0xHcswSjESZhORkcCpIOeAL0J0m6JvDEnxUo3NEjLf8kr/w1toA4ePbBEjMDs+0aDydkqAtr///Pk4PfNfghBs37LG+lj9EZPrL6XG6adluTGKGtm86VwxoYs70EFN2w1JANweo75u8WCOdQukZyikqE5TB64Gv5il5Gv6V6DZFI973XjeQq2D4dksWJYhI459NlYts3vuMiuzrId/Lqt0wY4KbcsNJR7KVtF/LEbTd6SDw6ZFV/ad2mqw709Ba458tO306mqVSfqLixynFLaYONVpDE9fZSZ43gZ0QSmUwy+lj9FVsfgQhwiaCAEL2U2xW4t9zqR+M3TO4YbcDbdgiJqi0Tdg== X-MS-TrafficTypeDiagnostic: SJ0PR05MB7359: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: z1jcwlk6Zy8bgemRGY6gsp6TzGdtSfpyUNFlW7uFe6DnuNctabF6wftHETXJuCYVFldrK+4MP3zhIo26qgtQpxWAEzOGYA4s0nApnfd7WL4cci3BeQq/EMKd64H+CRu5gk0tM0B4VqcfO4fsAu3w1gNqZLT7VOC6N8jtb+xu66jMG/YhaEpaufgJUhTkHDjvIApqe5o4Xqxh497okbu0Nr6TC+4ghNRk02z/sp7TsQN6Pm/1EzaiGamyEm6Rc1tjNByjsiytIlaFWCkqpsL7JNLRw2+H9AGYMb/lHVsXdn2URCoCgL5Ua7QwE5K5os/YIiBwRCUkgNN65zPTy4N9lJQi5Qodgr3haVoC8kNgWklsLjDQWyYQBaL3zA/2XKn9IWH56ItlxNL8Jg9KeP9H3HKsoCs4y2R3Lp+GDUKggJLrrs2+z5NaE8ENlYAuuYdJWKQo8AWiD0iZIDKut4KcAbhGoa/YOSHRKkFg85em03xOEIp1MYkU6kDVmEGziwi7Y1C/AjpH5SLCzkY1Vqs0Y9xN6m7gY4pw6gHUeCUIC+sXsujdZXQ5lE8UqkWE2X8XPwnCEB2vWt9vDe1kxYGBLA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sfnJrnwlTsSdX6w77U+8TfiHq6fUPhm9Gcv7Dfd8iIrFa4HWiJzuKrK6l6SwSM3i4VMBR4CJiJa9kUicLPAsO+KTW3U1iXNltIpC/K4V+GvUsvXHYpQt6wztY6nB8WC1PZKqZySqwgPM4A5JNnvzqEGnKVH0LsbDnUhQsWR0IL/MJwPrd/6Tzn/wOSTtV3IbQLNiNYDQ/GZpJBQQYHFrPprt95/NvudIUyvRNrV6cC7Yn3AEG5q9QgohvIyRR7dNRfMDCxOtHVxr6VKm5dqaSFkMr8Znw63A6tC/tQ8D5gC9VE/3vv+s0BFkB5FgAclcuTlQIaHNZKOjPw8CALF2pfKUrAEcVRAQNo7VEcSGYXuB7/kXiNUIRW+oQZVNgihgSLvk/kV4C/MDOMiuo/aYm0vFUgNZVtUvS59MKzf90B4jOX+evB0Vf8Y1VS/feBFZyYzEQbCjvbVNGj1QZndwy0wQnH2ayqS042T9PFrmMJ5LQZZD/sjPSD3Wew1V7KQd2H/aHYqHWL8z4H8M6vHq71dq4eR0SmWNY91ioRm2KmZyOvh6j6BcWbPq69u8LiIanuU5KdzgG9tuJoIKGViiq16sMbirNafqRjkMF9giEeJdKF8giQwtUW1SSWz2YeI9JLGfjvGSxXPtUZxER0oAU1l4xM7KBwUaHjRnzLl7d9JjS/k8O1tVxfUiOFONMdTI+kgt2uO7I4oBH5a8D6EUwg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e2128192-434a-449d-bfae-08d99e57ec68 X-MS-Exchange-CrossTenant-AuthSource: BYAPR05MB4023.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2021 23:24:31.8005 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR05MB7359 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" X-getmail-retrieved-from-mailbox: Patches From: Morgan Smith * gnu/packages/emacs-xyz.scm (emacs-flymake-shellcheck) [inputs]: Add shellcheck. [arguments]: Add substitute-shellcheck-path phase. --- Sorry for the late reply, I didn't see this in my email. People would still have been able to set the variable from their configuration. The value I'm editing just determines the default value. However, I think I came up with a nice solution that should make everyone happy. It first checks if there is shellcheck in your path and only hard codes the path if you don't have it. Apparently Emacs even re-evaluates defcustoms in certain situations so this *might* even work if someone installs shellcheck after this file has been loaded. gnu/packages/emacs-xyz.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 624fe957e3..dad555cae3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1649,6 +1649,19 @@ (define-public emacs-flymake-shellcheck (sha256 (base32 "04yfb4sy41spjzk9mhm4gy0h8vnjx09p2g6nm1yzgd9a5ph9sqgl")))) (build-system emacs-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'substitute-shellcheck-path + (lambda* (#:key inputs #:allow-other-keys) + (make-file-writable "flymake-shellcheck.el") + (emacs-substitute-sexps "flymake-shellcheck.el" + ("defcustom flymake-shellcheck-path" + `(or (executable-find "shellcheck") + ,(string-append (assoc-ref inputs "shellcheck") + "/bin/shellcheck"))))))))) + (inputs + `(("shellcheck" ,shellcheck))) (home-page "https://github.com/federicotdn/flymake-shellcheck") (synopsis "Flymake backend for Bash/Sh powered by ShellCheck") (description