From patchwork Wed Sep 6 10:51:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 53590 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 1E1C327BBE9; Wed, 6 Sep 2023 11:52:34 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable 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 046D427BBE2 for ; Wed, 6 Sep 2023 11:52:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qdq8v-0000in-3e; Wed, 06 Sep 2023 06:52:17 -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 1qdq8f-0000iY-NT for guix-patches@gnu.org; Wed, 06 Sep 2023 06:52:01 -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 1qdq8f-00089n-FD for guix-patches@gnu.org; Wed, 06 Sep 2023 06:52:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qdq8g-0003JW-Da for guix-patches@gnu.org; Wed, 06 Sep 2023 06:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65779] [PATCH 1/2] gnu: uncrustify: Update to 0.77.1. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 06 Sep 2023 10:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65779 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65779@debbugs.gnu.org Received: via spool by 65779-submit@debbugs.gnu.org id=B65779.169399748112684 (code B ref 65779); Wed, 06 Sep 2023 10:52:02 +0000 Received: (at 65779) by debbugs.gnu.org; 6 Sep 2023 10:51:21 +0000 Received: from localhost ([127.0.0.1]:33060 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdq81-0003IV-3T for submit@debbugs.gnu.org; Wed, 06 Sep 2023 06:51:21 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:53180 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdq7y-0003IA-Es for 65779@debbugs.gnu.org; Wed, 06 Sep 2023 06:51:19 -0400 Received: from localhost.localdomain (unknown [111.0.51.83]) by APP-05 (Coremail) with SMTP id zQCowAA3PeWdWfhkGBIPCw--.33768S2; Wed, 06 Sep 2023 18:51:09 +0800 (CST) From: Zheng Junjie Date: Wed, 6 Sep 2023 18:51:08 +0800 Message-ID: <72cbe7e11fd450933bb09508a6bea8f5e316f0c6.1693997256.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: zQCowAA3PeWdWfhkGBIPCw--.33768S2 X-Coremail-Antispam: 1UD129KBjvdXoW7Wr45tFyxZFWfKF1kAFyDGFg_yoWfWrgE93 4xu3s7t395Wr47KrZYkF1DKrZ5WFWDuw4xKwnxt3ykt3sxWFsrWrnrG34xCF12kF4FvF1S kr40kryrur17WjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbF8YjsxI4VW3JwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l8cAvFVAK0II2c7xJM2 8CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWUJVWUCwA2z4x0Y4vE2Ix0 cI8IcVCY1x0267AKxVWUJVW8JwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4 A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IE w4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_JrI_JrylYx0Ex4A2jsIE14v26r1j6r4UMc vjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCFx2Iq xVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r 106r1rMI8E67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AK xVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2IYs7 xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Jr0_ GrUvcSsGvfC2KfnxnUUI43ZEXa7IU8Tmh5UUUUU== X-Originating-IP: [111.0.51.83] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ 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/code.scm (uncrustify): Update to 0.77.1. --- gnu/packages/code.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 9cdda2b751..1bc6cd541e 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -787,7 +787,7 @@ (define-public makefile2graph (define-public uncrustify (package (name "uncrustify") - (version "0.75.1") + (version "0.77.1") (source (origin (method git-fetch) (uri (git-reference @@ -796,7 +796,7 @@ (define-public uncrustify (file-name (git-file-name name version)) (sha256 (base32 - "1mzzzd4alajjdshbjd2a5mddqcpag8yyss72n09mfpialzyf7g60")))) + "17x9p5pqgzjchi9xhskp4kq7ag4chmsgbkvwym5m2b9zwm6qykpm")))) (build-system cmake-build-system) (native-inputs `(("python" ,python-wrapper))) From patchwork Wed Sep 6 10:51:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 53591 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 8AF0D27BBEA; Wed, 6 Sep 2023 11:52:35 +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=-2.9 required=5.0 tests=BAYES_00,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 BA55C27BBE2 for ; Wed, 6 Sep 2023 11:52:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qdq8x-0000jo-1y; Wed, 06 Sep 2023 06:52:19 -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 1qdq8g-0000if-5Y for guix-patches@gnu.org; Wed, 06 Sep 2023 06:52:02 -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 1qdq8f-00089s-RE for guix-patches@gnu.org; Wed, 06 Sep 2023 06:52:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qdq8g-0003Je-R7 for guix-patches@gnu.org; Wed, 06 Sep 2023 06:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65779] [PATCH 2/2] gnu: uncrustify: use new style and gexp. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 06 Sep 2023 10:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65779 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65779@debbugs.gnu.org Received: via spool by 65779-submit@debbugs.gnu.org id=B65779.169399748312693 (code B ref 65779); Wed, 06 Sep 2023 10:52:02 +0000 Received: (at 65779) by debbugs.gnu.org; 6 Sep 2023 10:51:23 +0000 Received: from localhost ([127.0.0.1]:33062 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdq83-0003Ie-Ct for submit@debbugs.gnu.org; Wed, 06 Sep 2023 06:51:23 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84]:53184 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qdq7z-0003ID-WE for 65779@debbugs.gnu.org; Wed, 06 Sep 2023 06:51:20 -0400 Received: from localhost.localdomain (unknown [111.0.51.83]) by APP-05 (Coremail) with SMTP id zQCowAA3PeWdWfhkGBIPCw--.33768S3; Wed, 06 Sep 2023 18:51:09 +0800 (CST) From: Zheng Junjie Date: Wed, 6 Sep 2023 18:51:09 +0800 Message-ID: <8553c0cf1b76028589f8cde270af18e295b3f8a6.1693997256.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: zQCowAA3PeWdWfhkGBIPCw--.33768S3 X-Coremail-Antispam: 1UD129KBjvJXoW7Zw1fXF1xuFyrJFy8Zr4kXrb_yoW8WF13pF sIva1S9w4rCr1UAw4rWw4xurZYgFWSkr43uw47tw1Ikr4YkryIvrya9FZ8uFW7Ga4xGasr Xr48ta1rWFWvq3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9jb7Iv0xC_tr1lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUGwA2048vs2IY020Ec7CjxVAFwI0_Jr4l8cAvFVAK0II2c7xJM28CjxkF64kE wVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWUJVWUCwA2z4x0Y4vE2Ix0cI8IcVCY1x 0267AKxVWUJVW8JwA2z4x0Y4vEx4A2jsIE14v26F4UJVW0owA2z4x0Y4vEx4A2jsIEc7Cj xVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrV C2j2WlYx0E2Ix0cI8IcVAFwI0_JrI_JrylYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE 7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7x kEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E 67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCw CI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1x MIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Jr0_GrUvcSsGvf C2KfnxnUUI43ZEXa7IU8s0ePUUUUU== X-Originating-IP: [111.0.51.83] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ 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/code.scm (uncrustify): use new style and gexp. [native-inputs]: remove label. [arguments]: use gexp and remove tail #t. --- gnu/packages/code.scm | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 1bc6cd541e..b2b36a2d6f 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -798,20 +798,18 @@ (define-public uncrustify (base32 "17x9p5pqgzjchi9xhskp4kq7ag4chmsgbkvwym5m2b9zwm6qykpm")))) (build-system cmake-build-system) - (native-inputs - `(("python" ,python-wrapper))) + (native-inputs (list python-wrapper)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'unpack-etc - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Configuration samples are not installed by default. - (let* ((output (assoc-ref outputs "out")) - (etcdir (string-append output "/etc"))) - (for-each (lambda (l) - (install-file l etcdir)) - (find-files "etc" "\\.cfg$"))) - #t))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'unpack-etc + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Configuration samples are not installed by default. + (let* ((output (assoc-ref outputs "out")) + (etcdir (string-append output "/etc"))) + (for-each (lambda (l) + (install-file l etcdir)) + (find-files "etc" "\\.cfg$")))))))) (home-page "https://uncrustify.sourceforge.net/") (synopsis "Code formatter for C and other related languages") (description