From patchwork Sun Dec 31 16:59:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 58266 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 946AD27BBE9; Sun, 31 Dec 2023 17:01:34 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 C8DA427BBE2 for ; Sun, 31 Dec 2023 17:01:32 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJzAT-0001IE-Ig; Sun, 31 Dec 2023 12:00:05 -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 1rJzAQ-0001HV-H4 for guix-patches@gnu.org; Sun, 31 Dec 2023 12:00:02 -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 1rJzAQ-0005Ck-6e for guix-patches@gnu.org; Sun, 31 Dec 2023 12:00:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJzAQ-0000V7-Tl; Sun, 31 Dec 2023 12:00:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68180] [PATCH 1/4] gnu: emacs: Add awk, find, sed and sh to PATH wrapper. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 31 Dec 2023 17:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68180 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68180@debbugs.gnu.org Cc: Maxim Cournoyer , Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-Xcc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by 68180-submit@debbugs.gnu.org id=B68180.17040419841834 (code B ref 68180); Sun, 31 Dec 2023 17:00:02 +0000 Received: (at 68180) by debbugs.gnu.org; 31 Dec 2023 16:59:44 +0000 Received: from localhost ([127.0.0.1]:46958 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJzA8-0000TR-6x for submit@debbugs.gnu.org; Sun, 31 Dec 2023 11:59:44 -0500 Received: from mail-qv1-xf34.google.com ([2607:f8b0:4864:20::f34]:45209) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJzA5-0000TB-Up for 68180@debbugs.gnu.org; Sun, 31 Dec 2023 11:59:42 -0500 Received: by mail-qv1-xf34.google.com with SMTP id 6a1803df08f44-67f8d9fe99fso64062466d6.2 for <68180@debbugs.gnu.org>; Sun, 31 Dec 2023 08:59:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704041975; x=1704646775; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dAN0drCmaN/D4cfuawsBPKwMOxpOynhCpakag9gUIWg=; b=k/n0MMBiDEW5xMewLRa5hmfBONS/Ehu685/rnv25RlJMLbkoFkKVBplyhKm0y/RXy6 iN2D0SL1XnkDfmhp5XkJTKyMD/rsVQZobA6jB38volR9NJF8cYI0kyvzwgyWevL5ijeS 1TYZY3g1GpaTGruSQGg/a1qTavkaqhMfk77Qb2Gf2FFpPZGS6NFqoWiyF+li5U9dlmT7 89bozjayHcIvlJG0m0FaKB2tru4Mi5GIRmGsv5T8ltmGhwkRi86Oaq572NLzm6FIBDQI +LZ1cSIt4/jxJPdR/Dg+qpNH5lHTlL2Z89+KIP0qYdG6Ntsl2mUBLOlG33Qx1oVN6yDp LD2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704041975; x=1704646775; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dAN0drCmaN/D4cfuawsBPKwMOxpOynhCpakag9gUIWg=; b=bWD++4zySi/XIXpiwnPtjL5vRXnL6wzQvC+D22FFy9IgEpBmngBtf3EJC768v/qYi/ jxz73zmTMSjPGVX1Q8qeG2ixGDvfjes1fxCobJA/+KZtU3MgXQgplGJRQnGB0QxmLZXA KYcRASzSlRgFtTjyCcaASxh9pQGrOC7Pf6affqOZUacd/EQTa0PHKK+pQh1EWKq8kFBN 2Ufo4f9z+T7HFe1PhurnzkQR1W0kQZ4j+ouffDmRakoSq6DMRsp3d0dDpJiv+FP3Mxtu G2rOhWjLaitO6lSYfH+pyho2b0t3bd2nOT3e48pSBcY5t+8hwtgDChPqo0nI40HuknsP eeAw== X-Gm-Message-State: AOJu0Yx6wn5qbf/moGV7KUzQrPju0qEMZEuS699bz0ISTnEPndT30ptK uMg5wUhmQe5hf3xcQ4bSGXEjAppyXLM= X-Google-Smtp-Source: AGHT+IEKBLLv9+Du1Qjd7MZlGH6KbQzDQvBYzcGK47iuhFY78xOb5cpQfTTT+C456yd6GZSrim6SQw== X-Received: by 2002:a05:6214:226d:b0:67f:494b:c1f8 with SMTP id gs13-20020a056214226d00b0067f494bc1f8mr19971376qvb.32.1704041974722; Sun, 31 Dec 2023 08:59:34 -0800 (PST) Received: from localhost.localdomain (dsl-10-141-187.b2b2c.ca. [72.10.141.187]) by smtp.gmail.com with ESMTPSA id o8-20020a0cecc8000000b0067f37d9196esm8794075qvq.93.2023.12.31.08.59.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 08:59:34 -0800 (PST) From: Maxim Cournoyer Date: Sun, 31 Dec 2023 11:59:06 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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 Before this change, using Emacs in a pure environment, e.g. 'guix shell --pure emacs', would cause problems such as: jka-compr-insert-file-contents: Uncompression program ‘sh’ not found And other problems were found requiring the other tools. While the above could be patched in place for 'sh', it seems more robust and universally useful to have the commands appear on PATH, should other Elisp modules want to call to these directly as well. * gnu/packages/emacs.scm (emacs-minimal) [arguments] : Adjust the wrap-emacs-paths phase to wrap additional inputs. [inputs]: Add findutils, gawk and sed. (%emacs-modules): Add (srfi srfi-26). Change-Id: Ifb4fe2fc12ddc9eae387adb3da3f7821fab78e65 --- gnu/packages/emacs.scm | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index b9d9e2b891..85d40d01de 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2016 David Thompson ;;; Copyright © 2016 Nikita ;;; Copyright © 2017 Marius Bakke -;;; Copyright © 2017, 2019, 2020 Maxim Cournoyer +;;; Copyright © 2017, 2019, 2020, 2023 Maxim Cournoyer ;;; Copyright © 2017 Alex Vong ;;; Copyright © 2017, 2018 Ricardo Wurmus ;;; Copyright © 2017, 2023 Janneke Nieuwenhuizen @@ -59,6 +59,7 @@ (define-module (gnu packages emacs) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages fribidi) + #:use-module (gnu packages gawk) #:use-module (gnu packages gcc) #:use-module (gnu packages gd) #:use-module (gnu packages gettext) @@ -94,6 +95,7 @@ (define (%emacs-modules build-system) `((guix build ,(symbol-append which '-build-system)) (guix build utils) (srfi srfi-1) + (srfi srfi-26) (ice-9 ftw)))) (define-public emacs-minimal @@ -231,12 +233,17 @@ (define-public emacs-minimal (wrap-program prog ;; Some variants rely on uname being in PATH for Tramp. ;; Tramp paths can't be hardcoded, because they need to - ;; be portable. + ;; be portable. "sh", "find", "awk" and "sed" are also + ;; needed by common Elisp modules e.g., for reading + ;; documentation, so have them on PATH. `("PATH" suffix - ,(map dirname - (list (search-input-file inputs "/bin/gzip") - ;; for coreutils - (search-input-file inputs "/bin/yes")))) + ,(map (compose dirname (cut search-input-file inputs <>)) + (list "bin/awk" + "bin/find" ;findutils + "bin/gzip" + "bin/sed" + "bin/sh" ;bash + "bin/yes"))) ;coreutils `("EMACSLOADPATH" suffix ,lisp-dirs))) (find-files (string-append out "/bin") ;; Matches versioned and unversioned emacs binaries. @@ -254,7 +261,7 @@ (define-public emacs-minimal (copy-file (car (find-files "bin" "^emacs-([0-9]+\\.)+[0-9]+$")) "bin/emacs"))))))) - (inputs (list bash-minimal coreutils gzip ncurses)) + (inputs (list bash-minimal coreutils findutils gawk gzip ncurses sed)) (native-inputs (list autoconf pkg-config texinfo)) (home-page "https://www.gnu.org/software/emacs/") (synopsis "The extensible text editor (minimal build for byte-compilation)") From patchwork Sun Dec 31 16:59:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 58265 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 167C727BBE9; Sun, 31 Dec 2023 17:01:30 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C57A827BBEB for ; Sun, 31 Dec 2023 17:01:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJzAU-0001IJ-53; Sun, 31 Dec 2023 12:00:06 -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 1rJzAR-0001Hg-Nq for guix-patches@gnu.org; Sun, 31 Dec 2023 12:00:04 -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 1rJzAQ-0005DX-J6 for guix-patches@gnu.org; Sun, 31 Dec 2023 12:00:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJzAR-0000Ww-PO for guix-patches@gnu.org; Sun, 31 Dec 2023 12:00:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68180] [PATCH 2/4] build: perl: Accept Gexps for #:module-build-flags. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Dec 2023 17:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68180 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68180@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 68180-submit@debbugs.gnu.org id=B68180.17040419901859 (code B ref 68180); Sun, 31 Dec 2023 17:00:03 +0000 Received: (at 68180) by debbugs.gnu.org; 31 Dec 2023 16:59:50 +0000 Received: from localhost ([127.0.0.1]:46962 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJzAD-0000Tu-Q4 for submit@debbugs.gnu.org; Sun, 31 Dec 2023 11:59:50 -0500 Received: from mail-qv1-xf31.google.com ([2607:f8b0:4864:20::f31]:55335) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJzA7-0000TE-VL for 68180@debbugs.gnu.org; Sun, 31 Dec 2023 11:59:44 -0500 Received: by mail-qv1-xf31.google.com with SMTP id 6a1803df08f44-67fdfed519dso50062466d6.2 for <68180@debbugs.gnu.org>; Sun, 31 Dec 2023 08:59:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704041977; x=1704646777; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rpZGOWEpMrF9oeBJAXfejMNtZZt1ubwi9t0hBCLECco=; b=ZTudWWnUJ/+zrtMwm7lITw5Q7oQ62l6k1o2LFhE8SL38KINnwCvNKhzluGpqpwcagb 3lXbfLSlgqtt4AQoodsypTJmpI6YlOSdhbnFHny7h5oMerMi+SGv4lByplcKHwv9wxIU IrObPzGWA7q0QaMHVRobqpLdUwGWM6WTcOQZaDO2nd9UVxhOJrnkdqBWr/Cc1rjZ2PxQ f0cUmznY0ktTo1dcSteJqU315qSKC+5uvH77wwPjpEN3zuK0ZgU7gTFhyAl2D0OR6Dgv mjLXIl0OU9RlB+OH8OrxLumx1G3E0ZWumNCaYCBoTBgUiMtX7Pr+zetiuAYu9TXQMkKM e40w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704041977; x=1704646777; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rpZGOWEpMrF9oeBJAXfejMNtZZt1ubwi9t0hBCLECco=; b=YfZ5PQddj8WWta2E49ybROYpDPnrQDuaqRG7Xgd6j7S0HhqGIk1p+WRIjIwcJu8qa1 popYraWHlBamwOUZNpm47k5fm4z9+a/jQEzsaNcYGIr/Q0yt8b4peUItBAoV1qih6BlJ eYmX1wVEzlUJ5qhqD1IJB6/8+/3ROiR4kwvw5z75FdiCZPV50MqSOYbwSSAA5HzR784G fFd2Fg6lToTTfQDf/hd4xczxkVwuneB0uqfJWdWP9V2q8Gb1u6GBqfyO2yb/aKmUhcwq 39jMdaynY6nLkD/ALka+lD+8fJYeiTWRmBzD34lH7qydRgmsilfU9JJiM28QVgAMoTQ/ d35A== X-Gm-Message-State: AOJu0YyQMpdkDdPnzU6vW8CI0OR7pRsNkvcdtKueegCf+wAvY1YjEDNm guheEyI5RKZjdHZLtw88nbhgL1am4dI= X-Google-Smtp-Source: AGHT+IHBqC+AAddXXjDOOW2jEuQe2YwAGVR6L1qoqkLUPO1sM9jUSLFERy7fmB+7mhO7yBsge2lZMg== X-Received: by 2002:ad4:5ca4:0:b0:67f:8902:9eae with SMTP id q4-20020ad45ca4000000b0067f89029eaemr28524256qvh.3.1704041976857; Sun, 31 Dec 2023 08:59:36 -0800 (PST) Received: from localhost.localdomain (dsl-10-141-187.b2b2c.ca. [72.10.141.187]) by smtp.gmail.com with ESMTPSA id o8-20020a0cecc8000000b0067f37d9196esm8794075qvq.93.2023.12.31.08.59.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 08:59:36 -0800 (PST) From: Maxim Cournoyer Date: Sun, 31 Dec 2023 11:59:07 -0500 Message-ID: <94f9da5abc6d836248af0a3e57f299cd7fda862f.1704041948.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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/perl.scm (perl-build) [module-build-flags]: Accept gexps. Change-Id: If1daa4d9a8cf97824b75f2113f4d7d83256463ce --- guix/build-system/perl.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guix/build-system/perl.scm b/guix/build-system/perl.scm index 7c6deb34bf..0d5493ab90 100644 --- a/guix/build-system/perl.scm +++ b/guix/build-system/perl.scm @@ -133,7 +133,9 @@ (define* (perl-build name inputs search-paths)) #:make-maker? #$make-maker? #:make-maker-flags #$make-maker-flags - #:module-build-flags #$(sexp->gexp module-build-flags) + #:module-build-flags #$(if (pair? module-build-flags) + (sexp->gexp module-build-flags) + module-build-flags) #:phases #$(if (pair? phases) (sexp->gexp phases) phases) From patchwork Sun Dec 31 16:59:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 58267 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 A41E827BBE9; Sun, 31 Dec 2023 17:02:36 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 8388427BBE2 for ; Sun, 31 Dec 2023 17:02:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJzAT-0001IG-PO; Sun, 31 Dec 2023 12:00:05 -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 1rJzAR-0001Hm-Qq for guix-patches@gnu.org; Sun, 31 Dec 2023 12:00:04 -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 1rJzAR-0005EL-D9 for guix-patches@gnu.org; Sun, 31 Dec 2023 12:00:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJzAS-0000Xg-CP for guix-patches@gnu.org; Sun, 31 Dec 2023 12:00:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68180] [PATCH 3/4] gnu: perl-b-keywords: Update to 1.26. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 31 Dec 2023 17:00:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68180 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68180@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 68180-submit@debbugs.gnu.org id=B68180.17040419901865 (code B ref 68180); Sun, 31 Dec 2023 17:00:04 +0000 Received: (at 68180) by debbugs.gnu.org; 31 Dec 2023 16:59:50 +0000 Received: from localhost ([127.0.0.1]:46964 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJzAE-0000Tw-3N for submit@debbugs.gnu.org; Sun, 31 Dec 2023 11:59:50 -0500 Received: from mail-qv1-xf34.google.com ([2607:f8b0:4864:20::f34]:46575) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJzAA-0000TI-TC for 68180@debbugs.gnu.org; Sun, 31 Dec 2023 11:59:47 -0500 Received: by mail-qv1-xf34.google.com with SMTP id 6a1803df08f44-6808c3938afso18319286d6.1 for <68180@debbugs.gnu.org>; Sun, 31 Dec 2023 08:59:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704041979; x=1704646779; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GxszJOpBB1D8Jl/mTVosy3EjVFshlhm27eZcREQ2zIA=; b=l+N3fr9s3DVVFt0AZTjQQOTqOK+R0hHNL73MXtEQAe/rR8bef6yNuEeWeUKW3ZfNSs 6MdmhLa6z9sFsFjRH6CWRAAqnWAlQ5PXGHYzrdffQmB4Pwmjl3zJGrFVr7Xz3uIQwZpc f7HfXoSYkAe0Fh6oeDb8l9QuKQ/4YfMSY8g2anl9mf21rCuOG9krjePVupe+eUZMdHtx MWnoNp+PMeCMo8ars5dMC3NhvjeKMtGiqkWYS/UfJhjIPBzS0GHGlhdac1Ydemv2c9T7 2DltgDcDBMxRkCtgYGNEl2pg/9Vq0kPqembBYPlupWiVDfJ5OI9kMYGGgn+oTmJfqaYm bTvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704041979; x=1704646779; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GxszJOpBB1D8Jl/mTVosy3EjVFshlhm27eZcREQ2zIA=; b=QWjk06PdCG5lre2tFVPf77o7I2io4SGR8SdsycBobkJupZM9ygoBYcLkqMl1vJ8Mec EsuldTknL2zhrUTOTCSyOAAXpEHwgC5Q19SJ1SxU5kcHHSkoGJiygos1KTJVpvnz0cFD 8P6a9CDC7Kzhs+1Y6vbXnl+1dO17v9fXHYVTb2K2+2tHs+CpilCiTzY2CIg5w6X6tx+u r0Bf5hznSsSHpmA2D8FLld/KqDPwMFi0BJ0K85P8OFgDKhEpOESGLywPEZ/CAcHwYiEw oKtbadenKVpVmROEIZbMXF7HzRPT0IhTM2LZmVLELzN0UF5LGG9R6QyVwmQpBfG2xcQ9 nrKw== X-Gm-Message-State: AOJu0YyJf1Kh1S/E8XgDvvBileAIRIQ7aET8m9aa7QrKhziGx8PqC9Nl VUOqPyEp8j3JRr8R8x0r9ZIkKV9ylwg= X-Google-Smtp-Source: AGHT+IFxMBZdCFQz0Q6Wvf2IMonNv7Ler4xONTJEhhPPZ8IPk0mxd14ip4S+121BJgD293YOlvTdvA== X-Received: by 2002:a05:6214:c6d:b0:680:b2c7:5f00 with SMTP id t13-20020a0562140c6d00b00680b2c75f00mr342911qvj.108.1704041979202; Sun, 31 Dec 2023 08:59:39 -0800 (PST) Received: from localhost.localdomain (dsl-10-141-187.b2b2c.ca. [72.10.141.187]) by smtp.gmail.com with ESMTPSA id o8-20020a0cecc8000000b0067f37d9196esm8794075qvq.93.2023.12.31.08.59.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 08:59:38 -0800 (PST) From: Maxim Cournoyer Date: Sun, 31 Dec 2023 11:59:08 -0500 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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/perl.scm (perl-b-keywords): Update to 1.26. Change-Id: I3fdb9acf9f257ff9583179e29b2e6a26104b7e0d --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 8b82c272fc..5b32d6ecec 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -927,14 +927,14 @@ (define-public perl-b-hooks-op-check (define-public perl-b-keywords (package (name "perl-b-keywords") - (version "1.22") + (version "1.26") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-" version ".tar.gz")) (sha256 - (base32 "0i2ksp0w9wv1qc22hrdl3k48cww64syhmv8zf6x0kgyd4081hr56")))) + (base32 "0d7dgbw3wdaqw8g7nl86q6gqfqsnzg2a9y47vpgb0zr65xfibaid")))) (build-system perl-build-system) (home-page "https://metacpan.org/release/B-Keywords") (synopsis "Lists of reserved barewords and symbol names") From patchwork Sun Dec 31 16:59:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 58264 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 8353627BBEC; Sun, 31 Dec 2023 17:01:29 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 5A57427BBE9 for ; Sun, 31 Dec 2023 17:01:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJzAU-0001IO-OT; Sun, 31 Dec 2023 12:00:06 -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 1rJzAS-0001Hp-Q5 for guix-patches@gnu.org; Sun, 31 Dec 2023 12:00:04 -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 1rJzAS-0005OT-Gd for guix-patches@gnu.org; Sun, 31 Dec 2023 12:00:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJzAT-0000Yr-2p; Sun, 31 Dec 2023 12:00:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68180] [PATCH 4/4] gnu: Add emacs-pde. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 31 Dec 2023 17:00:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68180 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68180@debbugs.gnu.org Cc: Maxim Cournoyer , Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-Xcc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by 68180-submit@debbugs.gnu.org id=B68180.17040420011889 (code B ref 68180); Sun, 31 Dec 2023 17:00:05 +0000 Received: (at 68180) by debbugs.gnu.org; 31 Dec 2023 17:00:01 +0000 Received: from localhost ([127.0.0.1]:46966 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJzAL-0000UG-Ek for submit@debbugs.gnu.org; Sun, 31 Dec 2023 12:00:01 -0500 Received: from mail-qv1-xf2b.google.com ([2607:f8b0:4864:20::f2b]:47607) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJzAC-0000TP-Ml for 68180@debbugs.gnu.org; Sun, 31 Dec 2023 11:59:49 -0500 Received: by mail-qv1-xf2b.google.com with SMTP id 6a1803df08f44-67f9f6ca479so62156216d6.3 for <68180@debbugs.gnu.org>; Sun, 31 Dec 2023 08:59:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704041982; x=1704646782; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RDC+UZt4KQKjKBcdkBjqTp3Ajjd4scf6zvCp7PmRwac=; b=AJ3iTuU315O+QFtE7eqRu4X0HIbsE5NScmf3Rv7/zEmsQsNydd+3ahZP/BNA8PWsPG NoL1zYP6nkExIT+ySfDddh6CSRDKqtcNB/mkybGfMfNl2qoZG1O6Tjb1OESJMhG1e8ys d0QouF4WDklhzdsKJUa9FB8V9Vk4RM28CU3EAGmMkKAQpzxDyOZdXV9hnwIsXPHk7081 NuP3H0k+mbrT6P9ovW3FtpO/yxO5RZo4+adCyzqOolM/iWs8udnR2XFMTbnTFWQJ+Qjz fgjQuuDJKee9iCSi9cry7KXmigTQtlD0ZSIXuuqWYPVtQZvNBsqQSS4xhW1AAf/EZV7H ZnIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704041982; x=1704646782; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RDC+UZt4KQKjKBcdkBjqTp3Ajjd4scf6zvCp7PmRwac=; b=WY8ih2XnoYG7D/9Q53Q8Y9W9+tDdT1jqrLJuKr1wwy7xwtO7Zrce99v1lVTnVxHRVk W2b7rGJq3YPZyOIevp5rRy7TTc37jCGcs7ePRaRHu4LIsDQJrBEuqdrWlD08x8ubPW9U MrEJh5occdp1eJexdVfIIZmGTwOabqlVAML6VzIdEF5SGgb8qAYfinDTesem4Abbeigg HJpItatThVmY018qfypO++zNVl5kNDzXDZQW7zSibawJMJ+tV7gkBTsh2gXKTP4E8iPB 5u3k/B3r+hFuo5Uilq0SHXB+joi2cpx6TNx9Jozuxk2T7U3KK+ngPqHzB4jYyYuHhO2o oahA== X-Gm-Message-State: AOJu0Yw+IWvTVXLBZ9Y/czJJennWfiimCZHDHxEIMHZ4Y8UPBueESit7 tD8mKb5XvNNEjPtRmTHfqmVVvaJ8XXc= X-Google-Smtp-Source: AGHT+IHEinRxmWyySeFWic0jXlUCU/NaX1jDTpam2CNpew5e69UU4dKgHo64e71lEzxE4WOOdRKM8g== X-Received: by 2002:a05:6214:8f1:b0:67f:adfa:c47 with SMTP id dr17-20020a05621408f100b0067fadfa0c47mr16435214qvb.120.1704041981677; Sun, 31 Dec 2023 08:59:41 -0800 (PST) Received: from localhost.localdomain (dsl-10-141-187.b2b2c.ca. [72.10.141.187]) by smtp.gmail.com with ESMTPSA id o8-20020a0cecc8000000b0067f37d9196esm8794075qvq.93.2023.12.31.08.59.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Dec 2023 08:59:41 -0800 (PST) From: Maxim Cournoyer Date: Sun, 31 Dec 2023 11:59:09 -0500 Message-ID: <888f19969113a9f9b734c7eb7c5172688c45c769.1704041948.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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/emacs-xyz.scm (emacs-pde): New variable. Change-Id: Icab5d8acf9d441bb4a832a82e75432d64cc77ba7 --- gnu/packages/emacs-xyz.scm | 86 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index a8ac238f58..fe46342adf 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -167,6 +167,7 @@ (define-module (gnu packages emacs-xyz) #:use-module (guix build-system cmake) #:use-module (guix build-system copy) #:use-module (guix build-system emacs) + #:use-module (guix build-system perl) #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages admin) @@ -271,6 +272,7 @@ (define-module (gnu packages emacs-xyz) #:use-module (gnu packages erlang) #:use-module (gnu packages statistics) #:use-module (gnu packages libcanberra) + #:use-module (gnu packages texinfo) #:use-module (gnu packages virtualization) #:use-module (gnu packages web-browsers) #:use-module (gnu packages wget) @@ -12271,6 +12273,90 @@ (define-public emacs-hl-todo regexp that matches all known keywords.") (license license:gpl3+))) +(define-public emacs-pde + (package + (name "emacs-pde") + (version "0.2.17") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://cpan/authors/id/Y/YE/YEWENBIN/Emacs-PDE-v" + version ".tar.gz")) + (modules '((guix build utils))) + (snippet '(begin + ;; Delete pre-generated Texinfo and HTML documentation. + (for-each delete-file '("lisp/doc/pde.info" + "lisp/doc/pde.html")) + (delete-file-recursively "lisp/doc/pde"))) + (sha256 + (base32 "1i82isha839c8lx73kgp43v7gxr2adsr1yfw1glyxvi62w5ab9qz")))) + (build-system perl-build-system) + (arguments + (list + #:imported-modules `(,@%emacs-build-system-modules + ,@%perl-build-system-modules) + #:modules '((guix build perl-build-system) + (guix build emacs-utils) + (guix build utils)) + #:module-build-flags + #~(list (string-append "--elispdir=" #$output + "/share/emacs/site-lisp/pde") + "--verbose") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-commands + (lambda* (#:key inputs #:allow-other-keys) + (make-file-writable "lisp/pde-vars.el") + (emacs-substitute-variables "lisp/pde-vars.el" + ("pde-perl-program" + (search-input-file inputs "bin/perl")) + ("pde-perl-version" + #$(package-version (this-package-input "perl"))) + ("pde-perldoc-program" + (search-input-file inputs "bin/perldoc")) + ("pde-find-program" + (search-input-file inputs "bin/find"))) + (make-file-writable "lisp/perlcritic.el") + (emacs-substitute-variables "lisp/perlcritic.el" + ("perlcritic-program" + (search-input-file inputs "bin/perlcritic"))) + (make-file-writable "lisp/perldoc.el") + (emacs-substitute-variables "lisp/perldoc.el" + ("perldoc-cache-el" + "(expand-file-name \"~/.cache/perldoc-cache.el\"") + ("perldoc-pod2man" + (search-input-file inputs "bin/pod2man"))) + (make-file-writable "lisp/perltidy.el") + (emacs-substitute-variables "lisp/perltidy.el" + ("perltidy-program" + (search-input-file inputs "bin/perltidy"))) + (substitute* "lisp/tools/perldoc-cache.pl" + (("`perldoc") + (string-append + "`" (search-input-file inputs "bin/perldoc")))))) + (add-after 'build 'generate-doc + (lambda _ + (invoke "./Build" "info"))) + (add-after 'install 'move-doc + (lambda _ + (let ((info (string-append #$output "/share/info/pde.info"))) + (mkdir-p (dirname info)) + (rename-file (string-append + #$output + "/share/emacs/site-lisp/pde/doc/pde.info") + info))))))) + (native-inputs (list emacs-minimal perl-module-build texinfo)) + (inputs (list findutils perl perl-critic)) + (home-page "https://metacpan.org/release/Emacs-PDE") + (synopsis "Perl Development Environment for Emacs") + (description "Emacs::PDE is a collection of Emacs Lisp extensions to +facilitate Perl programming. CPerl Mode has provided an excellent environment +for coding; Emacs::PDE provides other common tools such as creating files +using templates, smart compiling, @command{perldoc}, @command{perltidy}, +debugger, tags tree view and so on. PDE also provides an easy configuration +for Perl programing, and a tutorial for novices to start using Emacs.") + (license license:perl-license))) + (define-public emacs-perspective (package (name "emacs-perspective")