From patchwork Sun Apr 13 17:39:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 41640 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 3E37027BC4B; Sun, 13 Apr 2025 18:41:41 +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 96F5927BC49 for ; Sun, 13 Apr 2025 18:41:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u41KO-0002pv-Io; Sun, 13 Apr 2025 13:41:08 -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 1u41KI-0002oW-Ig for guix-patches@gnu.org; Sun, 13 Apr 2025 13:41: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 1u41KI-000369-1u for guix-patches@gnu.org; Sun, 13 Apr 2025 13:41:02 -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:In-Reply-To:References:Subject; bh=/dJNxmuL6tnpr5DoY/grGgWLGJxRFqkeGXqcUuNrLYo=; b=IYIBIsdNa64GfHPeCt6VbIZ+mGIwjuI+pzLPexBckQgC4nlp/86RLuNHrkmeK5EiqKUZPRXXmQA7ahLuco7vT+al/IB0hozKblK3sVRKDuRgdCxdgs/FJ3GC4G7LF2n//nHiA3FM88tE9MCsBQTqKm5uV6ffiXcqdpDERf9dUxbPlpeRaG2Q7YMiHWRaWTCVMa0DAFG+UqzkBiL65ReIoyBabN0rWzGFY4c8u5HKuD3T4Zw0AwDxBDj5A3u8cwPWnuX36M8r8PoziYjlsgFqyBeyzEnsJRaTMwrczIOQxNQikvabtvu9+eJHXA2S5Q7kFAQxss066QXq4EQ/N/uwBg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u41KH-0000aG-Mu for guix-patches@gnu.org; Sun, 13 Apr 2025 13:41:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76594] [PATCH v3 1/4] gnu: quilt: Use gexps. References: In-Reply-To: Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Apr 2025 17:41:01 +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.17445660132143 (code B ref 76594); Sun, 13 Apr 2025 17:41:01 +0000 Received: (at 76594) by debbugs.gnu.org; 13 Apr 2025 17:40:13 +0000 Received: from localhost ([127.0.0.1]:43714 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u41JT-0000YK-K7 for submit@debbugs.gnu.org; Sun, 13 Apr 2025 13:40:12 -0400 Received: from mail-mw2nam12olkn2033.outbound.protection.outlook.com ([40.92.23.33]:22465 helo=NAM12-MW2-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 1u41JQ-0000SH-1s for 76594@debbugs.gnu.org; Sun, 13 Apr 2025 13:40:09 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=EqWdfTSHuQFMpACd1IhhljKwJunbdn7achLFuzT/YjQ0XJ6AtFKGkJeKKlQjuEKyQy0J9fyD+IIc9pCcJn2zWqE3p/Qg8H+x1WSoq7zlFdF7ePdaphb7clQLPnFW1jp3arGn4AsRCWtM4mKsQvJVuhjC7VKu+IEM/hVm1g7MU9tdxn8UlJOoRrEjt9FRwcA0ZYxYTUzMDSFA6rs/yxDWFPJrZxLGrY9RdKMBpk75ZHmr+Zp36FLaUg0iyAiRqB2G0vYjztnumk904wQgL0RDIVN6Hw1TMPo+TsJo3c9zgp6C6dYAqze76NJT1YJHTO29ztJzKLfdfxlnpo5bebXRLQ== 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=/dJNxmuL6tnpr5DoY/grGgWLGJxRFqkeGXqcUuNrLYo=; b=db7V1XvbrvHbYm4LTwHd0SShazycvKKkTf/Bs/xwrHSMzjwGF8StH2neszebCoNn9htVBQM9H1Z7VxU2eHvgBKY7QwFMv2hlNhF/HZ7u3RQheCG68+c0w1ddUxOxtqSghh7/7vX2Edkxc0ZNMAM+wMC8/73ZQ0NsIyRl5iSZwckEBfdZon9DIa6vnLWMl7XCBLVBwvoTZGEzjiDF7q3WnVl2ZmR8pa8yOHL2WUqa5vjUg3ouB3xnwLOoMAeNCffZ6NDBFDRnDyU9haPSauGHVmIZ7zb6fIwlYhWn4hjDh6ChtJipY9QBntpDFzsAusJPxf6dfOrARKBA/KFw8vd6+Q== 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=/dJNxmuL6tnpr5DoY/grGgWLGJxRFqkeGXqcUuNrLYo=; b=RDs2hNnA0XKJzb97e8YPkGr5CpPMCAL9F4XHO2tx8uOy71+FQRlLDsfBsxS6XKXM2IK4pzvVcTNnRUkYhM0Cpbyou0Iv1321Mt7RLZlFN0ab9G37pK33aMHgFtQaOVBjJwaDy9EqYJQqdGPbS5mZLnPYhU62MfPxIatYjoJBoy8snHp12h42xjYqvfikZXPPm8kQcS/L/Nbk/vBR97LnEpiQkmaZBv6cX7zjFhzPneb60HSm3JIDZjmfwNd/yH6LvnFSEAcaedlMApfA7zn0w1s5efA0BrXR+N9z1ixJaMbykIDyUKjr7i9uRLpOLVGgwtrat05NxWj7V6jUcqOUew== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by PH8PR84MB3137.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:510:1c0::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.28; Sun, 13 Apr 2025 17:39:59 +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 17:39:57 +0000 From: Morgan Smith Date: Sun, 13 Apr 2025 13:39:41 -0400 Message-ID: X-Mailer: git-send-email 2.49.0 X-ClientProxiedBy: YQBPR0101CA0349.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:6b::14) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: <0648f3d588246ffeda82901201099620a1c32bd0.1744565984.git.Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|PH8PR84MB3137:EE_ X-MS-Office365-Filtering-Correlation-Id: 32986a28-500d-4c96-1b06-08dd7ab23529 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|8060799006|19110799003|5072599009|15080799006|7092599003|10035399004|3412199025|440099028|1710799026; X-Microsoft-Antispam-Message-Info: 8HTbd0IXEW6bv+3owmfFII+7rItR1QMygSUh8B7tjtnHUAGLn6/thovNAaqgIQeNSFZ1EF4F0acKKwj+8i8WwVOowZUi5a/5VIlKZsYJPCM4ys8o46UvdT2QP2JhdqvQuq6m1MFKe74bGnEB4463ppJYfvkTSerA2mofjM00tSduyC/WEMbW+mXf/OjmVNR3P+3fPM8c+CQCgx0fXNDbDJ4FV12E4qFzRij/9FFX3pV7cFp0T/jW6ea6J9dyoByv9VW9Z2rGv1O/oXV83w8FBR0thKjCHmJ5tTeke+ITg++SVh+m7wpwmB4aJ4ipZ6S8Lz2ZIhpat7shnGYwZQfsgkmrO3TzE5ACMImB4L7K/uSfnIVO+kUAAgTvSOf7Gd1zb1dYi8zFRjNyePEFi9Eq8D6jodiZGXPfbKTGVZhkCgsdPJgq2avAiPIv3+pPCFtesq13yIscUa3wGNZWNBpB1G0aWd7ztTRRjLJbZTMYRIv8KFnXpYGVz5u6DAls/Sp7MrSwR00TUl1Rb4k/OuhAKcQyyK/TaoCC2Net/5OzSbr9+xm8Kii4ZTyLCzFV8Aj0uu9SuJfYh0xG6dcEX+/KKQYDXN7NHbBh4drxiMq3YbXjUikEV4oPNLQmUrpSPYs7iRxUUpnnEMX8XO70b6/En0RwSbFcWcXK4NeR7ylD/xGqlvMf5iPcsZJGkoQiJ4R+itLp5QizkloKQPPrhgGLyAGYl9C7BQNlBRQykr+Qx28z+vGagCfP5lg1fcjeAorhygo0E7LFR693w4pWt/pckums/8bU/EX2ekUEMl6v+V1dWIlOSq0I7LQ8TOfhF9ryKt4TW/sRVRELyy+IwS+jW+xv2mJupBLBb/z1ADj4Ilie6nsWMDJf/U8B8w1IgP7nnEKeAaj/gfe/PXEgzdBZKkCqO9Y/yRJ9n+B6L/xp5nqYlOStdBklc88m/oV2M6fjny4ACGNWfid/7nIwF2mNHru0GngCOEKrgAIVUAVdYnJ49tH7kmSBmhkyy6yzO8mkARKP2jKpJChZJW2zfxK5FVwaWPnP4Jzpeco+6QXohyljC+Y3iyhiGGj5krZK2i7WO86RnV99l8SDQTvH7gijfl4w8ReVLzgs4PmDnIb9Xw0t9RiDhxBOF43CcaQ7Nmr7pLm0o+BNAykDIz9hORy4Zimib8ZjVWun8G4v3ykCN19vExkhZZbVK2IdeFBpWJLBQfoXdw4OU20F/sPMCnY4LzrA4cNzRD3QfnY6eetByDEWQb6eu1zQXDHG72vu7dQq X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6ABAitQTWli6nA8YAIgoypSmuDC+TeaxzIY/FvM1bgmGJv91bxmbg1yPcGEy7kuj9IiKh1CcgZ8Frn9rpXu+A9N1ujT6FR6wcsULi8fBGQKkA6BpNRhv9qnXN+QKQwh7LWkdHp8pgXL+/y0WAKgZkoQlqsMfQlHhO8L8AyjdIY10M9qAQl22z5L5nwU3DQJX0s8ggtY1bKPv6UFW+3NO65nNphrtYSrDqkJgpHOflOTD2rgVqgsGkrCgJNPj29yrdP18Ql8NoeQu1bMNdZrxaQoQRlc513+rRL/V48tmTyJEeo8nDEAcRJC40ckqIwnICrwT3YccwRRp9nGAT55bhClFMwoS9y+JhjozI4awaLmv7KTphNl+ZwjzBxQs0TlxytIFqcj5H358MtjYCqzFrv8IeDw+wN7IYC85QrC5WDE5/zozMF/x2UxShffUEOyjfav5pk0fFASPjJKuqMPd+q4i83KLWQdC8OXVTgcKbgI60HLLsPiVieT2t1kbnHsuXxyCkpsHT0PGbHUwpous9o8ANXlrfAQAFA74WwoaA1+zttPsC18jN316vcwdjBbo5QstS7Biebihzrj0lwwwPRiOhFUH7ZKrOOsaIUXCeDpziNxcX0RVcbTyfqi1IbBv6sdwQTysfFDQfC5Scc+cJ+MoFv0cZnw66EShoR+gk3cAbSld9K2cjlecCs21erSyJEM3PUVNbnTKBpu9MDPc1CD45gcUzTYbhIYsT9ZvZxwfxJ5Du1TWTNJpYtwHEOp0fgXgWGtN2mj5eIq+TEmPn1K0FP9ofro6/8ZRvsQaqACkd0rHBvBQIExYVOF5lEvUPVeVbXN0NNf9X2Tx0igbuerx4vt4DS526XZgzZd5mEP4gmd48kdo+szkDm8Vmim0yEBuDLh3q6YImOqO07zFzWYvSfJh8SEd9pyLyX75yVmI79eypoMiTeBMWD5pZmv0RrouTpx9BtmDRg9VztWIpWY7zrkQY8UqutoJRaz2gU0P21Wd+KFrd/MwrYm9BSmj11DNhwBEum30Nrl9pdgQ/6g6dGZOqNebqMeNDfqAKmbihrIXKgijbVSAsdn0O+uyYdSErjFSwGRegyg4gw+pUEx+EhYKVfZyXdmSecc12Tpo1zRZAUUg+rz6n9/aYuZxm29bMnDrQFg/saulUoLQWGCUXO18O3BgVTxgvN2NWHrIgZP8BbSCJT7bm72H/PSze1Ch2HJAS9MPAlyD8xrIyOUsrhWzomtxgeMwvGi2UUHOuKHXUSJZEzt+tGBiJ6eK X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 32986a28-500d-4c96-1b06-08dd7ab23529 X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2025 17:39:57.4205 (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: PH8PR84MB3137 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 | 111 ++++++++++++++++++------------------ 1 file changed, 57 insertions(+), 54 deletions(-) base-commit: 03edfea126a88110b520469e96eae73ce86d4b7d diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 3cd3507b07..b929ed9a5a 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,61 +183,63 @@ (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 _ - (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 _ + (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 20:08:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 41648 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 D319427BC4B; Sun, 13 Apr 2025 21:10:29 +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 9855127BC49 for ; Sun, 13 Apr 2025 21:10:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u43eY-0004Rh-4R; Sun, 13 Apr 2025 16:10:08 -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 1u43eU-0004R3-Fz for guix-patches@gnu.org; Sun, 13 Apr 2025 16:10: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 1u43eU-0002Eu-30 for guix-patches@gnu.org; Sun, 13 Apr 2025 16:10:02 -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:In-Reply-To:References:Subject; bh=b8P5K0kY3VAxWPJI8fqyqkbfkYYdgCRZcdLB3XAPTKc=; b=KSVhatrL3QC3/nfyTzh/pAvAZ+gpfO5duWj8/1LZhydN4YOprs836esUrkWshr6K1Ij8uGv/JCI19pul/L+TSojUsrN3RGPAEhIJJqM/n+2dNfpLrFq/fTtXO+1xNuZXOeQpcRb1l/Dz+drh68gesMi3upTHNPwaajbwYIOsKa3NTzJqRhuaN/BAPJs85zCsjI8RQJUEeKPOt83RXWbrfNq+NRNJuEQcaOvqfNbrg7IV7hRU7L3uBP0DdPq+ooPKRuhH1aB8/pGsbkd5KEyLfskXrYdBpElt5WJptjwwnHDUC4fSG5KiL/+qHi+v5PJ9LGlXEwRk42EECJUWbb2Jog==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u43eT-0008DV-LT for guix-patches@gnu.org; Sun, 13 Apr 2025 16:10:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76594] [PATCH v4 4/4] gnu: quilt: Build emacs package. References: In-Reply-To: Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Apr 2025 20:10:01 +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.174457498331540 (code B ref 76594); Sun, 13 Apr 2025 20:10:01 +0000 Received: (at 76594) by debbugs.gnu.org; 13 Apr 2025 20:09:43 +0000 Received: from localhost ([127.0.0.1]:43993 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u43eA-0008Ca-Ti for submit@debbugs.gnu.org; Sun, 13 Apr 2025 16:09:43 -0400 Received: from mail-co1nam11olkn20811.outbound.protection.outlook.com ([2a01:111:f403:2c16::811]:55904 helo=NAM11-CO1-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 1u43e6-0008CJ-9C for 76594@debbugs.gnu.org; Sun, 13 Apr 2025 16:09:40 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nSBxv5do2im/IbUlXGe4fwIPZ2d7OXbS3dyLjd0gb2im5zFxWfIb0Y0uN3UA4bayOitALb/zMTnlhEtjz8pXtb1j0L4Khv03W+F5yf7sA+RpNwwKYw5SWrxAVweFe3iRGdvRTdqx5jFbMFamL5XAltu762jnWMiNOoinnrz/kT7e1BhhCpis9ccFW/iHxtHfmyastbSAfoqZhwekb/o/pUqfEg2VuUXlRsj45odDbioEofvE0TK4zHuqYF3aM0HHHAoPiGEB1tgvsVAVSS/XQI8S5xesJVkEOXdIfl8aEshFtpL8nQVAOJzvLzS0mEeiELDTZsqOHwCAeRibHztAjA== 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=b8P5K0kY3VAxWPJI8fqyqkbfkYYdgCRZcdLB3XAPTKc=; b=cY84EalyYwHB9QX8Ep8+A2EOrNL0AzHtFJCbeww30AOPGONY23VFdlXedEP3SpLqYCAVDCZ9GLDNUCurotDQ3vNyiR9aqFxVTRiFVzEwHXGyw061JeS70scVjzxzecYferBQbcRhfkD7T9Wq+z2G47TSErmphb1D461NgkZO58eBO6fPsgU5+OennMQ/8vsE0iJQGqNS3c5Hoa6XSjIsqJ7N3v0yW2e+TGIfnJSe+vvHi2fGRg5i/8GCAekPyGDw/PfiKmAnOVmeQsSZfJAdTDRLxJsna4IT5P5YoGWzo9sJ1QQ335AxTCqwPFGlpuCwG7z3Lsst37IBMffjK3tTyA== 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=b8P5K0kY3VAxWPJI8fqyqkbfkYYdgCRZcdLB3XAPTKc=; b=o3eCqVNXCjxCSkPNfWq0Ta2U8P5RG2tpnu4RBFyekcJzWE9F7Sw1cOWvkBrtVjlY3ud8+1fBtCrHosnhN0948Q8g095xtQMUYFVyBSgqO94uVjpwgtUUwWtJhjBZNyd1xcM5FPkGQbU3JNjMhtKtAzRdPho+gmuzgGZrgVTv0vm1wwNAXLBxC8wYJDY12dngtHAMGKW+0Lq/wK5xLGw3PBFV39txmQ1kA5TKAip2S/TA4IMgcxhuE7pICaT9B3w1VIYF+2EyGIS0GxMC9euC03Xv1JhYA9DlaKyz6e0bAPfjcCAzBrDN7t4es6TZcIcOtzp0k+N6wwPJpQ3ToDgrhg== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by MW5PR84MB3273.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:303:1cb::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.32; Sun, 13 Apr 2025 20:09:29 +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 20:09:28 +0000 From: Morgan Smith Date: Sun, 13 Apr 2025 16:08:16 -0400 Message-ID: X-Mailer: git-send-email 2.49.0 X-ClientProxiedBy: YQ1P288CA0003.CANP288.PROD.OUTLOOK.COM (2603:10b6:c01:9e::25) To CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) X-Microsoft-Original-Message-ID: <5dc4bcf8fbe2b6d857d131ce2a7b34089d7b782e.1744574895.git.Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PR84MB3424:EE_|MW5PR84MB3273:EE_ X-MS-Office365-Filtering-Correlation-Id: e9023416-fa30-4c18-5605-08dd7ac7184a X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|7092599003|8060799006|19110799003|5072599009|15080799006|13041999003|3412199025|440099028|41001999003|1710799026; X-Microsoft-Antispam-Message-Info: yzb2rUN2qr/WHRESSpmRDoG8kF5oS03wcbbBvpIp141t8kn4mrNw8LMkWaq26dFDgF/aWnJZ6wDwGM1WYfUoMMUJ8qgUZjdW2/YUWz/cbz7iA354RGaLyzviacLPY3OIRLIdhNf1FpgaAHz3iJeK/g7byw7BUX3drL/MZ9aFtsETLGTkSOZAmUHEPsg9GNu98bNJj9VQFDEowrWIyLBX3t/Zrwqqu/Dm9ERaxK7yPj6AWaz0zmZqOtxDM3oi8IQz1XSjD5M7TlwFDXyoJuAxe20mhGl+yedIXEiijIYYXs/YGVWTgGVMWmh6/BMOTy+/ZM7E5BOes/gYOHdeuxlpkx8FXq6KbG84cog+ww2QUuLMswdA7pIk884ylw+gWyGgu3iMmw4+K+FmkwpsgZ8MgPkNGcAWuGje4YZGzVc6M5JRmdi3WXakTiLtCdoI1Drf3hzp5emBpsGtdtRsgb0bYC5ayKy35z6H3JCPU0RK2D32pOaB0LI7hRc5rvteiKNLBCOi0axOwQ639akeNe1/9vrZyYmg1AQfd9raKQLrbPLtr/kKYtnrlrIfpWmCFzP5pTWrl/TYqGzX5q2kdxvqF7VuSNhP4m/hGV/faAbazCKDnZ/WYjgeH6o8bSjJxN5+73pKvycleKNZmBftiH2XpPRzRbJTuErVYEioDzvOyCbrJDIzQxStMvq8WMwCNfKV6x0pt+PyAc45WlOaJvKslc39bziH0nqjdi2fsKHhaXTOByvDTW1nt3pPogrW/1Pqg0zypH2Wd46XwMyIc9orqqM8z4AoEKPHBDj6WCA/RWKGMIdiK2iHX4+NW96Jl0PZEvXcdjK0xTQcl/RxtZVtQiSZOfcsDjtLITCYMQYb440MN2UTJV8V1nS8T+SQ7G/7F1Uwr1S1hVwOy5DSUDBMiXox9VPczvSnmDTpHTY47oSnik9kyI2uefYN2zxS5b+B6cYwjW0SqgW4KqPTsFnGvXGQMawGTRR+DN0wM32WUULnWtm+4LD2HkRCLqTav+dW6qYg5vaxay6d87516wVpZecpD4XIVrpsmS6asdn12SLLxVkMPVZanLfeGVPaPBl/4I6M3O4BGHAxy2q7vxpu7NdxnpK8ijjrSUsV5y1jiZbixwGH+vQJ79t6xyFFJODO2lPmFA6IR06oTsbWIWrGs19pVxrJ6A1AxvAtGlCWoHy0Nf8V4Y6imHf9SY/XUGh8vtjAsujSf8PhT1goieDhbQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /PVLW2tx6Shy6tzGfvG0//S524wEd2Yt9gVmXTbY1iJwZ6fcRpO6eulN9xlONuZPDuSVjTQVKy/8tBNdu7iAac8V0ZbKK+A9FuLA7uAWj8+MYK4g8Ts9H/T2l00AGKljLVv7UtgWEfXp/k6pP38w+H2VrH4HGDf0Nl4Df1luF9afAMPvrbXgL5X+TLiG35yJc4aqEIpao1cmxYu0YnIvreCRm9BAEqDxE9GW3ocz0/1j+pYF7SG6oVvJmeSiamfwIldpjdUzRIhRiy+iBP+fSfIE5Z3G/5Yoib1sywcE2AWODz2t/KJnTDAMGIk5HyEjT/oxCkk1TQRjoNwT0+o0trbPqRiHDZ8Z3g5eK7tONK9m412qpi0JntNH65kp/FMmvn8uvIagKQ1u1j1zjYjRTOxEf+02adzcS3sNF7zV7ceN+4YGbJOtrk6Z7q4H5X/dAvbqHWZykF6RVPhIWnjksQsorHXEPI+G74X4yyajD8n6dKDAtVv7IMoPY0GIs42BX3m5JKqhJD+r4ltyBl1VUZbw2jOUep3yzobbQkSFfQrWq9ZWvK8b9OIriIAGRN3YsuNUwCAt6/6qkIMyMdvHKPLVKFuhJXxwR9OTYygYCU+bKCUnYDcv5eZgb8m17QHbuR7QaP7npvbZaVCyEIoe20q2zy0EEqWc2igihIA4WbL6/3gUNUJZT7s6TT6wOFXl90oU01QfMD86osQNDs7ixbt/YeAkBCj/iL3IQdiSEXIr3i3QBxr/yNYUeePiap9WmmERwmYSmKP3rOimWMT1mBy+ziggE6nJbvHev0R/I2huFycFAIFNFr1hRH6Oedi7YTXeTmJpy6YF3of5xQbAPlh5kktr9Lwgj/Ue69/rlsTa4DmCfaCuMUO5bvNfgMIDXD55I2t5j1X2eQa+gJMXmpnFKjTjHrQHlQeVPBkRBTySQ+JTO/DJdDnIA/5NHRN+3ETfWWuaX8l9yRTNjTCGBtZbV/KaYt1mrnZGdtZ2KE+k9gS8SZ9TqAb6v0aIuaiVxNwrW78MrEU6j5AUO13XNuXWd8JreDmcj3b3s+CjtxMNSS5luvj4hktilKj9ygSpp+6T+xI+6q9UoKj/F2bJKkJJ8gbaShsiNGddTysCIC+9ICI3RVDecZv8n48VAu+Zv8inEockfnilwthog7ThIP8gftDSeSItjNAuiGvI86OrwKd8S6c7Ki3mL4KotpHaQvSmGkTyD4wnM4xa57E3dwMtF4fjCv8MeM9D29Hd9UrrNlsu305rxQh9D53HL80s X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e9023416-fa30-4c18-5605-08dd7ac7184a X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2025 20:09:28.6439 (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: MW5PR84MB3273 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): Build emacs package. Change-Id: I4d70ad1c137a377f71cd9d3f1b69f5ed95e4debd --- gnu/packages/patchutils.scm | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) base-commit: 03edfea126a88110b520469e96eae73ce86d4b7d prerequisite-patch-id: f80d0520f7c77a03803856fd859879875614851b prerequisite-patch-id: f94ece5e1fb310c55583bca97c977d3132ae2a78 prerequisite-patch-id: 93f40b5d1a83ff8a6c9a9243f2141f7f4c1f4af1 diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 3da1e7b3b4..4b0fcde8a8 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -44,6 +44,7 @@ (define-module (gnu packages patchutils) #:use-module (gnu packages compression) #:use-module (gnu packages databases) #:use-module (gnu packages django) + #:use-module (gnu packages emacs) #:use-module (gnu packages freedesktop) #:use-module (gnu packages file) #:use-module (gnu packages gawk) @@ -179,7 +180,7 @@ (define-public quilt (base32 "09l4nf6qb8y8l62z8ypdg5mraz0lvqxg1j1p6xdyh1n10gg0k37y")))) (build-system gnu-build-system) (native-inputs - (list gettext-minimal)) + (list emacs-minimal gettext-minimal)) (inputs (list bash-minimal perl less file gzip ed diffutils diffstat findutils tar @@ -187,8 +188,36 @@ (define-public quilt guile-3.0)) (arguments (list + #:imported-modules `(,@%default-gnu-imported-modules + (guix build emacs-build-system) + (guix build emacs-utils)) + #:modules `(,@%default-gnu-modules + ((guix build emacs-build-system) #:prefix emacs:) + (guix build emacs-utils)) #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'no-emacs-build + (lambda _ + ;; Don't build using makefile + (substitute* "Makefile.in" + ((".*lib/quilt.el.*") "")))) + (add-after 'no-emacs-build 'chdir-emacs-build + (lambda _ + (chdir "lib"))) + (add-after 'chdir-emacs-build 'emacs-ensure-package-description + (assoc-ref emacs:%standard-phases 'ensure-package-description)) + (add-after 'emacs-ensure-package-description 'emacs-make-autoloads + (assoc-ref emacs:%standard-phases 'make-autoloads)) + ;; Don't include Emacs check phase as there are no Emacs tests + (add-after 'emacs-make-autoloads 'emacs-install + (assoc-ref emacs:%standard-phases 'install)) + (add-after 'emacs-install 'emacs-build + (assoc-ref emacs:%standard-phases 'build)) + (add-after 'emacs-build 'emacs-validate-compiled-autoloads + (assoc-ref emacs:%standard-phases 'validate-compiled-autoloads)) + (add-after 'emacs-validate-compiled-autoloads 'chdir-out-of-emacs-build + (lambda _ + (chdir ".."))) (delete 'check) (add-after 'install 'wrap-script ;; quilt's configure checks for the absolute path to the utilities it From patchwork Wed Feb 26 18:00:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 39258 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 97DDA27BBEA; Wed, 26 Feb 2025 18:04:02 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2,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 1D42927BBE2 for ; Wed, 26 Feb 2025 18:04:02 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tnLku-0002rI-2g; Wed, 26 Feb 2025 13:03:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tnLkQ-0002kn-BA for guix-patches@gnu.org; Wed, 26 Feb 2025 13:03:10 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tnLkP-0005JO-M6 for guix-patches@gnu.org; Wed, 26 Feb 2025 13:03:06 -0500 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:In-Reply-To:References:Subject; bh=q9XvWJTzEvZo3oY9vBb9bp/RGrmCUxTedZ7G83BoraU=; b=n8m4uMjm8KQGkwCUpTd7nQz7JI3h1w7EbIYNNiV207gN95ue+/ujccv5DisSlt8o+GAZzACgW3JpC2axeamyyKpo02uXw3AbRwWoy3TytpE3tcUrQ+vtEXvvgMC0HPEzmCytVvJUQlR+MZIQhJ0EtkEv2tXrHCPdObskRHtGwpdTRHp3tnu70c2pmbuZDmTbXh0sZIhn8in5E+/4USV81dwJvOOnCjkvzmBKVHXPiXcQh4T8zFvZJTzqiqAn1tUMy5tWGc8EMtq5/e68wGn8D0u5wDZHcLI/6xb2KqYzaCymfVkUi4kcAgLlFXvhK4BMqHx2xcNB6Kecfbq+jwssfg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tnLkM-0008Nu-Fw; Wed, 26 Feb 2025 13:03:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76594] [PATCH v2 5/4] build-system/emacs: Allow usage of #:{allowed/disallowed}-references key References: In-Reply-To: Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, divya@subvertising.org, ian@retrospec.tv, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Wed, 26 Feb 2025 18:03: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 , Andrew Tropin , Divya Ranjan Pattanaik , Ian Eure , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-Xcc: Andrew Tropin , Divya Ranjan Pattanaik , Ian Eure , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by 76594-submit@debbugs.gnu.org id=B76594.174059292832146 (code B ref 76594); Wed, 26 Feb 2025 18:03:02 +0000 Received: (at 76594) by debbugs.gnu.org; 26 Feb 2025 18:02:08 +0000 Received: from localhost ([127.0.0.1]:55399 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tnLjT-0008MP-SL for submit@debbugs.gnu.org; Wed, 26 Feb 2025 13:02:08 -0500 Received: from mail-bn8nam04olkn20828.outbound.protection.outlook.com ([2a01:111:f403:2c08::828]:3821 helo=NAM04-BN8-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 1tnLjQ-0008Lp-9u for 76594@debbugs.gnu.org; Wed, 26 Feb 2025 13:02:05 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gemWh/ecqnhGDjCr/cRFdBOZpd5OsCaAHJmMzmjTg9nPnFPZAnPOXLUJ5q2/7UDR6tn8RjDqYFyCQKgBGiv6aDYsezAO6r6vrAOWInwPhh9PEHJyKYOz1BOEPqSIRmsapxi1509X8kFR5ZXT+1qiJasG6bqeNHmHdAFrM8szxfxMJVM8SSAco3d3JYFSbeYN2c7DZ+y+kVz67eP7RDh46Sf8NR9kg8cD2FTZwYrgkcJIgmWdwxXt5uZsxvhmDQDrEYwpOwKhWHuGJRjmSivtWho3pUz76c8MM8M5iVCxtjZ4UlqlpnbkFogcjqCcrlUYamMysJ7W9PmqZpCYBDh1Zg== 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=q9XvWJTzEvZo3oY9vBb9bp/RGrmCUxTedZ7G83BoraU=; b=wXBAWyNrOPmte2jVBacYWKQa80umG8gx/RlNZyxSB6xxN0tNRopEgpLW+F+2yIYNXRDRKAP3o0d26kyY2HvZpozUaOpZQlQ0VVzSmaeXw28dJAQAn0RUT+BW2vAQCDf+F02tS9YndRL+I8/1e3jqugMBTzqNrBl0mDW1M/1LGmpSDjBdp06krm3oNcSmGrYZsEb6uPQ+oP+1gR3eujgUiGlXRS9sH8cZTbmVSO7Z/mO3kbFyjDZaMGvH0CzUGDvZuXUGZqZ72KyfJZj4mX4Ct6/DXtYkxTlb0AsdH3pDeTiQu9kDU1xl2tKzkOXkX+YtwFbT4bwGeQ1XdH/h/h2YBw== 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=q9XvWJTzEvZo3oY9vBb9bp/RGrmCUxTedZ7G83BoraU=; b=nYpVUhcjwE9fEBKxo0OiAZqKGwy1zT1Lix8knOSIalZrQMctKl8Csw2TKNO+9ZDiV8Ji/L/syOteBd8iOT5gwrLhV5HgRYYQa152rvRkgQ4WfMWfbq1k9t3K588cSKrAaZSm0V7zNjqlDJj1jpmf9gxdPggqNdFHV/0jIPPczCRGOQKSohjd5b0eqgPzUGiaRapC5xADJ6D7adAJrxnWkeZIsVB/CDzhODazl4nHbN5F5HMjRqndpM6PZzvT+WiAmTD64F/E7pcFrAACTqgDPlFTtu/P0lJP2eKb3rlevoHCl2NK3sJauYL6nLxkSUXeDjX3Rm7nAd5b1wdFVOnvFg== Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:610:1c4::17) by SA1PR84MB3382.NAMPRD84.PROD.OUTLOOK.COM (2603:10b6:806:3cf::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.19; Wed, 26 Feb 2025 18:01:56 +0000 Received: from CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef]) by CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM ([fe80::5c77:7a58:48ed:9aef%4]) with mapi id 15.20.8489.018; Wed, 26 Feb 2025 18:01:56 +0000 From: Morgan Smith Date: Wed, 26 Feb 2025 13:00:41 -0500 Message-ID: X-Mailer: git-send-email 2.48.1 X-ClientProxiedBy: YQBPR01CA0006.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01::14) 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_|SA1PR84MB3382:EE_ X-MS-Office365-Filtering-Correlation-Id: 7929a272-c5f7-44aa-69ef-08dd568fa87c X-Microsoft-Antispam: BCL:0; ARA:14566002|15080799006|461199028|7092599003|5072599009|19110799003|8060799006|440099028|3412199025|1710799026; X-Microsoft-Antispam-Message-Info: CF/oGY+yK07gHJv5YHtGV7auI6yaV2EE6IBxK4BM8z+FcI7U/e1HUk/47b7ZZMmzaVhDQoKVMHFdfKeT2jtr5e4XBUXbrgp2rMm12m2ohKNlyrfSYJzhIbCOXw+xjLvllT/C/OcPhKLDEioxP1HXGVqCaP36FYjpiraCnliHDEfl7Uhhnn9nj85AQn7mFmMQPowwaxt8QhnANfmVShcKm+x97eoPEaMG1k8JwEf6l9v0C9wo2vRCMq1PpBL6gs3pdgA4/gf39dJ7X+2Z04wXUD2JZvbNpow8sGd9PRhA4nnPk0LO5swkMzAJtW4WZIaKnwUy9QORRomn65EisOCZvCnkb7XZkCL2JmcBW8VU7R0TYBvaRw7+zn9UKa2MP6g4bcIN+Fsen70bHnEkT2Cveo5Q8jrc06QGpJE/jN6io0HKyTZEy7QYps41D0x/76Z6J8CNC3R/tCARNAbywj9nFd8Ebi6jja89wbuNaNai53vWYwi0+C4/U5voxW6BjHWg2AsPLfuV1BiLz3tCz4oswBBUkNkVrSJAQ42FfYGOFC2M+Ure+F95/9ttTYSfsTV4R4JmhDXgCqZKZuXNVst+z7WtCq+X33iWjgj8k2F541qjWsvVMiL6AQ0IdViAn4tfqXwSPvRuZ59W6SPp1FSO7AMObA61JNQMEqa3+iPVAozjCr1Hfv+83jyvGZBqkkYYFEm7e/CH84BE+V1Kzis8+G2uKflle6jVIJaAHSi1ibPCUtd8JjuSnmvY1uV3rO0FiywDYB2A2eZEWhn/GbW18kUwCBRZqviocdGsa5B131ySZOWmwcLWbmDLdKTDfETjDDTIxqqMtaxouvvFl79Gn3eXmz/czaWtRVjXz9sZ5YlAVkE3ap9zATv5AD/wKeNugBgSeWZXjIu99AbSBxdIqU62fetvRqp8RfARBryGtrYoRgb6SpvhKDYjqOgAhpcdl1lXk2k4AU1Nuj5fGyWI1QsnkcIWAp85CIoI7cQv07MvejSYsn4cIwy5Q04t2FGut59KrBxbkpRvzyGUbDXIV87tTBNZhdegjD81PqFn5mKvAZ5PnzuvHcrEvT23HhbVwYX/ql7SS6b20yWqziFqS6KnIb1upIFEwIDxQgPUBkg= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eKkwk8iY+jfkrho7FL2UpCUtCw92gl653Vh4YvBEz0rDc1rEJUHO72ZSiUlRe0gLaq/V+OaixgwaCYZZ8uuSH8YNZoIRgoELxZJeYxdTI/9CBSugrr91IOFv5gRV+v4G7lxVZVPPh8T9VB9K/GWNt0o3bEXhN0Op66vmuF2F6mrFGAe+XrM1ryKszU/UiY30QT/PAsuYAnyE8hC9U3Y5oGpUMvlRXj95XQyEswv6GuCLNH2c2DHK/+qSTN8DJvumj+a0N9VIjSvaU+WPDyQzWVdfaDaxLhezIiBKxi94BO9+cTFPiM0lFbAZf2218i3SAk9Au+jBqNVNOyILSUEKXnG8H1G+NtjIwqKzdDRAWUfvR5PIKDt2S6LF/HNi/wCMUwCQuVnRgOnzDhHcHkGj3mTS+vwBVdgN2K+MoQ/BsNRK0IUyKuuKT7ptbwy/g+/bDDStqG66NNuK1sxNVf1wU0y2X6bDF2fN25fLlYLztrdqzj8Px5Q/0/uNElvWcwherlCj/B0V+wwJHYLzxC15VlQG9LvhhHhhF7sw16VUI5DHSr+/5NNU48FTssudOW0hwluJ/QDEmZk5JbEN+PGVTCuGlcMJaLlml/bMgTNYlzPgG5ftimXq1HC2UbE9d77GnVHVu9ke5W9dCkHRkOsK6/IKDRNXiDNRIGNmyjJKC+UgoPUH8RAZFyZsSlXsGW1/mfCCS8lN9oz5NAde5uD5FBpN/KFgAXfEdTmfqgR55Rrtwp9pNhCxwiqLpmUssQjDvrYLSgY+59kaR7fGkrIhkFd0om7fXkUlO6jOOrj99rENXJM/Fhi6rcKzqqTYn9KGENlCTD05DuIXezxJXnu9wHP9KEAAzyEXR+MBcKd/2Xm5i/VrU3W12OWAaYWnABhnot9wFMrr0Rk2nDzg6+wborbV5Wn2Zmy4jS6sPWQcKLR/wGXOR/FXguhn7hm48VGIvCflr4YQBRZl5nN9rO5dASRy/qIf/PWUA/sKbUZBBbyBB/BBlz//M6M4CC2ett4WrVQ3syYLexgf29kNUCBZY6W2EmPE4+GoxnbawWSMrx1IT5ID19PdnS6mZe+uW26OwLXO2M1YKZ8UmXX2B21mxTHSVGjZ9MxCbpfuKYChw+vyszCJFx9HfTRbbEpyQZC92FEuA+5UzThZEd23fXKaNoVZLd0Znz2qrlScSLz52h1FtcHI5vwq2uh7Wpfowb0UB50Cv9OiXY0GmfXXTnxkWGAZ1NYEv+H/6iaQFAO9Sgiajs4ZOUom3rOURQMtzgJ7if651WVUL8W1QgITI6JLyA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7929a272-c5f7-44aa-69ef-08dd568fa87c X-MS-Exchange-CrossTenant-AuthSource: CH3PR84MB3424.NAMPRD84.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Feb 2025 18:01:56.6698 (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: SA1PR84MB3382 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 * guix/build-system/emacs.scm (emacs-build): Pass '#:allowed-references' and '#:disallowed-references' keys to builder. Change-Id: Ib9a35a7b2115365b96675fb7ca3914b0ae7e67c7 Reviewed-by: Maxim Cournoyer --- oops. Forgot to add this one to the series. Going to sneek this in here guix/build-system/emacs.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) base-commit: 61428ccf41f21f5ea1e4f1eec722ef9b1efc3a0e prerequisite-patch-id: c2ff0e5fe8ce40e8881779f771c56fee374bb48d prerequisite-patch-id: 52a44595bd17d655afce51a485b930c44b4ff772 prerequisite-patch-id: c88c4e03afc4fdfb112a40f356bc97db80fb06b0 prerequisite-patch-id: cef5c8dde54b1d3790e6f84fdeafde5a9d8e619b diff --git a/guix/build-system/emacs.scm b/guix/build-system/emacs.scm index 03273d738b..06eec43ec4 100644 --- a/guix/build-system/emacs.scm +++ b/guix/build-system/emacs.scm @@ -95,7 +95,9 @@ (define* (emacs-build name inputs (imported-modules %emacs-build-system-modules) (modules '((guix build emacs-build-system) (guix build utils) - (guix build emacs-utils)))) + (guix build emacs-utils))) + allowed-references + disallowed-references) "Build SOURCE using EMACS, and with INPUTS." (define builder (with-imported-modules imported-modules @@ -120,6 +122,8 @@ (define* (emacs-build name inputs system #:graft? #f))) (gexp->derivation name builder #:system system + #:allowed-references allowed-references + #:disallowed-references disallowed-references #:guile-for-build guile))) (define emacs-build-system