From patchwork Sun Apr 13 14:57:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 41631 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 F306827BC49; Sun, 13 Apr 2025 16:09:58 +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,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 6575E27BC4A for ; Sun, 13 Apr 2025 16:09:58 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u3yxN-0004ml-Jg; Sun, 13 Apr 2025 11:09:13 -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 1u3yxD-0004kz-EP for guix-patches@gnu.org; Sun, 13 Apr 2025 11:09:04 -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 1u3yxD-0000So-4g for guix-patches@gnu.org; Sun, 13 Apr 2025 11:09:03 -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:References:In-Reply-To:Date:From:To:Subject; bh=LeuKLJ2cwI/P6/tShwhmzZhtcUf0CXxi4HHl+/HXsa4=; b=RZSiHK1Rfk4yC7TreLDB1a2pw6XstKYAezvosyU0ka3ahXssxZ4KZk46Y9ZJVqSgK5hJKRNjliDcpDaPx8pmGlXIkp7LOMd1+xjafEaHN2Vil7uUx9Kk9BqCYD4UMK2I/7WWGpKBMQEFK6mEH0pzCk4NNa1glEobWDq4ZvUqikxitSqNm1RHERcP6TpnI+oaxUahlcyFSgF1Kyo44xiPNP468YlwtCGdX3CG3ataTpvGYQDFAYdbGjzv0W+D6udbEVqGhynDk7ls+mn+iiW4i7BfAZFkZ0gRIr7834idlv9hdV4OUvGvU4PWwBAhD06cljlF0KAcDg59vzya/dCaig==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u3yxD-0001NY-0Z for guix-patches@gnu.org; Sun, 13 Apr 2025 11:09:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76594] [PATCH v2 1/5] gnu: quilt: Respect #:tests? key in check phase. Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Apr 2025 15:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76594 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76594@debbugs.gnu.org Cc: Morgan Smith , liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 76594-submit@debbugs.gnu.org id=B76594.17445568945183 (code B ref 76594); Sun, 13 Apr 2025 15:09:02 +0000 Received: (at 76594) by debbugs.gnu.org; 13 Apr 2025 15:08:14 +0000 Received: from localhost ([127.0.0.1]:43387 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u3ywP-0001LX-Gp for submit@debbugs.gnu.org; Sun, 13 Apr 2025 11:08:13 -0400 Received: from mail-bn7nam10olkn20805.outbound.protection.outlook.com ([2a01:111:f403:2804::805]:14176 helo=NAM10-BN7-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u3ywI-0001KU-Lx for 76594@debbugs.gnu.org; Sun, 13 Apr 2025 11:08:08 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FNxwNeHZx39bhwsoLbEOcuzLLp9YKA7SNfZ8brYSUZkuzrIoabofDcgMf/qetHuOUKbnhWsgrSl3LaeyJoCzs192hUk6NH7VCUOdc6mV/CutIMy9KC96DCichyKFMT3cIXhDZURiRO+Mo07b4qRl5pvnhAMt+gWb00TV8ypGLjVyY0SPLMbVBjSOUf/oO28joZ1RqcYtYuDKeXfSKSKs9wYfIR3L8ha2MpE9isdtigPDtqnuuOxhhvd10OmheTIRMvF03Yyb5RXkcMZ5gV2IOuQsorAOYcHGKQg7jTfaJEOBEPUm/hM/D663kmUhlqcfxKvxs10OdBwQuueYygAFkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=LeuKLJ2cwI/P6/tShwhmzZhtcUf0CXxi4HHl+/HXsa4=; b=T5gmQZlliM/MyLlprMhSSUNvI/+Ydqrs65K1cc4XKzLnrX18JgFyDhXtUZseq6FGMhIoLVXfXK+3Z7Ycm3UzHVqUU1mmA+7+i7ZjhDdwcdKuJ+iLx6lSlTEsfgKhIw2JZAcopoAWdU4vlnjdKiuR+eshXqg3NKpIY6VElP7cpRscw36MqQU2Rs+oYZjwj87iKN9Ikm6fAK9eaqRvVjpdtcIgpIxr1wR48Y0nFeXAoGkbtNTIM8+Zerr4fY51NNYKOhDzFeCv+EHAThoXTBQ04DYAiSOjHZ18uPInhF0HgJPOVdI6Ii7nz96xMB66pFOdJocBsA/nK9Ek0Zp26O1FkQ== 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=LeuKLJ2cwI/P6/tShwhmzZhtcUf0CXxi4HHl+/HXsa4=; b=LCH/OtPzLMRVFrSESDlXC13r8xkMRcdY/GpkjkToJv2PHZkEe31P8S/nct/H8UVAQ9pHBfu5guZNjqGAiioMhe5kHXZbpshHR6vDbkW9b8cmvjo0TR2QQ8ktLepnvnxtykJG18tSnOLW0Mq8p4XsiAHhZ5CXrjAJWmd8vULxl7tOOYjkhgVtGezHMysICDrBUsW/2XMVpHINlR5jc1gZnkRUGEY8Q7pI2oaRKHvTTrW9a81z4vDktPEzJLna5Mgrjs2kv8pDl4uaVOw4DlwOJwKl0pv42RkyxVWUpkJ9rVPzv0CW/vGkn2/52W0x1Wnk+oYtiF0wyvVmEH66dfvE8A== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by SA1PR84MB3165.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:806:251::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.29; Sun, 13 Apr 2025 15:08:01 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef%5]) with mapi id 15.20.8632.030; Sun, 13 Apr 2025 15:08:01 +0000 From: Morgan Smith Date: Sun, 13 Apr 2025 10:57:02 -0400 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: X-ClientProxiedBy: YQBPR0101CA0302.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:6d::17) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: <7a2c3282617f976f5e4e3a4912af05ca94a3686a.1744556226.git.Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|SA1PR84MB3165:EE_ X-MS-Office365-Filtering-Correlation-Id: 9f9a3770-fec2-4cbf-8d0c-08dd7a9cfb67 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|8060799006|5072599009|15080799006|7092599003|19110799003|10035399004|440099028|3412199025|1710799026; X-Microsoft-Antispam-Message-Info: UNdInWVh3uEZjSlhe76RmU3CQu6NFlAoD4sNIhhIVuvgwy31qxpJN+VQuIoOulFCrMQypsEldSzzjQqB1avCsUIMntgfg0ODbmxUNCoU1/OZRy+H1jbsNKJrDb0BKRjHsQhbtW7ej1wE/wEEXm+Y/VZ6ziaKMjIJujsk7FCVf18ZigtAIQkFLS91j8M4qmfkTA+LBIh+cnEpgbn6BJdF4R+0cAVVk3pxJgNOh9Bn4W9fHRnX3UwaFhHtgsS01/iYwL2Swowo8Of91zigvlwBwh5Z9rpUhEffFgbioDeUkEEqy983TQWzfh4xfd/yZyruugLGE6CkeFrFKRu2IRaSFhPieBtztIOU9PONHjp/eAULYeha7867R2HZaTVCvQHwaF0FyI+do5wDQ1AOgWcB4GLu9mxNDA5DDBCAQ2gw5CksszStXBtX/I2Z4wpSl14FC2yTOM1d65P7x875DZhluuVIZeyyy03b1YhHEdaIzvJulYv6w7CsKCmylquzm9mibz6ZISIzzpJTf7vjgqd47n8fOHrQo8CROxvwgIGNK9YSDAO+xiJtpaAYmpZs9Xnsh0BJg7AExIQ0eepK5wPXYaurj3eY/xvLQPlV3Lk9aOyDPGepTPplPH7n3Jqrotu6k9Qcyi010PHJOJbFcD9zbEgDBruYsAUA+/mCXhOQ24HjcmmFLn6w62zwjXq9YjRpdwsFbJszTGlYZ6KzEyNvZMehiZKu/02AiP1gQ+UmCxHW6Fc4OrAyP9JpeYbvBsNLpjs2YrO+kevtKbCZBSYWDhT3RQzuV67HLnBhvSnSqBe3IVerF8edOziWF280ylYU2K75YK9iYkMV6M+plj3D9UApYfZHVQCgicu3TL8aygOVIK292VWNZJZzKAobc2KqzSos6P1jqbOc3b0KryVDDQRPMTwRf9qKvD9rsVh9tLjIBmg1hA7+TBiDv2RWSA0mVDG5Ing9roSyE5SKh8Bag2iy7EGJ4jk5gUrwxd+u498Boqgb9nXQA9vkaG0PYWSW1NShGbFL2tgpPARIyBf8zuLjxmIJxTwJVgVNwyS0R0BJn6ea6mtk0ji9B8+2pfW0nnZgnSx3X3GCdgH/rXMdayMbGDONYZgJKYJ8Axhskkp8BEltc/O/1Evu+dza6COySJv6l3zLvdi6H47SFpXee0UbXU2zx1cFYhMMQx9vumxVyeZzYFVlthtsxGNARLtdLkck91eMebfenBH0vDr6POk/JVDeky62yKEwg7578+nPK+noLVTHxKFRVmUAX/ZN X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rUUBKSKR/EUWq7VSLAe1TdjKi6f4BBhPx/qa/NW4LbsQoK6GjDXR4pKt/d+fjJfmeeFHiPScolcico/bLMsxyEGGIg+jQ/l7SeVCgqreOCykpRNX+dgGG8uI9Mu/8PniSIZQBgDdRNNNK+gVpsOdKAw/BS51Kloc33JiyN1mq2j5BT7tuWzmoVnSGXrD1LIlSraUDAu8/jgSVMn4we+ZBOw/ehYNy8e8uBG0pPkUV3hkDhAm03v387qFJ/BWTUSj9MA5yA9h+HJfcSvbDcs0HGw6e7e+kdoMWTmX7l0WDxTxaoLum657e9y4wbfJkYNd04020OmlnBRLtNaWn84RTdqml05aD3FkG2EFCnMh0uVi+HvfO0g+8t7Ix6947oQGLwCzK5/ksGipWNgxEMoHl1WtFAPxKkulielhu9xXDhAd+EkSWyxiLBC2YRVejh426QpdUkwRd6KjyWGuNFNO/AWmKMJ9gQcFQ2mnEiaz/EN4ks0+ycHbRuPHjqrQqx3I4yv4xoaXexJJ9Uc0dnchjmPLSVISxqozzLWmZpyXWV6Xgma/7ox1buCdXXxtwErUrwbQh2ckeMVKDbqArYTiZhj5+mMFS7NQ/CGHhF9PjkD0UOUElf9+djWTaM9WbRMw7/xcE1nCPwBNqbLaIEY+Nc15jmosGEd+QQuX+7V4hLGFJ4Fh7+bCkmKQBJY6B7mAtgyQ9AptHljdA0EB8Of1Eg41FU2vQrCm8cSA1EBMcAkegOYWpa+omOMTY+aHKPO2sm3aahJi/zo/ReS9iF9BxE9h3V06ZG3gTGo7KMowl9dCmIhyLaxUaI2NPVaZXXhIsVeIkRgtdghzSfhswqWJ3BXQLzsBBi+9tF2H34wg6LA6nV36MfONvbPFodqoy5B5wzONx9kG1tAW1zAT2NfWZQvb4hvfj8psfLqrOgfsfcvulrYVulIP9B0o7D0XmeW0XfXhcTQZae2yiGWgaU2Z7IZpRxLf4I646YewNnHmGAd6Wxn0qAkjubDgCa1yvtzI5lcjAQEFX+Oa+wnwkRIg/5tYzF46vQkSB0+zXJ+8swMMFIaZP+Nh+cq2dy2ZxKxtuA/vR/7BoVjsfIr8trQLbmyucQPlfn9XPterRmffPVo4GEi8GywJNwSlGhv+9VoZ6/2/Ddm5dLwVlbrJdcQQsRtCyiWZaxD+Azm0QeIz4BTZrnh07N4jlhJDTfaLQllAcIlhmOrd3AQGSeH0Hr2dy0fDdAzCa5LbxLVG8demh2TD8FJ3eJkHbqDFIpwCg/xm X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9f9a3770-fec2-4cbf-8d0c-08dd7a9cfb67 X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2025 15:08:01.1510 (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: SA1PR84MB3165 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/patchutils.scm (quilt): Respect #:tests? key in check phase. Change-Id: Ie44938ee080f2ac6b3947899e9589174fd3c6446 --- gnu/packages/patchutils.scm | 65 +++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 3cd3507b07..8ba227a3d3 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -205,38 +205,39 @@ (define-public quilt ,(map cmd-path (list "find" "grep" "mkdir"))))))) (add-after 'compress-documentation 'check - (lambda _ - (substitute* '("test/run" "test/edit.test") - (("/bin/sh") (which "sh")) - (("rm -rf") (string-append (which "rm") " -rf"))) - (substitute* "Makefile" - (("^(PATH|QUILT_DIR).*" &) - (string-append "#" &)) ; Test the installed 'quilt' - (("export QUILT_DIR") "export") - (("\\| sort") (string-append "| " (which "sort"))) - (("\\| sed") (string-append "| " (which "sed"))) - (("(chmod|touch)" &) (which &))) - ;; Tests are scripts interpreted by `test/run` and may specify - ;; the execution of several tools. But PATH will be empty, so - ;; rewrite with the full file name: - (setenv "PATH" (string-append %output "/bin" ":" (getenv "PATH"))) - (substitute* (find-files "test" "\\.test$") - (("([\\$\\|] )([[:graph:]]+)([[:blank:]\n]+)" - & > cmd <) - (if (string=? cmd "zcat") - ;; The `zcat` program is a script, and it will not be able - ;; to invoke its `gzip` with PATH unset. It's a simple - ;; script though, so just translate here: - (string-append > (which "gzip") " -cd " <) - (or (and=> (which cmd) - (lambda (p) (string-append > p <))) - &)))) - (let ((make (which "make"))) - ;; Assert the installed 'quilt' can find utilities it needs. - (unsetenv "PATH") - ;; Used by some tests for access to internal "scripts" - (setenv "QUILT_DIR" (string-append %output "/share/quilt")) - (invoke make "check"))))))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (substitute* '("test/run" "test/edit.test") + (("/bin/sh") (which "sh")) + (("rm -rf") (string-append (which "rm") " -rf"))) + (substitute* "Makefile" + (("^(PATH|QUILT_DIR).*" &) + (string-append "#" &)) ; Test the installed 'quilt' + (("export QUILT_DIR") "export") + (("\\| sort") (string-append "| " (which "sort"))) + (("\\| sed") (string-append "| " (which "sed"))) + (("(chmod|touch)" &) (which &))) + ;; Tests are scripts interpreted by `test/run` and may specify + ;; the execution of several tools. But PATH will be empty, so + ;; rewrite with the full file name: + (setenv "PATH" (string-append %output "/bin" ":" (getenv "PATH"))) + (substitute* (find-files "test" "\\.test$") + (("([\\$\\|] )([[:graph:]]+)([[:blank:]\n]+)" + & > cmd <) + (if (string=? cmd "zcat") + ;; The `zcat` program is a script, and it will not be able + ;; to invoke its `gzip` with PATH unset. It's a simple + ;; script though, so just translate here: + (string-append > (which "gzip") " -cd " <) + (or (and=> (which cmd) + (lambda (p) (string-append > p <))) + &)))) + (let ((make (which "make"))) + ;; Assert the installed 'quilt' can find utilities it needs. + (unsetenv "PATH") + ;; Used by some tests for access to internal "scripts" + (setenv "QUILT_DIR" (string-append %output "/share/quilt")) + (invoke make "check")))))))) (home-page "https://savannah.nongnu.org/projects/quilt/") (synopsis "Script for managing patches to software") (description From patchwork Sun Apr 13 14:57:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 41629 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 580F527BC4D; Sun, 13 Apr 2025 16:09:38 +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,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, 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 D071927BC49 for ; Sun, 13 Apr 2025 16:09:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u3yxS-0004oh-MI; Sun, 13 Apr 2025 11:09:18 -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 1u3yxE-0004l3-0Q for guix-patches@gnu.org; Sun, 13 Apr 2025 11:09:05 -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 1u3yxD-0000Su-L2 for guix-patches@gnu.org; Sun, 13 Apr 2025 11:09:03 -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:References:In-Reply-To:Date:From:To:Subject; bh=FeO9AsHriOBuv4Xv8JdYjBUIRFck64r1S4x0kCOI1jE=; b=EHolIrRvDVSkVxaSZI0f5o0dLx/WulS0+xDLzCcP43W6T6MIF/YUF+aTAsFYogSV/7fvCB6ZcsMkM5go6q/YRSsiQlnI/OOCGhU4ppfRSRNUteVEHzhPI3eCjIyUY0joHFmmQqpqcroQ9qSu3Pb1nN6bkB/Dp62GWCgjK8Wh3NrD78nytRaqlDPq1w31qiRoNCMeFSQxjEiQMxmrxkKZ0EIBOnj2DiTA6f9cbaDpPH9AQBfarAPA1nuG3DKYVmoj9RN1xOqvOGNn14810xXJ7MzMthwqZla0DbVEz3ULaEWZKgn6Pqk+zijBDQTbsZ/QynLi5D5uZVuWbU2LtOc++A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u3yxD-0001Nh-GJ for guix-patches@gnu.org; Sun, 13 Apr 2025 11:09:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76594] [PATCH v2 2/5] gnu: quilt: Use gexps. Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Apr 2025 15:09:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76594 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76594@debbugs.gnu.org Cc: Morgan Smith , liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 76594-submit@debbugs.gnu.org id=B76594.17445568955194 (code B ref 76594); Sun, 13 Apr 2025 15:09:03 +0000 Received: (at 76594) by debbugs.gnu.org; 13 Apr 2025 15:08:15 +0000 Received: from localhost ([127.0.0.1]:43389 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u3ywR-0001Lf-3E for submit@debbugs.gnu.org; Sun, 13 Apr 2025 11:08:15 -0400 Received: from mail-bn7nam10olkn20805.outbound.protection.outlook.com ([2a01:111:f403:2804::805]:14176 helo=NAM10-BN7-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u3ywK-0001KU-49 for 76594@debbugs.gnu.org; Sun, 13 Apr 2025 11:08:08 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IlR0jqu0vgKcKx2ZgAGwyMwnItVDiIZFKqJ8UmEAstk0P1+RP+0hcgaPv3rEjsadshgw2U4zUf1doUvFLpr2Iiu3bPhepIgMtXt2j+jlBlxydnAxJ0m9MKtnp7+5ee0s7x2VGowkljXA5fMdStbiD8Rr4kEGvs07qtcJvRrHMrJnXHFgKPV5Zo//KVh5vGkOOeUkTnRoWrbt9jsykOwEsqfG8/Nto4yyFxF6KyAUBXNFWW7+wPZyalkhKvJULikMdRYPPmbdrQq285ow9XxrUg+Mtj2GFt8PgN4FMSk8ATfQT41Y5JSIneuOHvLF6Tr+qF0hooN7GCnNJVdMz43OGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=FeO9AsHriOBuv4Xv8JdYjBUIRFck64r1S4x0kCOI1jE=; b=uVmkwG7N8ARCqhEy1pGGLUNFglyYVHXpv3MoCeECUv9o/UfSHYie8bwlNXFm8x/KM0jaCG2q/s+taAVJXU0U9ZQPZbd50B53OAJ5r/aVQaM8Ai3ZbSwG9OnLAtBjJeJLfqKvrP4kpJ2RbtHasyyrRxWb751d5yavwEBzxN/9H5lfWNk4GGpl8hqassDozjITLKQV6o00gP7TojQ3PsVEQ1XYX8kMb29TWBvZKv8bJxkIK28XH5m01HVn6sJXdb3VQ6zMH/JkEWWWzbPb770iB5x5JMQf19as3mBPMm+V305YD0Oko3AEEQxJ0lBC9YFBtyXqBS91g32/GtOi8KTQgQ== 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=FeO9AsHriOBuv4Xv8JdYjBUIRFck64r1S4x0kCOI1jE=; b=QdT3mJuDDN8j430CeIt/R8B8/PR+IhCNSPHiMhCMrKyugs+tYxN1bmTN6QnZEKx7t6AG1qbvl34NFnT+JGPO/ADtDUFD9jEs8myC3VnVc02q4fyYpAEufcmN9XbbZIN+VbCH4XKD4IMpqyv8pBUcztOKIK7IU58zY2OY+NJiikoljK6HjNLLww1Qg/IrPLJy08UewPnST3IWnzEjJYsyIsFLZ6nQsdEC1NHmb5KU9R8u+ZTqg0J2JSDJnKtxcnqTu5t7rXZ32lKZs/dLSlvPcJoj1AfmjEmC5qDqGcFO4UE9Q/4DU8RWyWav4vpmND79qwOxIHkJgp5SuW0YgLTjbw== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by SA1PR84MB3165.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:806:251::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.29; Sun, 13 Apr 2025 15:08:04 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef%5]) with mapi id 15.20.8632.030; Sun, 13 Apr 2025 15:08:04 +0000 From: Morgan Smith Date: Sun, 13 Apr 2025 10:57:03 -0400 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: X-ClientProxiedBy: YQBPR0101CA0284.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:6d::23) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: <1829dd855bdb81dadb373aa121503b857f220867.1744556226.git.Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|SA1PR84MB3165:EE_ X-MS-Office365-Filtering-Correlation-Id: df3401b9-1c88-476b-e415-08dd7a9cfd6e X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|8060799006|5072599009|15080799006|7092599003|19110799003|10035399004|440099028|3412199025|1710799026; X-Microsoft-Antispam-Message-Info: qNQ9AZFzNppVX0Mx4Zzh91h4793wzwEvvvr2UDH7Jqjf0cV6Zx2VpnypmdufubcmGSdAf9MlGTzNF7rk2SyQTTDgqbDA0nTymPooW9o6Ua7XFdhg3yaX6gcEGcbHWe1u3b+g1hJ9MGJ+UY7+01gTy/DtVMtVp0crJNkNhEnWBWArwmAeLhA+0xQyhbOgF79QjwDAdfOzZ5PtS16wG7j8fD4P2XaPbnvyV0vZNcfd8NazbS7i2j36YMFGKcjZ4USVkBtr0H9SSt+tWTOxsKKiwkcpucxYOUAUbA9A8eFY5q/KBO9YOZp5UfWzG7w/TQhqxejUBY1TCxa5+HviFThbp3nzK9kqg74w1zLGMPqsCmnZJM0sZdrGYGFUCGxr4hfYTUOzw6a5PTb6F8uMURcxyQcNuos9BmnP+cDVvVksK3Pe7TfNb68xPrRzCUliYIBtA2ACSEP8z/CoOV+o1T/cDKutBP93u+W9Fpn//GbTy9mHOypyxp0B7r0NGQ0+TCOmGmNNVp2rE1IR8jvmO7/aqryIt7nBX7S1IVEGIhIf48VlKmoKi54jkYHvcCmk9MeW9vTdIt1G1KdeShhiYi/yWJRFvbGqdj2wYHYpRM6HyYTOFoS3jG6/xj/azmrv0eztoGlC3FALPZdDM2T+Zmn9reIkD/sBptjCROcjP48pWg+437NtAGqlKj+DLzfZGtbTBDhAt5Pk65rObeomYN8d4CrhZlYAjdjVGWum+lhsQP7dJxGGDxZYD2KyQVKKW9D8D8drRgHO51PJxUHctYQmJA0XYVLztr/knD4e5cDU6fYeDsDZDYM2sgR7PI4fYILldbajs9Nuj/1IUEY1QAyFAIa3/Im7F72/6EJMWPOYHsU9aEpLSuc6X+1zx7OEvNR42xOkRZ7Th9rcduLrn4+PJQjUlr9An8JETU9Es58mhIR2h+rWkux6YWk3J8xLdPsn14ulEJ9VH8lPep552uyJwnOn59DvjKdPJoLse+o3AOoJgBYOgbxvUQwJbfF15a1RkcP4m+ccmwXTu7Vp9sNxU8MYFBKCxiXoYFiSkKEKaUGuvUyOW/2Yj3dIucBOZfMrHkWIPV3zfO7Hrrd5RW71AHfFeyEgg4xyMyHM8oOVGN76+9ZGueRPMIyEJ6eIby6m+l9/Zuo5rgvhu3Ij6REu9YVnwlMhF0c4ozWMNRJ0+kCTOMwLOi+7Iq+iBQ/19mbSk0qTDP2T4dQRdoD+mRkuKZLozc8hstJl6IwHX/L8ETZ1pdMejczMII9eKgLt3G7E X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jcP8kmwG6qk4Q7ZGr1x++uJtACvD9Iq3R9lMLaEkgWwXaOVZUh7kmd5OlMeTOBoVZPZnC48+EI3XEOHMDmkFHlDNFi1JCycP+7DVhwPmLMXlSv+V3UJqWK4jLUJFwKC3pMD50NmO2dHPYbWkUqxdpL1/hqLM6F9KRJIQx8oJw8ILW0l73ys1+Quk7jtDElC4f37n80P2u+BMuARfo/FL2vtfog0Vkgqr0ShimY8fFD+RwRzdO6Yw7NuQwk7dBpnGyROXDOZZZsEPKa6ejO6TarAgFp9vTkmsSWu5lJW69l3Uj0/yL/CiRdPNaSisbkoHsnBje65Wj5ub+OLAjwwNAumSOT+kkiKzGHezPvupu0B8s/ONdWCUHVZ5HopOQObzuero3gN4fdbumKbIUDokSgX+4D5xpmoEKNLk0i8UlAU0sVaucTdliKxifs+RCXZKbosB7oUu9AvU7yJLbHX4y1kWoUZ08p3u0GoUd5aaeOtKtEALLyo5H/7bJ6nAXvWSZt0ECQStmTkwUbKoqTA0ydOhVmCJfPAKMxyCOtyRi56s0MzpSR7wQ0r/dhTvu0NfU7f0lrtgFt02ObNkxhUypErm9ERNT5lE1VlHP6H44ULPeUc/zconv0v7VjcwcUMeQkWAkL3KRqEOj2CeJBHGyKF0ELcHxJbqknWVo7Gx9Vx6ZlnWrTPTpgMr5z3/UGXPsLqNjEMBFJ2XUbCfe9hSWXXYgR0S7c6cqC7cdJ+gNCUND7lPdM4at/KljomXoxqKYkgYtaPM4f6aLrlk4qZNK6aa1rcYtnw/nfVRMBQSVAeXoH6iSWH2BaSK7EG20Los7tuH2yxhtBROg+i5oeLVSPCiHfP2Nco0/C3QFeJ+N1K9T+EXsyd1MKc26cVl2Ia1QXLw6W4H0jfwaMsxaTxT3Tn7OgdCzYOS1vVDnz6GLY21nRcsi4DgbSuxUuoH04lkNY9VyAIgPbQmmVukZhtx0fqKK6OPNn+ZJLtBD361tIayyWes/D/VyL+t/I5aGoQTzbWrTIVyPctSEirbST5lqvIxh47WVhLp2oVFafGdJcgM8OisBG+HPjFvKuS4K+QN+vJ0pDKrXYCkfhw/5DuHjZx7MiCARr06hwUWk1UIyNySAgY7u5usXhqyyQRRSzDzp8tnuw05bBVlLOa0rzC/K+g61NwoJtxNqDDK+Zt3UEkNErU+jHFe02nxejHZZxIErvutMvqqFD1EtCoxZ/1QinN9st6QNw4VEnuGMkgg3sGzSH5twLjKu7bTBWvt3mRL X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: df3401b9-1c88-476b-e415-08dd7a9cfd6e X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2025 15:08:04.5423 (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: SA1PR84MB3165 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/patchutils.scm (quilt): Use gexps. Change-Id: I81373365d0729b90b3e31e122eaede2daa7ae5cb --- gnu/packages/patchutils.scm | 113 ++++++++++++++++++------------------ 1 file changed, 58 insertions(+), 55 deletions(-) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 8ba227a3d3..07f1d671ed 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -52,6 +52,7 @@ (define-module (gnu packages patchutils) #:use-module (gnu packages gnome) #:use-module (gnu packages groff) #:use-module (gnu packages gtk) + #:use-module (gnu packages guile) #:use-module (gnu packages less) #:use-module (gnu packages mail) #:use-module (gnu packages text-editors) @@ -182,62 +183,64 @@ (define-public quilt (list gettext-minimal)) (inputs (list bash-minimal perl less file gzip ed - diffutils diffstat findutils tar)) + diffutils diffstat findutils tar + ;; for wrap-script + guile-3.0)) (arguments - '(#:parallel-tests? #f - #:phases - (modify-phases %standard-phases - (delete 'check) - (add-after 'install 'wrap-program - ;; quilt's configure checks for the absolute path to the utilities it - ;; needs, but uses only the name when invoking them, so we need to - ;; make sure the quilt script can find those utilities when run. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((cmd-path (lambda (cmd) (dirname (which cmd)))) - (out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/quilt") - `("PATH" ":" prefix - ,(map cmd-path - (list "bash" "diff" "diffstat" "ed" "file" "find" "grep" - "gzip" "less" "patch" "perl" "rm" "sed" "tar")))) - (wrap-program (string-append out "/share/quilt/scripts/backup-files") - `("PATH" ":" prefix - ,(map cmd-path - (list "find" "grep" "mkdir"))))))) - (add-after 'compress-documentation 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (substitute* '("test/run" "test/edit.test") - (("/bin/sh") (which "sh")) - (("rm -rf") (string-append (which "rm") " -rf"))) - (substitute* "Makefile" - (("^(PATH|QUILT_DIR).*" &) - (string-append "#" &)) ; Test the installed 'quilt' - (("export QUILT_DIR") "export") - (("\\| sort") (string-append "| " (which "sort"))) - (("\\| sed") (string-append "| " (which "sed"))) - (("(chmod|touch)" &) (which &))) - ;; Tests are scripts interpreted by `test/run` and may specify - ;; the execution of several tools. But PATH will be empty, so - ;; rewrite with the full file name: - (setenv "PATH" (string-append %output "/bin" ":" (getenv "PATH"))) - (substitute* (find-files "test" "\\.test$") - (("([\\$\\|] )([[:graph:]]+)([[:blank:]\n]+)" - & > cmd <) - (if (string=? cmd "zcat") - ;; The `zcat` program is a script, and it will not be able - ;; to invoke its `gzip` with PATH unset. It's a simple - ;; script though, so just translate here: - (string-append > (which "gzip") " -cd " <) - (or (and=> (which cmd) - (lambda (p) (string-append > p <))) - &)))) - (let ((make (which "make"))) - ;; Assert the installed 'quilt' can find utilities it needs. - (unsetenv "PATH") - ;; Used by some tests for access to internal "scripts" - (setenv "QUILT_DIR" (string-append %output "/share/quilt")) - (invoke make "check")))))))) + (list + #:parallel-tests? #f + #:phases + #~(modify-phases %standard-phases + (delete 'check) + (add-after 'install 'wrap-script + ;; quilt's configure checks for the absolute path to the utilities it + ;; needs, but uses only the name when invoking them, so we need to + ;; make sure the quilt script can find those utilities when run. + (lambda* (#:key inputs #:allow-other-keys) + (let ((cmd-path (lambda (cmd) (dirname (which cmd))))) + (wrap-script (string-append #$output "/bin/quilt") + `("PATH" ":" prefix + ,(map cmd-path + (list "bash" "diff" "diffstat" "ed" "file" "find" "grep" + "gzip" "less" "patch" "perl" "rm" "sed" "tar")))) + (wrap-script (string-append #$output "/share/quilt/scripts/backup-files") + `("PATH" ":" prefix + ,(map cmd-path + (list "find" "grep" "mkdir"))))))) + (add-after 'compress-documentation 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (substitute* '("test/run" "test/edit.test") + (("/bin/sh") (which "sh")) + (("rm -rf") (string-append (which "rm") " -rf"))) + (substitute* "Makefile" + (("^(PATH|QUILT_DIR).*" &) + (string-append "#" &)) ; Test the installed 'quilt' + (("export QUILT_DIR") "export") + (("\\| sort") (string-append "| " (which "sort"))) + (("\\| sed") (string-append "| " (which "sed"))) + (("(chmod|touch)" &) (which &))) + ;; Tests are scripts interpreted by `test/run` and may specify + ;; the execution of several tools. But PATH will be empty, so + ;; rewrite with the full file name: + (setenv "PATH" (string-append #$output "/bin" ":" (getenv "PATH"))) + (substitute* (find-files "test" "\\.test$") + (("([\\$\\|] )([[:graph:]]+)([[:blank:]\n]+)" + & > cmd <) + (if (string=? cmd "zcat") + ;; The `zcat` program is a script, and it will not be able + ;; to invoke its `gzip` with PATH unset. It's a simple + ;; script though, so just translate here: + (string-append > (which "gzip") " -cd " <) + (or (and=> (which cmd) + (lambda (p) (string-append > p <))) + &)))) + (let ((make (which "make"))) + ;; Assert the installed 'quilt' can find utilities it needs. + (unsetenv "PATH") + ;; Used by some tests for access to internal "scripts" + (setenv "QUILT_DIR" (string-append #$output "/share/quilt")) + (invoke make "check")))))))) (home-page "https://savannah.nongnu.org/projects/quilt/") (synopsis "Script for managing patches to software") (description From patchwork Sun Apr 13 14:57:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 41633 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 DEE4827BC49; Sun, 13 Apr 2025 16:09:59 +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,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, 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 9880B27BC4B for ; Sun, 13 Apr 2025 16:09:58 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u3yxN-0004mk-6g; Sun, 13 Apr 2025 11:09:13 -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 1u3yxE-0004l6-UU for guix-patches@gnu.org; Sun, 13 Apr 2025 11:09:05 -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 1u3yxE-0000T3-4j for guix-patches@gnu.org; Sun, 13 Apr 2025 11:09:04 -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:References:In-Reply-To:Date:From:To:Subject; bh=kjUSAaR70ega5Ondqx+CswuHg1T8DflXuLgjOKYUc/E=; b=DhUGQeo3TJxQ00TX71nn8W5yqZdPiyQINieb0Amzlo5JBm8KzZFcD9Cj1PELj2s9j6U27Dj50QRRqW55B6NXJ/HR0qGtl5dJgcRwSdyYNZ7T8jloQSU8Yy6pLxTaVt4Oqw6poWxmMJKcebtctH2U9DfYmv4pxJVTQ1Exmup4646lS5eNqdxL/vvuVVBV+atNnV86VLglAozG/69N8pyK9A6x8uNnUM0u9YMxY1T7XNN5fAweeRIV6wV3DdL71bVm6CTSupsyi0WVFAJLZgTYHAcqG+w/IeJ+c4l4VMIzMKd6C/QpPXDcRYNFmQ5y0TDLsZd/oxwGbZ2alpfzZgAoWg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u3yxE-0001Np-0H for guix-patches@gnu.org; Sun, 13 Apr 2025 11:09:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76594] [PATCH v2 3/5] gnu: quilt: Update to 0.68. Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Apr 2025 15:09:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76594 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76594@debbugs.gnu.org Cc: Morgan Smith , liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 76594-submit@debbugs.gnu.org id=B76594.17445568965201 (code B ref 76594); Sun, 13 Apr 2025 15:09:03 +0000 Received: (at 76594) by debbugs.gnu.org; 13 Apr 2025 15:08:16 +0000 Received: from localhost ([127.0.0.1]:43391 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u3ywR-0001Lj-QD for submit@debbugs.gnu.org; Sun, 13 Apr 2025 11:08:16 -0400 Received: from mail-bn7nam10olkn20805.outbound.protection.outlook.com ([2a01:111:f403:2804::805]:14176 helo=NAM10-BN7-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u3ywK-0001KU-Vl for 76594@debbugs.gnu.org; Sun, 13 Apr 2025 11:08:09 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=i6bMAnsj0f47cGcWERWREVASveURdbi+pahKiEBzTe1PvmFVbSBbVOBsxcLsLldiRHz7o7oCFsAniVkSWZBkOsjtA9qjCMEzwKo4Eh5wlRsqBo//g24YBjpb5If84NZKf8FPjBtR1ezdVQscManPg7uZtyQUbN/QjzRFbfyUwP1agZTyWK1LF7IjQkvlIOUavMFoOUwRc/g3WSYkLeIFDlS/VqHyxYKpM+C7cQG4UQssJJaeEyXDJ1Ozi8DcpJPqN4w0Rm7UrsHL9BV/zCz/Qe+gqIZu7vKXOaLDFf/ebzVjXYaY6bWXx/PIrPM5fgnd+SyczkVImNWtg+hKUspM6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=kjUSAaR70ega5Ondqx+CswuHg1T8DflXuLgjOKYUc/E=; b=TT66FjYAF0DxT7nHSNz4H3wZ61Zjtr9tWzVVznBfd918pdFucR4Z3S41MqAWV/iLcT6RSU0KVU3XTmVswDcAVYJxiQzy37iPSJGO8kvUPNI4GrtZvNUINPpmqnVsFFipH1DL2Ui5oPyHEtedxIw2bSzdEG+4hoXjqD1bacqCUvb+vasEfsP36sUQkzGMBesc6bjxRiAfVn0Z7kwRy8HbPaU5PbrLifVl4p6LDMiVMx97HR0bzf8N+su1fzInv7/9UsE6Bb7CPt+X4aHg3Wop1tkdXMPfMIdYEbgXVlsYizwmJSBhABJNc6RasEvVXC8LzZIKf6sX4bkcmxNEMPyJsg== 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=kjUSAaR70ega5Ondqx+CswuHg1T8DflXuLgjOKYUc/E=; b=UukMpKS1e/y7P9VbAaPobF7c4LrOgNdwE6cyn/caLWAMqCdWJNxnLgjyj01g8X0eARwnexc2NdJrV8gVLRBRBpABYTDM9Kx6BhwOS//l7tFmJkbBELA3h62i57OtXNwtaJf5Ztz8MOUjEI+NSSueDBjiKdOn74PUT6q7DR48prKwVks82gPyej6lEbXCmkgahVtwSI/d8sHzQitcBeDIvxtL+UdqEdmMkihOkwtptUo+Mz7DXezDQWK30RFmSBRGYENnDFpuHzPTGYOJ5ciljQsqTLEU+ZOZjr9sw+k9aiWxbnFFmErOId+D8WwPOA/fDR3U/FtwQzgVbzCK7qQ3hw== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by SA1PR84MB3165.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:806:251::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.29; Sun, 13 Apr 2025 15:08:07 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef%5]) with mapi id 15.20.8632.030; Sun, 13 Apr 2025 15:08:07 +0000 From: Morgan Smith Date: Sun, 13 Apr 2025 10:57:04 -0400 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: X-ClientProxiedBy: YQZPR01CA0001.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:85::24) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|SA1PR84MB3165:EE_ X-MS-Office365-Filtering-Correlation-Id: ba1c49af-952b-439d-2472-08dd7a9cff60 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|8060799006|5072599009|15080799006|7092599003|19110799003|10035399004|440099028|3412199025|12071999003|21061999003|41001999003|1710799026; X-Microsoft-Antispam-Message-Info: /VXkrM5+oqwTMr8usIDzmsabzTJpG98VfWUalsoJmvOcQxwTFoXjuKLoSdJLVeUNIAILDtrglyRuIOCdTqNe3MIpueo3K425qsntAfxeEwSvI4SzeMTg1pfpMN48mbaG2UoU03Z9QPygmgCvhvTb+Pxlm/rAapT9VHgtSFqcaKnAi86ICXe5bI2ukOWlM8ndotOQSip65rJUcscHzG/NnWYUvgvRcUPgFjmA77Yz6xAxTM5bgrpuDL67OpGYaUcnviHjvInnt0idnxGoj9pDVcJ/AV7MeokG05Z5N6DKZJafUdXWwCmzUJkO6AdRJVJhcxRLEafL37RX4BqzZOM71vdPVukaTjB1a5DJONZh4dAsVynZDUunPouuB/83ACr1I+iFQYTdwKaJ6bFMSQx5SzAlXCTaEf0VexbXuC+5zaxKmc2DEaNMBTMwFHft5o6W3isLopYhU8K8vRbok3CNbh/DhU2Y4fs3RFa4Nv9oL+7mlbJrLRzeUP/faRg+d+PcFb8hZqD9YK1eeecL9AX0ANcvXS616gAOBb3X8T90gKsaOCTFKLBEZSdKp4MA+vOaUsUGv1XSAqwH0hFcatIapZcif0deUi7pcFI1Cppv4LGZ/bsp3s20ImV0Sa2Urmjhfj/3+CqyJKCZTfshhAykcDN43hVzpDKF4qUa39V5tsQPhkguVssT3viBuuZQ36LrB5+wDBNA5nDxzV1N672nz/QZ/l0L+ReSYdTY3sawvDAe71m5u7LqsreFVXTAWGnXTZv6NepsL+aBAy0eckF+PdOYMaPTcbCHnhX1odEqDZgS82hEmQvDBSP5oIG81+8kLk4yO+a8olZF8nmwcLwZdumcJf73ahXOrn9vm6dX1O0WrlqswZd1uKEBgBsRqgbsX0WC2BG2qXVY4sFD+GiuwYVZM1ntcR/Rt80MkvUfvCti5TYwCfewxNluyjT3sjGPP06NRY7ZUCIhz3O7Mka3390GizbVyMoX3Xs5023xyUZ9yKyvoYCiTuhXwli7D3S5TwvbpskIKE6wxTLI5X5AiyGcCmnNRcAzRPjh5S4cft+YxbeCBIvpbFpI8HHn6HhbjMFxjcxNnmSfQVHLFgsZ9J2mP9qQILYPZZ2znGDXcSvOgP/BIyH9FwjSw1VGhvFCiCkuYjauJ8+XJ9cfJm0+TkpuIqtwtninIcqn7wVi0n2vEQg7gK2VBlSCXHUbf2j1KVF63LQW7sFEmN80Ud34zxNRj7MhUyCIB2wiesI4bf+59nMEe0hedsEe8JNj3cYwFvuGUcobpQ+aXlJdEQzDToQAz3JLaNxVuKsBjsxS8Hs= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Xa7Utakoyp9h2jTKjO5Q6PJvBAR7Ws7MWjIDLkxLAxySRkZmTKmVU4fUjEP0T2txQH6fkGOg02u254JnawxBGUL1yXrDt1cjTIkSsgUr9WIflb1GzjHzqOLRNFSfDV/xqRrF1X+rCg9+wrTNoY8MKqt2SmRmwv4BLq2DuUDGXaFtcnt6jbeUXik8qog7lQdzxc1UkSs9WcTuA4Z0Hu9mCi1IqEMGIcVZpE2yFIFvF8ZY25x7DDg55kJmhFKR5LugzOdOissp51WyT+2+3vKqm2tsVYg+CWlM6NTxfzN3ApxIQ1Gw82SlZ9AijHksLsIoxVATMbijHDgaFmJmd7gKdyJfHdLdfHpOF7qSGpn3LMtZxq0KZrlreSxuht42UWjtEPcaIP/ucPgRRjqLA4i2NKYizmSGH9r+F0kwVe/cZRyEnhNUEE13+XipBp6c6A7L45LKILeGEqRHx1NgaHESXl68qbdF4DHyXW5Ine5J9ym3UTSJOPxiT9/WL7OFbl5OSQCIcL8XZj0c9U0x8Pt1FjCMyUpb6S+pGf4xdBbIj+7nMUegrIhcWs+3Z2l2edzIPN/lZmH48uBRs6t6jUV46Qt3Bzno8BmZlPwTrPjqlk9TcQjgssxSSry7TI8HbFyLVGtyN8Wxezg+HsyGanVjVvvG0m+DCgLiTNIKrrfhQ8DdeaNUF0YJjyfwNRydfXAtxNCx9B1eURTj4M2lyYZVTGvj6B3mtXWgEmqHvTBtH2mkPXrb+bqzKd+/Y/sXHFfadB/+bRSUIKwXw+XVi8nPoO6lDVIJ61bBmSues76uyyGWhzfC+zSf0+iXECxYNv6BMjm/6pzeji4jIqeEzvNFiVja4Ub8Mbh103KP+P3Fcy6/KebXoSG+YmH+5bnUp3A/EFBxqjvi7RCd+uWppr5SFUkodFwfBFS2wp/vXjgKXCF9dA1ShWW+kpkblEj3FqODYUdxRlI9Ghe+xN6BE+wLGU9eIGgNdsYOyi1WVwmhTpJEpvDQ1t27NngxZ4K5XFG3H20HscBXTQO50z0/AoLOmZOiS8+1nZo/Mt8BFM+Ad38joZoHIjCyzcLPNlN2hJK+2WXXJzOii3ryLFQVbNUjSZvUPRcHCC35a1AU4Tgmq+42l+N6Tf1IcGrC+5uFqTz9AP5Suy9a+JJ8VSH37JS3nvmtzGP96YgavYfQC6ABvAEHVtAHZBdpkNMFBaODT1V798sopoCpsdQGSXaxB+WGGwSGU0Rpu5j3QLGYCaxsz6xYFUMOlRUw0yv94Yg1YU1L X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ba1c49af-952b-439d-2472-08dd7a9cff60 X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2025 15:08:07.7350 (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: SA1PR84MB3165 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/patchutils.scm (quilt): Update to 0.68. Enable parallel tests as upstream fixed it. * /gnu/packages/patches/quilt-grep-compat.patch: Delete file. * gnu/local.mk: Remove quilt-grep-compat.patch. Change-Id: I5da532c07c83d00363799a1cc7f48e0fe63864fe --- gnu/local.mk | 1 - gnu/packages/patches/quilt-grep-compat.patch | 145 ------------------- gnu/packages/patchutils.scm | 6 +- 3 files changed, 2 insertions(+), 150 deletions(-) delete mode 100644 gnu/packages/patches/quilt-grep-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index c0b9a76cd2..9d8b17f94a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2164,7 +2164,6 @@ dist_patch_DATA = \ %D%/packages/patches/qtscript-disable-tests.patch \ %D%/packages/patches/quagga-reproducible-build.patch \ %D%/packages/patches/quickswitch-fix-dmenu-check.patch \ - %D%/packages/patches/quilt-grep-compat.patch \ %D%/packages/patches/qmk-firmware-fix-hacker-dvorak.patch \ %D%/packages/patches/qtwayland-dont-recreate-callbacks.patch \ %D%/packages/patches/qtwayland-cleanup-callbacks.patch \ diff --git a/gnu/packages/patches/quilt-grep-compat.patch b/gnu/packages/patches/quilt-grep-compat.patch deleted file mode 100644 index 25fef506d1..0000000000 --- a/gnu/packages/patches/quilt-grep-compat.patch +++ /dev/null @@ -1,145 +0,0 @@ -From upstream -https://git.savannah.nongnu.org/cgit/quilt.git/patch/?id=f73f8d7f71de2878d3f92881a5fcb8eafd78cb5f - -From f73f8d7f71de2878d3f92881a5fcb8eafd78cb5f Mon Sep 17 00:00:00 2001 -From: Jean Delvare -Date: Fri, 9 Sep 2022 10:10:37 +0200 -Subject: Avoid warnings with grep 3.8 - -GNU grep version 3.8 became more strict about needless quoting in -patterns. We have one occurrence of that in quilt, where "/" -characters are being quoted by default. There are cases where they -indeed need to be quoted (typically when used in a sed s/// command) -but most of the time they do not, and this results in the following -warning: - -grep: warning: stray \ before / - -So rename quote_bre() to quote_sed_re(), and introduce -quote_grep_re() which does not quote "/". - -Signed-off-by: Jean Delvare ---- - quilt/diff.in | 2 +- - quilt/patches.in | 2 +- - quilt/scripts/patchfns.in | 20 +++++++++++++------- - quilt/upgrade.in | 4 ++-- - 4 files changed, 17 insertions(+), 11 deletions(-) - -diff --git a/quilt/diff.in b/quilt/diff.in -index e90dc33..07788ff 100644 ---- a/quilt/diff.in -+++ b/quilt/diff.in -@@ -255,7 +255,7 @@ then - # Add all files in the snapshot into the file list (they may all - # have changed). - files=( $(find $QUILT_PC/$snap_subdir -type f \ -- | sed -e "s/^$(quote_bre $QUILT_PC/$snap_subdir/)//" \ -+ | sed -e "s/^$(quote_sed_re $QUILT_PC/$snap_subdir/)//" \ - | sort) ) - printf "%s\n" "${files[@]}" >&4 - unset files -diff --git a/quilt/patches.in b/quilt/patches.in -index bb17a46..eac45a9 100644 ---- a/quilt/patches.in -+++ b/quilt/patches.in -@@ -60,7 +60,7 @@ scan_unapplied() - # Quote each file name only once - for file in "${opt_files[@]}" - do -- files_bre[${#files_bre[@]}]=$(quote_bre "$file") -+ files_bre[${#files_bre[@]}]=$(quote_grep_re "$file") - done - - # "Or" all files in a single pattern -diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in -index c2d5f9d..1bd7233 100644 ---- a/quilt/scripts/patchfns.in -+++ b/quilt/scripts/patchfns.in -@@ -78,8 +78,14 @@ array_join() - done - } - --# Quote a string for use in a basic regular expression. --quote_bre() -+# Quote a string for use in a regular expression for a grep pattern. -+quote_grep_re() -+{ -+ echo "$1" | sed -e 's:\([][^$.*\\]\):\\\1:g' -+} -+ -+# Quote a string for use in a regular expression for a sed s/// command. -+quote_sed_re() - { - echo "$1" | sed -e 's:\([][^$/.*\\]\):\\\1:g' - } -@@ -215,7 +221,7 @@ patch_in_series() - - if [ -e "$SERIES" ] - then -- grep -q "^$(quote_bre $patch)\([ \t]\|$\)" "$SERIES" -+ grep -q "^$(quote_grep_re $patch)\([ \t]\|$\)" "$SERIES" - else - return 1 - fi -@@ -365,7 +371,7 @@ is_applied() - { - local patch=$1 - [ -e $DB ] || return 1 -- grep -q "^$(quote_bre $patch)\$" $DB -+ grep -q "^$(quote_grep_re $patch)\$" $DB - } - - applied_patches() -@@ -465,7 +471,7 @@ remove_from_db() - local tmpfile - if tmpfile=$(gen_tempfile) - then -- grep -v "^$(quote_bre $patch)\$" $DB > $tmpfile -+ grep -v "^$(quote_grep_re $patch)\$" $DB > $tmpfile - cat $tmpfile > $DB - rm -f $tmpfile - [ -s $DB ] || rm -f $DB -@@ -520,7 +526,7 @@ find_patch() - fi - - local patch=${1#$SUBDIR_DOWN$QUILT_PATCHES/} -- local bre=$(quote_bre "$patch") -+ local bre=$(quote_sed_re "$patch") - set -- $(sed -e "/^$bre\(\|\.patch\|\.diff\?\)\(\|\.gz\|\.bz2\|\.xz\|\.lzma\|\.lz\)\([ "$'\t'"]\|$\)/!d" \ - -e 's/[ '$'\t''].*//' "$SERIES") - if [ $# -eq 1 ] -@@ -631,7 +637,7 @@ files_in_patch() - then - find "$path" -type f \ - -a ! -path "$(quote_glob "$path")/.timestamp" | -- sed -e "s/$(quote_bre "$path")\///" -+ sed -e "s/$(quote_sed_re "$path")\///" - fi - } - -diff --git a/quilt/upgrade.in b/quilt/upgrade.in -index dbf7d05..866aa33 100644 ---- a/quilt/upgrade.in -+++ b/quilt/upgrade.in -@@ -74,7 +74,7 @@ printf $"Converting meta-data to version %s\n" "$DB_VERSION" - - for patch in $(applied_patches) - do -- proper_name="$(grep "^$(quote_bre $patch)"'\(\|\.patch\|\.diff?\)\(\|\.gz\|\.bz2\)\([ \t]\|$\)' $SERIES)" -+ proper_name="$(grep "^$(quote_grep_re $patch)"'\(\|\.patch\|\.diff?\)\(\|\.gz\|\.bz2\)\([ \t]\|$\)' $SERIES)" - proper_name=${proper_name#$QUILT_PATCHES/} - proper_name=${proper_name%% *} - if [ -z "$proper_name" ] -@@ -84,7 +84,7 @@ do - fi - - if [ "$patch" != "$proper_name" -a -d $QUILT_PC/$patch ] \ -- && grep -q "^$(quote_bre $patch)\$" \ -+ && grep -q "^$(quote_grep_re $patch)\$" \ - $QUILT_PC/applied-patches - then - mv $QUILT_PC/$patch $QUILT_PC/$proper_name \ --- -cgit v1.1 - diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 07f1d671ed..41a2daa36a 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -169,15 +169,14 @@ (define-public patchutils (define-public quilt (package (name "quilt") - (version "0.67") + (version "0.68") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/quilt/" "quilt-" version ".tar.gz")) (sha256 - (base32 "1hiw05aqysbnnl15zg2n5cr11k0z7rz85fvq8qv6qap7hw4vxqrv")) - (patches (search-patches "quilt-grep-compat.patch")))) + (base32 "09l4nf6qb8y8l62z8ypdg5mraz0lvqxg1j1p6xdyh1n10gg0k37y")))) (build-system gnu-build-system) (native-inputs (list gettext-minimal)) @@ -188,7 +187,6 @@ (define-public quilt guile-3.0)) (arguments (list - #:parallel-tests? #f #:phases #~(modify-phases %standard-phases (delete 'check) From patchwork Sun Apr 13 14:57:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 41630 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 5950D27BC4C; Sun, 13 Apr 2025 16:09:40 +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,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, 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 CB0F627BC49 for ; Sun, 13 Apr 2025 16:09:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u3yxO-0004nB-Ch; Sun, 13 Apr 2025 11:09: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 1u3yxF-0004lc-SZ for guix-patches@gnu.org; Sun, 13 Apr 2025 11:09:08 -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 1u3yxF-0000T6-G4 for guix-patches@gnu.org; Sun, 13 Apr 2025 11:09:05 -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:References:In-Reply-To:Date:From:To:Subject; bh=v8MtDdf8vUzSGqa2zOEhf7l0s4AbHm5v9a++vxmpFJ4=; b=ssBtJzczLc4a8V+RafeBkp8n7AQIBh73PUZRVvc/wOvKW51iMpt2qJo0BRXd9xQpR29gN5Yni3ti/oTqwAAZNNn7hUteDuaKqndwD694QRJ3AR6/dKSFCm+yN5rzw16c9qRCrtl8/wTikb1nUmjw4T321Ff9EV4g9rztdMJsYPeNHCdhZLmKenZYfscmXYRERYYMThO7Q6zgMc7+WBduo/AK7Ojdh1uBECfZTaklZs/eHNUaOJq5IweHkB5RC1DvVzW369SNyEK6dQ5SJm5DwsNVGs2o1TUOyztr75GtdhfgZlupbbkaNX7ovUDuX4HsIGAm88P5/NOrJwRfcymn0A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u3yxE-0001Nw-GA for guix-patches@gnu.org; Sun, 13 Apr 2025 11:09:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76594] [PATCH v2 4/5] gnu: quilt: Don't install emacs package. Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Apr 2025 15:09:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76594 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76594@debbugs.gnu.org Cc: Morgan Smith , liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 76594-submit@debbugs.gnu.org id=B76594.17445569035228 (code B ref 76594); Sun, 13 Apr 2025 15:09:04 +0000 Received: (at 76594) by debbugs.gnu.org; 13 Apr 2025 15:08:23 +0000 Received: from localhost ([127.0.0.1]:43397 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u3ywY-0001ME-Kf for submit@debbugs.gnu.org; Sun, 13 Apr 2025 11:08:22 -0400 Received: from mail-bn1nam02olkn2109.outbound.protection.outlook.com ([40.92.15.109]:54852 helo=NAM02-BN1-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u3ywU-0001LV-9L for 76594@debbugs.gnu.org; Sun, 13 Apr 2025 11:08:19 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=XZP14JspCZkAoxyBZpEh0DNyG7LJRENpNllWC8hSjWhfvdMFR66bLdPykUMMpqwF5vnUX3I4mWIlIZLmptOEcr9e+1qX1+z8Fumk8gixhGXUM+D3ec2cZ7NYz6EV1jkvJZG6kwn1LZ/OUeayLRY16GZjWp6aYCyVO0GJJGh1CnNn/IANjxw1H80jvR54oK1xjb/OP0QMRppalLQVCiM9cGMSGwXi2d69YFqFi4/QaGw9brsmGUZtDtzi8I87khh2Centd4M6TFpdZV7/8x46J5Ak8YQy7B9lE0co1dRyeut7zQRr9dr7byLt6W5ZTILxENlJ30J7fh6hr/MsUY1YSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=v8MtDdf8vUzSGqa2zOEhf7l0s4AbHm5v9a++vxmpFJ4=; b=XHyPltLJ2NzZEhgaKewWhCZSD/z9wPy4SkBbSM10r6adoGl0N8SiTV7rtq8lvmUNMkD9aQKBL1L9mAvKDWh6NPWxWwXqJ8Ssy4cOp5Fs8ImdwIVvcNzR084qklWFz4nW3/VzGsJHShNK2X6vbNFnSzkLaLzIlNNbHSIZj51VegOXXeP5R4L2vtYC7/tMIjr2JnNbLDNi5oUu7Wbd/gV7AJl7s7zob1UOjg27JsP6oWs5emgX7jS/5amBx/cEzWgx/9KOwYDxSKBcHm890z6IoaplTp1nL/V7BHtTPxhf+sfJYnx6IAdKr9rt+7eRMrJWtBGeknFXm9yM4wBKZYQsrw== 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=v8MtDdf8vUzSGqa2zOEhf7l0s4AbHm5v9a++vxmpFJ4=; b=J+NixtpGwWnjuCF2F3QKE/ZC6F7olM2MiWGTmZEdCtPSIXRIBkG/VD0MZ+d+GkZqN/tEKgFn4bh8Id2AxZEvHfaTs42xIiC8WktSExmeg1vXy19Hb39j27qCwm1aKmc1HiMNyRNCzoyrJb6W6lc43b9o+hLmfjj57cLKUj8IO8a9cp7dRnbbVGPeTnSnj6fgHuL9bUHfa6V/tNAiD+Rrfya8800M/Pnn6VvCDHz5vcG7483OoKnhunRSjUJEGOHEkJNV3qcCu2/+z8V9N3hvypaVozQPd9C3lnkoHF1dwbz5CV/0rhdi0AOInmP+0SjUq8o+H8C2XwlyiLqVCS1cJQ== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by SA1PR84MB3165.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:806:251::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.29; Sun, 13 Apr 2025 15:08:11 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef%5]) with mapi id 15.20.8632.030; Sun, 13 Apr 2025 15:08:11 +0000 From: Morgan Smith Date: Sun, 13 Apr 2025 10:57:05 -0400 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: X-ClientProxiedBy: YQZPR01CA0013.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:85::12) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|SA1PR84MB3165:EE_ X-MS-Office365-Filtering-Correlation-Id: d842593a-76ff-460d-35cc-08dd7a9d014b X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|8060799006|5072599009|15080799006|7092599003|19110799003|440099028|3412199025|13041999003|41001999003|1710799026; X-Microsoft-Antispam-Message-Info: TUzIo39l5zVLpY4spPEB0zcAjk5P70Uv2S0L977YVeZ74EcHMfU0xn79Y9z9c8qHHoDcU5RBWjVEiCRHmJWe/LKkVLXpssVpzxquAC+OjQ+w4ujmYCW+VYG6sOBi4BRSKgzn/mwLPEZlMx0DmjeI8rTrTH68FZ6cftm2d+Xdlzpzdaz+kLPBjMslBnMLCzv1mLA3Mtl9Vv6hDW2v1Aorl7cOhTxPFe2/vS39J1PKoEODZ1dtmayIE6jQSVV3idQzvF3ckkFlKabj8DBdEFvH4M1OOV1O+dX7l12UfR9VwTDrOVeM/BSJefwGxGc1F8IRfyTTDC5Sm+tSJx8h3QZRYvFe35tskO93dC4E5SvC5BnlX+F/e58s65yhOz19n2BfSx4jUs6uNtMReTq/cluSniPp266V+4xxc/DoZUiwUZ/AFgMSd4sG2JKNvqBQgpvjjI6r2WodGfpM/q6kBLVVLNndKogxiSWdkr7iOh1iDubPtneyQhFMAEfOXtg2wxPcmP6kxByi9x+Ge60v5Gi1lmb43U7N0409JYBMfETSWxs5ty0Yu0OfgiQ//TwIlPLot5RQyea2U7bElZ8QLTL3vsBezSVELfu3e8bk4N/aV54Qiw+W1PWu/aIAjf4Ktwq8aJ69jfCrOZRQn+eOD+Ba7NqiloTO6R58ayc7gkjg70UzPmHv232ttzk+A4dVUXijDo4uUFPW9gaPkKlfSFGqOVHxQ4IIhcZ9ha0jsowoc5tCJ+8RavsZ913KOzqzXnpCJLCROut3ZDDBlE4fHjjcvPn4UrJD3bF+TC57OHPfqfwqo7PoBRnG0ewl7TE5ZzLafD3/ns8kL0h8mLYzWlj+yXRVsYgTby6QflQISSf+6UCi53ePq2OpW3HwOYW4fIvH0G/13B98YhhCcbjgVpd1lZd/7JuZzwvYgCaWwxLcVUpIVEGLKm3l+9aT5ThqazGw2Y4nIRCmN+mP4V7wGWZVDBi2B6+ObieUAjwTZaqSRMIyOgBCQ2TxDdptHalHHbPViVwT8Yz61jfqIhw/xBhy8+o0yAqlLaTIY2ZW4FNxtSQl0xygNtl1sGzvI5alhqdeWkyJiP/mJaDMy4Vj9wFDvMWC9lX1RpFjS4j1YykQRzi2bYGPWJTpnTiybteEYishnSfgYFckAyZES0OLR5PzJuH8rut89feuqZuZRb7IFJNog7U/ExQvQS15TkbEVBu1R5NWPRV1CCOjkX3ypJwNpw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: L0mAH/a79/7XW1EEBDdSJWIgnKYvokhuqFvyTzCPiMsuKSAD4RiVnWwkD4MXgtOoAjb2Alr0wy3E9v43YutgleUV52q/IZJtuv4YTCq49DTcIGIJyNQZGl2nkwpNK+W6mBmSgc9jwWmpf3gCWpnWy4hOVJmDMzyJCe4LuSWlo1PFdfQl9ulvbGvYWoFb6/nm7o6F66xe6dyaOAwsdrstEF1V/uYhDO1DQg1tSdKN8rQD6gEHyY5aisNBa6QcYZpvADsapJ3LW56P+ls6BZtW3v1Bb6z1iB+FIkvQUWYiW4Rqhk7tyDI2kTYdUbu3hyi7IqjGFxsCQ2doGOa6TQ/TAI7PxBqyFdAHKefaSvHA0s9mXig8djTgp/ZTvpBLdtV58VgcVlm+P3BQDTBVQkOCghdCvR9mBB+LXFhA7yjZxqvITmyymvxUJAmKzEb5vGIM4sRA+uJbwMx0TFVSjkX6Y0yqxSJHBboXoPJk5uaDXVHOXdqsCiZCqexE9ueCVCtY+Tau/wtpDuGMBbaLbxtihEmXe+ltueFSVWyPMOpIX0h2hjz0eCoxpadKkQyLlGfu2YW1oiUYmgIpoPu9/myfIyOTEaolFCkt7Holav9rJpHwyJRWtgZzuTnhRgptlTOQ6WD5kRxkFTQh+d0VJwrzZdD92vrGa0ezVZKb48MRpV79ydWY+NTpO0BEDEonBXntlJ/0p/DlR3XDPqJejZt/fqQk+aDyDoZDm2rKGxvZdAIsAKGJhZ6MB1s6yWeNo/dnSJmT7L4cI8oQ8NPy0n0aPBuHyv9KCzsbDhkGfWCuEqS7AUqm2wUaL0hJ/C0UuHcFvLNFyuinblirsukYfOIjAWhEPtTfVxC8QH76da8/ZQ1HGGJcCtY3U0oGLQI9PSpi3iQHzml0AIo+JWuE07FaVacueOnnERDcpfTSa9kcLwKh6zNG2ERVDYNKcUyBGXhtXetsJHJswYVxy2b7JlDzSO+Nqxdl6DDD2/nnzVZhb/ZoLo2n6WXtK+HcfRNqIUx47g540UYQ5cFF3nEd8TTP4oxwj9GsNls4PcD7u4DN9KIAPYG8sAKPckahVMk2NV2Tnt+Kwyn/HrC+USxUaKto/2VRdcj9/rjyb7wkhMSThl5FIk4cEabbEvvB9aH8mfrqdGbjqr115xIwLysYBgmyTHYvEFD6twdsXxvU9/BTKo0/kFVD5OrEZvAt3OCPtHxZSkGPP9jaZy6DbC1ri+XipixTmGy64EwjbB8Kblmb6tCm8i5s8F36FKW2QFTxVTwR X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d842593a-76ff-460d-35cc-08dd7a9d014b X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2025 15:08:11.0100 (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: SA1PR84MB3165 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/patchutils.scm (quilt): Don't install quilt.el. This is to be moved to it's own guix package 'emacs-quilt'. Change-Id: I4d70ad1c137a377f71cd9d3f1b69f5ed95e4debd --- gnu/packages/patchutils.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 41a2daa36a..319b0e1284 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -189,6 +189,11 @@ (define-public quilt (list #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'no-emacs + ;; Installed in emacs-quilt package + (lambda _ + (substitute* "Makefile.in" + ((".*lib/quilt.el.*") "")))) (delete 'check) (add-after 'install 'wrap-script ;; quilt's configure checks for the absolute path to the utilities it From patchwork Sun Apr 13 14:57:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 41632 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 8493727BC49; Sun, 13 Apr 2025 16:10:00 +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,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, 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 165B727BC4B for ; Sun, 13 Apr 2025 16:10:00 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u3yxN-0004mp-Tz; Sun, 13 Apr 2025 11:09: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 1u3yxF-0004lG-Dy for guix-patches@gnu.org; Sun, 13 Apr 2025 11:09:05 -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 1u3yxF-0000TB-50 for guix-patches@gnu.org; Sun, 13 Apr 2025 11:09:05 -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:References:In-Reply-To:Date:From:To:Subject; bh=DpVTC1YP9jyumoHcfW5O0Rk39nRntqwYKLbIVGZeq5s=; b=MKXgyt2KoOoXA1WD8Lff0ZKAZr4YwPVi+yoGRl8iKth/bBlevmWxvqoH7PJLG4UBDo+xH2vhMix82riDU7JB7QH/FzerjAnAqa6HaQ8AbsMWpyVqOjoYakyJ9C+h1d0MD7ePx0xd7pWWrdFXilYVPBqxtHWBeX7IexkmLc5nY5awAG3FhPQvC6XGga6xN7fJ8vlu1fX4tkun8oDLLO0+3c2cBDRasT36vIOd9MgJltwXBRVA29+QJbUka3YiMzRmpeF3GAIoQjPqxgt93ptAigvH3ADNFjXCUE9KWCGnttW76+zclv0Mga5IzGqUlFR1Kgf0V2ZmLkenY5kQPRVT4Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u3yxE-0001O5-W2 for guix-patches@gnu.org; Sun, 13 Apr 2025 11:09:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76594] [PATCH v2 5/5] gnu: Add emacs-quilt. Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Apr 2025 15:09:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76594 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76594@debbugs.gnu.org Cc: Morgan Smith , liliana.prikler@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 76594-submit@debbugs.gnu.org id=B76594.17445569035234 (code B ref 76594); Sun, 13 Apr 2025 15:09:04 +0000 Received: (at 76594) by debbugs.gnu.org; 13 Apr 2025 15:08:23 +0000 Received: from localhost ([127.0.0.1]:43399 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u3ywZ-0001MH-1p for submit@debbugs.gnu.org; Sun, 13 Apr 2025 11:08:23 -0400 Received: from mail-bn1nam02olkn2109.outbound.protection.outlook.com ([40.92.15.109]:54852 helo=NAM02-BN1-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u3ywV-0001LV-4A for 76594@debbugs.gnu.org; Sun, 13 Apr 2025 11:08:19 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Ydx/pBBgQLAXVWvX4Ca5qqoqBQ1mnczCxETu3FSEj7pxSygqzehmqd9SCstZXYOpk9soAfoRtrRAVmIb1dWGQQ4K9E6gRacoBf0/k+icT6FccDhTxU0uZnEXofd/Sw+c9JMD+8Qj0KvE5HmCPPWLaJas+EEg3wIN5eSs2gvqgox9ChUOjY42LIVtMc4Zzl0skGYVIY9B/5kknE62gYFXNJWKeC9SD71Zoz4JqAxOV4Mo8Dwkgnz+DgTedGLXUQb/232sPMHwGWLkE+L1Ra2ze1I3oxovM+JRdRvMgnD+0ViEeTVSJQCa5CSNcjB78qru3LxYUB+hjejW5bIsQVs9TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=DpVTC1YP9jyumoHcfW5O0Rk39nRntqwYKLbIVGZeq5s=; b=WmGioPv/DgDRjpX3SiJWLvpnFyMlOVhHJP8plEd04IuvpOGiEllWIneH4AjB4Wsq47CQSKrUl5bK3cA1S22f7v2JAAGmgkU/Ils/0KOdJSn5TYVYQjoctyk7SWQqfvyGC6UnMGpDMYA12tPHRpt+XLmxU7cUV6Y3fWwIMHnifmsMl83Z++y26vt4SUIhCbvo5IN+T3FwvqR59+L7OTv7XkEIHNt/mCrkfynr6oh2pn5q4/QCQSviGdwmJKJTpnZrADIMBN/rCcuKD9aJzYpFaalQpNIdxMONa0gv8xMYX53KAC5iyjPFlQYKqQnnATtzWN51CAaWAK+MBzOz5ou+fQ== 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=DpVTC1YP9jyumoHcfW5O0Rk39nRntqwYKLbIVGZeq5s=; b=hzLpKN2IJwzfvVNcBzJkQ4+X1a+o+52xtSbfG4zzgQplBthFE7F77qecQoKsXbeUYhJCGvYMvgtu/rCdE1bfpHfJWoWWT9oXiWu32EA1rgdyjHRs8Qfiv4a5VMgwp4erARUmZ7JcxsKdV6g/y0scPlgQ22NflrcYRVEqt1sP3chmELCTCjfZC5I7SmvR3sARIA/NN9euG5GNv77fvxDj/+K0zpqCoiGC1BktFskXxk63e6b1U8T79HfmOaYW+0kGoRdPu/f0xqIdCjF7HxUTbZzwApneTkOkL4U6rexzvu+/M9XBKwtjJxOAgYQCvpuGQkirn/4S8qgmMV82+ePofw== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by SA1PR84MB3165.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:806:251::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.29; Sun, 13 Apr 2025 15:08:14 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef%5]) with mapi id 15.20.8632.030; Sun, 13 Apr 2025 15:08:14 +0000 From: Morgan Smith Date: Sun, 13 Apr 2025 10:57:06 -0400 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: X-ClientProxiedBy: YQZPR01CA0021.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:85::8) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: <93ebebabc2667e2e4a7dabe5121c6d2d9b62e89f.1744556226.git.Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|SA1PR84MB3165:EE_ X-MS-Office365-Filtering-Correlation-Id: aa5a478e-57f9-47f3-027a-08dd7a9d0329 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|8060799006|5072599009|15080799006|7092599003|19110799003|440099028|3412199025|41001999003|1710799026; X-Microsoft-Antispam-Message-Info: aJp6FTyNHmPwyJrPFMHZGwmllIpmArauZZcF6KECDKGGQwiXwqcuRfoF1kK8UX4nu36Se7e8/GzZI85NDQBimUNxW6nVDOTneWjkZ4Bkdhcf4jBg2A7+f8n4cFQoxrE6KLR4JLbH6TmjR03z/egZdqq/HMFup32F6hFi2f/ayniQ5H0JSO/Hbl1KE4FD0C3eJUNdUp0jruKyiUsV6TrsR083i044gZLMl69IPXQPaFQ7FSnYk+vfKGny+hFpRMbnmAW3DQJ79CQlCPQgI7XOWBmAx5QxOQgtvk+UDVc/A8UN/YUehJX5eehmVZcHfCpFvFGuSUtS9jhk8rqrkdPVI31dh6j7NDdKD188qGLJsHSdI5XK74mXVwboQU6jbyDyyHzFrm9Tkvuz49hL3C705h0SWppHsdX+Nssi5O+1Nlm+Bxvf+KT03lwOEh6s/g+O2AtPAOnLM7zBG5M2fv2SAVxRVZSrNglagSBQZZFRLdEdSKjFVkhKOWeYtZ7yWMvJfCish4TcctlAuwgrobJn2zbr1x+ors8lXYhYth1iS2QvD6qIUrgXTbT45CzMKjM8CahQJldykVICKu8hW1DhW+Vgjh17r5ctsKJiXYpBrI77d/bl7RD1GPmLrgm5awVx9oE0ztGoajnq06YjDjR+qL8a1LjR+5ZPtcIk5XBWl1Acqj/vaD8VS2zzUBcBYfMZ4G1SiwK+3CmguoBKipfEuQx8s7/jhT0TDI3a7iCrNLmsFX93MImAaeKqJ6lp/uZh5TlDkGt3jyRM/pB1ZGd/F0PXT066tja/6uybfve2t59gm49mcXSyTRJT+zLa0azLTmb5r3v+LkxeliuLTOHtBxlGVwmMlf70fGJ7oeihLnqS5A9j2HZuEo24FTHtW+ZeXi+OTh6KPJA0LPL/iQ6TZOIYhoxp3URgUxEK1QAV4aaNbyP1FWsq1pVjYyGAZxtP56YtM0EOgK5HYe2gNBvGGQSvGmyt5ndboH+SPuytildWYW7Yrrj1aY872bdMvw7DWZXeExPbUBotGzzufUIJHs/Xtqcvg3Tr3thuJL8Pek/KsrbbXFYSB0veAjZWpU7UNMpmNZghojhGxSNEf9A1zju2/zVArbv9dCarZbRGuZzUmN6yKRMkBhlrmpIqm2pA9q64VnyVcYV/eVqeMmB67Fxs054fI0yl3ow3BZ5c3oU= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jPjqGMwd6bydW4m1FtL1+aq3nuMEzTr36iSMSNq3GNW8vZ6DRnM2FyjyrQ9M+4k5hATvUdNo2RejKZvtpS7En9wSw0KLYSCpWqOghHV4jS50/2HLqGfb4DISE9KUwCR4/j9vICtGTIH2iemNifUbksyrNyRKa/pZJobb/tnmvGvNwnjvnJuLIQUWsuyzxBF3K7UBaLtLCEhL+ThtnQVOdSndg7ZjOU6CuYts4SYM77lb2WtYLLNjiVJcmw5P9yO8qKLJDfD6ALAPHzjS2Su+gBMxNQeNhtobNnv5gEzxaOX6T1onPksFm5+bIiBEZdWfRRuV7qFzDzcrKVwt3mDm1yvXKc/HTsP2fpKCcS2gsZ7ix1nHWXSIdS8GGp1w07oRaK4Gip3EE/XmO22N7Zz+PS7rad4mTuxvvHR84dtDJhlxcnNQ4SL+M/4MciIyHlngzNYg4AMtVYm549RpV+rgY0VgGdofVC3Zuq0SN+ZbUKuKKPB5X0tpoQqQDdcUZeXfeG6ZSWDjRsDBiz+Njwy75lhPlyIt79AHp9L0VfVgVEsZQa5UuqoUsD8MbSWufSYymT77Uu2hcPWhW6HWOT6U1NgeKQG18nxNGE1f2B0k4M91fbpEvZUG3LZDK11V2tKPbLyYrHZn0486nVpZ+Vs7xgw/veI328++xM6PGz8hJd5M2UaHt18dWKDlH5H0PuWXNzE1/WddBYeCJDnneQl+cOUwoV9H+0DTlx3JtG7FGqsPUJXX6tScOsBdC/VvCo3em2eOjjqojLO8GhZdkgnZ6uBIpMpF3O3qyslb+JAoRDdwKjUhSCbPRN5wFCpWZDeO9IYukRgHlCmNuSHncMGnFAuyRvkvxg1CxsIXSgZ8g1IJ2nehGQZcb6Vhp6umKA5iFY8lly/dZx85z8eIjOgJqnNtbDqyiJuUj6GlDPATF7UET1RT7IwrdaPy+1kS36WLr/VPiWKwwYBDwOrVU1HitMsw9lM+xRgBdmGqj5kkb6lqznKveoXC4BzpQVWCMLlIug0FbaJT10U4n+fvL7KUs//3AvOiLs/9Gm/sRO6K7y+HLSQuslFKrL5uIHqL1/KJUK0KKTn3fDN2ivQtND3mZR+YHkMSrvEfSJl2f9lpKJXo90q5kDdoQeWqgqAsDbVTYHkQ71D8xWLzV4KX9S42zz8DR7csbYcMyZYfCs4OCdVERx9e3TuuipX8Cj3dszH6CjhKxHNAQdXjBdNrNR7mk6XdSL2+bzuRHZZFBjyStQGdtbN741GnxJ1drsMXl+Fm X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: aa5a478e-57f9-47f3-027a-08dd7a9d0329 X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2025 15:08:14.2085 (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: SA1PR84MB3165 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/patchutils.scm (emacs-quilt): New variable. Change-Id: I0571cce902ff327dbe18f132b8ce0811dc8c3b19 --- gnu/packages/patchutils.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 319b0e1284..2067e589ff 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -31,6 +31,7 @@ (define-module (gnu packages patchutils) #:use-module (guix licenses) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix build-system emacs) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system meson) @@ -252,6 +253,21 @@ (define-public quilt refreshed, and more.") (license gpl2))) +(define-public emacs-quilt + (package + (inherit quilt) + (name "emacs-quilt") + (build-system emacs-build-system) + (arguments + (list + #:tests? #f ; no tests + #:lisp-directory "lib" + #:phases + #~(modify-phases %standard-phases + (add-before 'install-license-files 'leave-subdirectory + (lambda _ (chdir "..")))))) + (synopsis "Emacs interface to the quilt patch management software"))) + (define-public colordiff (package (name "colordiff")