From patchwork Tue Jan 2 19:39:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 58332 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 1840C27BBE2; Tue, 2 Jan 2024 19:41:38 +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 20F5D27BBEC for ; Tue, 2 Jan 2024 19:41:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rKkdK-0006T5-OT; Tue, 02 Jan 2024 14:41:02 -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 1rKkdJ-0006SU-3d for guix-patches@gnu.org; Tue, 02 Jan 2024 14:41:01 -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 1rKkdI-0006f7-Rc for guix-patches@gnu.org; Tue, 02 Jan 2024 14:41:00 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rKkdL-0001ki-0V; Tue, 02 Jan 2024 14:41:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68180] [PATCH v3 1/4] gnu: emacs: Patch awk, find, sed and sh commands. 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: Tue, 02 Jan 2024 19:41: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.17042244276642 (code B ref 68180); Tue, 02 Jan 2024 19:41:02 +0000 Received: (at 68180) by debbugs.gnu.org; 2 Jan 2024 19:40:27 +0000 Received: from localhost ([127.0.0.1]:51309 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKkck-0001j3-F3 for submit@debbugs.gnu.org; Tue, 02 Jan 2024 14:40:26 -0500 Received: from mail-qt1-x833.google.com ([2607:f8b0:4864:20::833]:55731) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKkci-0001ic-Fz for 68180@debbugs.gnu.org; Tue, 02 Jan 2024 14:40:25 -0500 Received: by mail-qt1-x833.google.com with SMTP id d75a77b69052e-4283665650dso103911cf.3 for <68180@debbugs.gnu.org>; Tue, 02 Jan 2024 11:40:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704224416; x=1704829216; 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=oUKlSH6c18dJHO2zp1jgPuz295eCQNmHtK1sLLI9zIc=; b=XD8QmT82/TmhMChJrjr9tVHI5ggcUyC67quqT3t2fSRKjF0yyYjOIVe+VeLE3NIrf+ gT1H9/Dx48PIdJXu9lACzDfiOIvMWXQCUl2+XH8p6HnBEiWuFVuKsVrmbdj+uyDbEhvE G9kAgMBFaeTF10aNYE1M5mH2IjNwLKmCYX589/Vff9oHLvqU3kL/3rRW9O+f24eUOxK7 Jx3ubpKHxqNKDtZag29cyoXxACjHaq0XcMNOdwQs3po5xtZkpkbnkjfSGHRGrTuMSFwr R4aUUd2PStPMqqmOcy3TQmyWc4pcqe+B4RjWMd99Qx/L9VAvfMh+OrERTwZRObyZVAHC ZIvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704224416; x=1704829216; 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=oUKlSH6c18dJHO2zp1jgPuz295eCQNmHtK1sLLI9zIc=; b=aWHqUXNON8tAQ80RyF7phxBEUrlLdiTp/+zLhthh9mmjGG2RrSWvdwmqlB+1I8P1dQ ftRGq8bBC8zuzgIzQyR2y8fNzgNzpwLfdmbahlp5Srwl7+/9DU9xJjGteO4jtDP+nrYw jEZyMk34btbKq6rtcI2hwnUEZ7ooFyKCtaG/j2Np6w/C5+eg6jBM7wJ6rJHDLmF5pKw/ K8/BAXk4gCKMMGzZCgX+5Ueq9me21Nl8PTWsK8KRftpNaC3a548mAR8bMcaL3Plv0I7m qhrLSzkpTxCexLII6WLdsz1M5Bk5NAKKWq9ISJsorYq7AW/8WC1mu7lV7c4txBJp8dB+ 1S8g== X-Gm-Message-State: AOJu0YzqYA7E+lDTuy3CgTTfg82Jm+EgAgz24fgj3CuBhNp4RptUtGN5 NYSJUcTrE3zZk61VutJsL00Z2NP8hGc= X-Google-Smtp-Source: AGHT+IEqVxsQL97thTf6mLsVUSJNuBOiuvJ2uK4/8xmHaxjUOb4VuhWk8MKLIdoPj/2fQOgh+wRo4w== X-Received: by 2002:a05:622a:302:b0:428:3266:1616 with SMTP id q2-20020a05622a030200b0042832661616mr1101695qtw.129.1704224415924; Tue, 02 Jan 2024 11:40:15 -0800 (PST) Received: from localhost.localdomain (dsl-10-132-1.b2b2c.ca. [72.10.132.1]) by smtp.gmail.com with ESMTPSA id ge7-20020a05622a5c8700b0042836231a8asm100107qtb.45.2024.01.02.11.40.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jan 2024 11:40:15 -0800 (PST) From: Maxim Cournoyer Date: Tue, 2 Jan 2024 14:39:25 -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. * gnu/packages/emacs.scm (emacs-minimal) [arguments]: Extend the patch-program-file-names phase. [inputs]: Add findutils, gawk and sed. Change-Id: Ifb4fe2fc12ddc9eae387adb3da3f7821fab78e65 --- (no changes since v2) Changes in v2: - Patch references in place instead of wrapping via PATH gnu/packages/emacs.scm | 56 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index b9d9e2b891..3e8de3c2e0 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, 2024 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) @@ -157,13 +158,60 @@ (define-public emacs-minimal (delete-file "configure")))) (add-after 'unpack 'patch-program-file-names (lambda* (#:key inputs #:allow-other-keys) + ;; Substitute "sh" command. (substitute* '("src/callproc.c" "lisp/term.el" "lisp/htmlfontify.el" + "lisp/mail/feedmail.el" + "lisp/obsolete/pgg-pgp.el" + "lisp/obsolete/pgg-pgp5.el" + "lisp/obsolete/terminal.el" + "lisp/org/ob-eval.el" "lisp/textmodes/artist.el" - "lisp/progmodes/sh-script.el") + "lisp/progmodes/sh-script.el" + "lisp/textmodes/artist.el" + "lisp/htmlfontify.el" + "lisp/term.el") (("\"/bin/sh\"") - (format #f "~s" (search-input-file inputs "/bin/sh")))) + (format #f "~s" (search-input-file inputs "bin/sh")))) + (substitute* '("lisp/gnus/mm-uu.el" + "lisp/gnus/nnrss.el" + "lisp/mail/blessmail.el") + (("\"#!/bin/sh\\\n\"") + (format #f "\"#!~a~%\"" (search-input-file inputs "bin/sh")))) + (substitute* '("lisp/jka-compr.el" + "lisp/man.el") + (("\"sh\"") + (format #f "~s" (search-input-file inputs "bin/sh")))) + + ;; Substitute "awk" command. + (substitute* '("lisp/gnus/nnspool.el" + "lisp/org/ob-awk.el" + "lisp/man.el") + (("\"awk\"") + (format #f "~s" (search-input-file inputs "bin/awk")))) + + ;; Substitute "find" command. + (substitute* '("lisp/gnus/gnus-search.el" + "lisp/obsolete/nnir.el" + "lisp/progmodes/executable.el" + "lisp/progmodes/grep.el" + "lisp/filecache.el" + "lisp/ldefs-boot.el" + "lisp/mpc.el") + (("\"find\"") + (format #f "~s" (search-input-file inputs "bin/find")))) + + ;; Substitute "sed" command. + (substitute* "lisp/org/ob-sed.el" + (("org-babel-sed-command \"sed\"") + (format #f "org-babel-sed-command ~s" + (search-input-file inputs "bin/sed")))) + (substitute* "lisp/man.el" + (("Man-sed-command \"sed\"") + (format #f "Man-sed-command ~s" + (search-input-file inputs "bin/sed")))) + (substitute* "lisp/doc-view.el" (("\"(gs|dvipdf|ps2pdf|pdftotext)\"" all what) (let ((replacement (false-if-exception @@ -254,7 +302,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 Tue Jan 2 19:39:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 58331 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 9A6BA27BBE2; Tue, 2 Jan 2024 19:41:37 +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=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 11B7627BBEB for ; Tue, 2 Jan 2024 19:41:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rKkdL-0006TC-G6; Tue, 02 Jan 2024 14:41:03 -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 1rKkdJ-0006Sj-LW for guix-patches@gnu.org; Tue, 02 Jan 2024 14:41:01 -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 1rKkdJ-0006fC-Bo for guix-patches@gnu.org; Tue, 02 Jan 2024 14:41:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rKkdL-0001kt-GN for guix-patches@gnu.org; Tue, 02 Jan 2024 14:41:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68180] [PATCH v3 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: Tue, 02 Jan 2024 19:41: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.17042244296661 (code B ref 68180); Tue, 02 Jan 2024 19:41:03 +0000 Received: (at 68180) by debbugs.gnu.org; 2 Jan 2024 19:40:29 +0000 Received: from localhost ([127.0.0.1]:51313 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKkcn-0001jI-0N for submit@debbugs.gnu.org; Tue, 02 Jan 2024 14:40:29 -0500 Received: from mail-qt1-x834.google.com ([2607:f8b0:4864:20::834]:49531) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKkck-0001if-E2 for 68180@debbugs.gnu.org; Tue, 02 Jan 2024 14:40:27 -0500 Received: by mail-qt1-x834.google.com with SMTP id d75a77b69052e-428303fd709so3758351cf.3 for <68180@debbugs.gnu.org>; Tue, 02 Jan 2024 11:40:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704224418; x=1704829218; 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=q37K8S71k8w6zW57Q5QTxKxNd4aJ8YjY780UOruz9KM=; b=Q+cXEuvd/oEkNmHJnoKJ8UZYNzEeA5gxCCamNf3qYNBLY9ud6MfgKBQ0JWpk3L417A 9YuXO1BFGGz62QZw1a/DhGYXPH6bLlzo81biDwbV8hoMXYSfw5ctcMDNcn2zETAhqS34 RBciH1rt25pe05ySt9pPZfpYZLzPkd+4EG/OwNabDtzPPsnm0rhgVsF3IndvKGrm48cu HCxJUs5cYQqzZXJXu/jwp4i5+bh0vkCaczS1Ct3G0Abln65NnceteSash7Vgx7HqetjY 5cjmTAg0aiOPNfEpVDFc7Ds62s6d1+Ycw57LLu1cLxe3bZ2f5I+53PWEeuYwM2GEEyxh m8Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704224418; x=1704829218; 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=q37K8S71k8w6zW57Q5QTxKxNd4aJ8YjY780UOruz9KM=; b=Gw0w19UEv6Iqk8nGIIqhYuXSi96VRlX7S3Op1P3UyX2vUSNdyPGipIlJs1dg7pBG9p m7bqtllEZzTY8UvsKbiSEe8BGdbxFH5LujFDDfMpuv3fhj4PHzrtsEboWoM2Te/ubpoh 3TDkkayT2widv3s9r2rgkUBXgltoHGA/vcoUICP8x16gJgmZBDBtKQKPbk604fpgjffq gIWO8IVJj3sjIX2CXXJwsT4704F4aI4C5bvIW1mYvb763Pkd/muTT/bHbMH6Z+snS/9v 9vvNswxaVhbIfstj+9O7SOHKwoJVkv+71T3jSiozdONCoJKQoiUSp49cqQqurnc+6/cX ueHQ== X-Gm-Message-State: AOJu0YzG1kO0hVVLPppEhyPgK0upQbKMxe1b5fDmvVi/aToe7iZPnR7E yFuzVVuehXgMctFCxBa7390KibjJcsU= X-Google-Smtp-Source: AGHT+IFee0STiqOJMAnrdPfMCI6YvugMA/6CnPleT2Rs104qiEGlrFJBUqMz6vjU5QLQAhhEgxby3g== X-Received: by 2002:ac8:4e4e:0:b0:427:8e77:93e3 with SMTP id e14-20020ac84e4e000000b004278e7793e3mr24094422qtw.1.1704224418009; Tue, 02 Jan 2024 11:40:18 -0800 (PST) Received: from localhost.localdomain (dsl-10-132-1.b2b2c.ca. [72.10.132.1]) by smtp.gmail.com with ESMTPSA id ge7-20020a05622a5c8700b0042836231a8asm100107qtb.45.2024.01.02.11.40.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jan 2024 11:40:17 -0800 (PST) From: Maxim Cournoyer Date: Tue, 2 Jan 2024 14:39:26 -0500 Message-ID: <6fe0360f80dafc9844cd2df6786603d30fdb3bf1.1704224367.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 --- (no changes since v1) 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 Tue Jan 2 19:39:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 58330 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 0EB2727BBE2; Tue, 2 Jan 2024 19:41: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=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 F1F5E27BBE9 for ; Tue, 2 Jan 2024 19:41:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rKkdL-0006T9-28; Tue, 02 Jan 2024 14:41:03 -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 1rKkdJ-0006Sl-Po for guix-patches@gnu.org; Tue, 02 Jan 2024 14:41:01 -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 1rKkdJ-0006fK-Gz for guix-patches@gnu.org; Tue, 02 Jan 2024 14:41:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rKkdM-0001l2-1k for guix-patches@gnu.org; Tue, 02 Jan 2024 14:41:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68180] [PATCH v3 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: Tue, 02 Jan 2024 19:41: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.17042244306669 (code B ref 68180); Tue, 02 Jan 2024 19:41:04 +0000 Received: (at 68180) by debbugs.gnu.org; 2 Jan 2024 19:40:30 +0000 Received: from localhost ([127.0.0.1]:51315 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKkco-0001jV-CI for submit@debbugs.gnu.org; Tue, 02 Jan 2024 14:40:30 -0500 Received: from mail-qt1-x829.google.com ([2607:f8b0:4864:20::829]:48332) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKkcm-0001in-GM for 68180@debbugs.gnu.org; Tue, 02 Jan 2024 14:40:29 -0500 Received: by mail-qt1-x829.google.com with SMTP id d75a77b69052e-4280de11cf8so16252761cf.0 for <68180@debbugs.gnu.org>; Tue, 02 Jan 2024 11:40:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704224420; x=1704829220; 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=puau0HJL5ctfTTdaC+bkP6RR1nGqQE3YIRZx7lWUitM=; b=mX7mY5LVi9y3ry458UsFe3Ck5W55N3N/Z+l0w/q9E+PsCo5M+U9P1NP5q9hHBJ9lSy iOL8e4FpQ8BdDfHRRUQoVp9whIvHhNmTU8RTBuSZUfRu7iDNiTI4H5aI+Zk+ViQytA19 V4e484yH34oBSb7NSxLNWKbSfnFSGqfUkfQinTM521tTJ9GaGmEFMkSCWbU8ADXi+SzK sAvmcAOoiNSwo3QqRG2r14g2/k4uCmdSKNg7LuoOH8YJI+xu6xcox7uGBT1cdgobbco2 Dhzml6zhsKtoBX1hIPuWIrpLaj2yt5/b/WW8j5FVfVwKPruLjOEaUWPy2FJc7xLBg35g 56Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704224420; x=1704829220; 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=puau0HJL5ctfTTdaC+bkP6RR1nGqQE3YIRZx7lWUitM=; b=GsJHui0m0GMRM3WcgiAaCW5K5rpWVCVrahhaek0oNRLmWwEbogkcCa2b2cXMp91efN OS68omLAkUfXXt1ZRfAl+pm8jnAIH6FXYpA7tkfap9w/EI1EaweWjBNKqu736d9vYWbG qIFOcG6KuM6Swenl+EX/lNur7AmpJaGKC79dga5i8F99TRrk+3Ghq4ONfpbuQawEWzYo mQRPxqxbk+LJ6E9TbnEXDU20DnU+le/BjPBI9LOfiMP897AwTT6GikimxeKFCiHgVOVN 07oHS20P5+/kMMKoHQ6XYEHzkJ7wa0yeh/FI8RQFfX2BiYwlA36tX6WpIAqEuxzCQT6z 60cg== X-Gm-Message-State: AOJu0YyU83nM5zsHO1Pr3+kzCrZ3UXvTHWvjq/+Po50dFHD7fkCryoIB pnBRB2LysmRzkwbDOlDgIvCSZ0LW/t8= X-Google-Smtp-Source: AGHT+IG+fN6M0P4ItI9vICpnk+IfN61qkbQ7aLh1vXLwVcq/Eisf/9D49rN4SSbtB6TQpkQFQwbo6A== X-Received: by 2002:ac8:5742:0:b0:428:32c0:85c0 with SMTP id 2-20020ac85742000000b0042832c085c0mr940045qtx.23.1704224420217; Tue, 02 Jan 2024 11:40:20 -0800 (PST) Received: from localhost.localdomain (dsl-10-132-1.b2b2c.ca. [72.10.132.1]) by smtp.gmail.com with ESMTPSA id ge7-20020a05622a5c8700b0042836231a8asm100107qtb.45.2024.01.02.11.40.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jan 2024 11:40:19 -0800 (PST) From: Maxim Cournoyer Date: Tue, 2 Jan 2024 14:39:27 -0500 Message-ID: <3f28067b28f45f2bd8ca5a1b471237c168e8ad89.1704224367.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/perl.scm (perl-b-keywords): Update to 1.26. Change-Id: I3fdb9acf9f257ff9583179e29b2e6a26104b7e0d --- (no changes since v1) 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 Tue Jan 2 19:39:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 58329 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 BCB8527BBEA; Tue, 2 Jan 2024 19:41:17 +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 728A027BBE2 for ; Tue, 2 Jan 2024 19:41:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rKkdM-0006TD-C1; Tue, 02 Jan 2024 14:41:04 -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 1rKkdK-0006T0-Hc for guix-patches@gnu.org; Tue, 02 Jan 2024 14:41: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 1rKkdK-0006fU-11 for guix-patches@gnu.org; Tue, 02 Jan 2024 14:41:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rKkdM-0001lB-HP; Tue, 02 Jan 2024 14:41:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68180] [PATCH v3 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: Tue, 02 Jan 2024 19:41: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 , 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.17042244336684 (code B ref 68180); Tue, 02 Jan 2024 19:41:04 +0000 Received: (at 68180) by debbugs.gnu.org; 2 Jan 2024 19:40:33 +0000 Received: from localhost ([127.0.0.1]:51318 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKkcq-0001jk-N0 for submit@debbugs.gnu.org; Tue, 02 Jan 2024 14:40:33 -0500 Received: from mail-qt1-x82a.google.com ([2607:f8b0:4864:20::82a]:48333) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKkco-0001iw-K7 for 68180@debbugs.gnu.org; Tue, 02 Jan 2024 14:40:31 -0500 Received: by mail-qt1-x82a.google.com with SMTP id d75a77b69052e-4280de11cf8so16252851cf.0 for <68180@debbugs.gnu.org>; Tue, 02 Jan 2024 11:40:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704224422; x=1704829222; 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=jX2wUaox2eT/TDQ1k55Sm6o2pPoqLAwzbNMVLfUfLok=; b=HA85m3JO/g+/XGten/V7PaLAsFpayui6lJjwBdrmtH+MKBU8iTmX5XsiqWLnn6cQ7S scNCs1NIMJmlsZNYrRaRZjKXPay7tR8ZrybgUk6hfCB5k0CVALLQFPwQaogETugXPN0X 83k28OVXO87bU+fah3NCdi8U88PsHNSb/ZeiA+OGkns0JbYpke8ZHQztZ+mtBzESuJz1 SOWpNgk0QAueVw6qU7TOEyWW503NqJ8dDEGlO3L4qD1nUE0MP8u/wSEW7NLjrFQSEQg6 LDS/lPepuhoF12EiJJ1sDNmJ5NOb5f1y+M4scCF6FdwnTxZ5FWF2odJrIJD4ZMUwogxl evPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704224422; x=1704829222; 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=jX2wUaox2eT/TDQ1k55Sm6o2pPoqLAwzbNMVLfUfLok=; b=vdKpo765y0eTL06sLx/zWgFp8odmIb0R05t9NlLl00TSG3EgD3EJ4qpLv/LWErqFtd f56S51vB+qi6ai9XTZ+bZjvbXALel73ZQChhMgGImrKJz792h8e5VNw2RDRZcTvwlIPx 7GmZvjcrUepJ1qtpyTlOicLC6SDIu01id288Y3JnWLshoW5jhalRGYHEH0c5vroZpVuc BUqzXDLnye4X7A1lZDg3SRu7yk56ZnqoFMQ85zox9Kbm9pTnrbmR1Oyvep2aHy3Cmef0 hPSwQmEHO+3pWokYSDauE6XejbkpAu3sUJv8BY7wyXyAIOssQagy7pdlTR9Mf08fw5Kf EAsQ== X-Gm-Message-State: AOJu0Yw6nD6E+CcmSLFpK62Ra50s6zYCc9rMXc2/OHMJRVGjZ0yKwT4U 0flFpN+8ZvD+nx16vMvQmCPfGp14iRY= X-Google-Smtp-Source: AGHT+IGqtPrYS4DNB5K6PKSip/I18YLtdaVXVicwkot2qo5ByCLmZVKMa445p+BAy8CFdCmWBakrjQ== X-Received: by 2002:a05:622a:1715:b0:427:a2f7:43b8 with SMTP id h21-20020a05622a171500b00427a2f743b8mr23401692qtk.47.1704224422123; Tue, 02 Jan 2024 11:40:22 -0800 (PST) Received: from localhost.localdomain (dsl-10-132-1.b2b2c.ca. [72.10.132.1]) by smtp.gmail.com with ESMTPSA id ge7-20020a05622a5c8700b0042836231a8asm100107qtb.45.2024.01.02.11.40.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jan 2024 11:40:21 -0800 (PST) From: Maxim Cournoyer Date: Tue, 2 Jan 2024 14:39:28 -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/emacs-xyz.scm (emacs-pde): New variable. Change-Id: Icab5d8acf9d441bb4a832a82e75432d64cc77ba7 --- Changes in v3: - Use with-directory-excursion and for-each to make files writable 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 ad02b91c56..67a690b072 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) @@ -12269,6 +12271,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) + (with-directory-excursion "lisp" + (for-each make-file-writable + '("pde-vars.el" "perlcritic.el" "perldoc.el" + "perltidy.el")) + (emacs-substitute-variables "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"))) + (emacs-substitute-variables "perlcritic.el" + ("perlcritic-program" + (search-input-file inputs "bin/perlcritic"))) + (emacs-substitute-variables "perldoc.el" + ("perldoc-cache-el" + "(expand-file-name \"~/.cache/perldoc-cache.el\"") + ("perldoc-pod2man" + (search-input-file inputs "bin/pod2man"))) + (emacs-substitute-variables "perltidy.el" + ("perltidy-program" + (search-input-file inputs "bin/perltidy"))) + (substitute* "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")