From patchwork Tue Jan 2 01:58:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 58301 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 1916927BBE9; Tue, 2 Jan 2024 02:02:31 +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 5660827BBE2 for ; Tue, 2 Jan 2024 02:02:29 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rKU4w-0000Fr-LN; Mon, 01 Jan 2024 21:00:29 -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 1rKU4X-00084Y-Kw for guix-patches@gnu.org; Mon, 01 Jan 2024 21: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 1rKU4X-0007If-CW for guix-patches@gnu.org; Mon, 01 Jan 2024 21:00:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rKU4Z-0008RS-Bl; Mon, 01 Jan 2024 21:00:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68180] [PATCH v2 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 02: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 , 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.170416077332256 (code B ref 68180); Tue, 02 Jan 2024 02:00:03 +0000 Received: (at 68180) by debbugs.gnu.org; 2 Jan 2024 01:59:33 +0000 Received: from localhost ([127.0.0.1]:49080 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKU3u-0008Nr-Ub for submit@debbugs.gnu.org; Mon, 01 Jan 2024 20:59:33 -0500 Received: from mail-qv1-xf35.google.com ([2607:f8b0:4864:20::f35]:43347) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKU3r-0008NI-DJ for 68180@debbugs.gnu.org; Mon, 01 Jan 2024 20:59:20 -0500 Received: by mail-qv1-xf35.google.com with SMTP id 6a1803df08f44-680b1335af6so7622366d6.1 for <68180@debbugs.gnu.org>; Mon, 01 Jan 2024 17:59:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704160751; x=1704765551; 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=X2x2Vhpo8C+bpXC85YpuvG6rRyLc0aYmqJOW+Ut1+g8=; b=h2x3Ag7uXn0kc9Z/yVTjtaJ+gjTMzYzvkNbib6C7chZ7ls6KKHadHFDfZzeC6YOsHw RQ0kPUyBSy6hC9QFQy5Q5kbxBZQrFCzuHRxRd3kDHYhUyX1qLHn3WgwwCpqdAh1YqrqS bkvYCJo+b/DVV15ZUKibiLsRegzG0k9spY97EXv12J0zYtq7H0/n/tpdCisI7LZQBfmb ROlR8P57FVU7Djm/PJfuf8kSLqyJi40V/CymO+dMryMaMU70LVGs2t9WLATAvIQyn0KG kxF91wTI5C39B3jN3S2RwJz4RiuGfDzDHG5j7f0MOwXw3i7cclUDUUGr3fuaz1X0kUTD JQQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704160751; x=1704765551; 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=X2x2Vhpo8C+bpXC85YpuvG6rRyLc0aYmqJOW+Ut1+g8=; b=dsbdOfcTm54QXQScKti0z7NdQ87FIcM1qTs/74ZiTQgktObqEStIviX5B01Io+0fO8 y2jYggiGhM1vgjUmQlGkiSgYMojeeHCEFAKn23loBA+uW4WbDIk+BeWcW78GGlVfhm3T SY39HCbYidy+Hbt+muXc3NYEQ0Ihfn6w1bcnxJ7iL4eMvt17r7Ff7dFSZVifCOIBfxcH ZrILh3WAyt7Tknqy7ePXLcmbiEIJJhnZYVVyLGhdEQR3fkK8j1UBwj36KfMYc5IxA3Xm DuTSdFhg7Dw5nMMqPyLv8jQisFfHRoOig053B8dRKrGDkcuEuCZEZNV0pjiZr7cAfRns P9WQ== X-Gm-Message-State: AOJu0YwY7ackw7IDUNwckLfSF4cWEIDc69EB9SHPEkFhDT48+HjslT5J 3AexH90+zd2OJNOt78ALXR5vD8byTUk= X-Google-Smtp-Source: AGHT+IFiyA6ujj38++BijXBx9Y04z8FVavlfpSQaQVNDA+XiqoqP/DASzVoYNLPs0Cz+hPkSLNBK4w== X-Received: by 2002:a05:6214:769:b0:67f:824b:99b3 with SMTP id f9-20020a056214076900b0067f824b99b3mr26911377qvz.38.1704160751391; Mon, 01 Jan 2024 17:59:11 -0800 (PST) Received: from localhost.localdomain (dsl-10-141-187.b2b2c.ca. [72.10.141.187]) by smtp.gmail.com with ESMTPSA id ec17-20020ad44e71000000b0067f90426698sm9082956qvb.23.2024.01.01.17.59.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jan 2024 17:59:11 -0800 (PST) From: Maxim Cournoyer Date: Mon, 1 Jan 2024 20:58:24 -0500 Message-ID: <5de95e91832b56eb05175e9022c77b57a266b373.1704160706.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 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 --- 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 01:58:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 58300 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 7ED6B27BBE9; Tue, 2 Jan 2024 02:02:26 +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 7ED3327BBE2 for ; Tue, 2 Jan 2024 02:02:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rKU5C-0000UY-PO; Mon, 01 Jan 2024 21:00:49 -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 1rKU4Y-00085D-6u for guix-patches@gnu.org; Mon, 01 Jan 2024 21: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 1rKU4X-0007J6-TU for guix-patches@gnu.org; Mon, 01 Jan 2024 21:00:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rKU4Z-0008SV-WC for guix-patches@gnu.org; Mon, 01 Jan 2024 21:00:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68180] [PATCH v2 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 02: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.170416077332263 (code B ref 68180); Tue, 02 Jan 2024 02:00:03 +0000 Received: (at 68180) by debbugs.gnu.org; 2 Jan 2024 01:59:33 +0000 Received: from localhost ([127.0.0.1]:49084 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKU45-0008OE-3S for submit@debbugs.gnu.org; Mon, 01 Jan 2024 20:59:33 -0500 Received: from mail-qk1-x72b.google.com ([2607:f8b0:4864:20::72b]:54642) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKU3t-0008NL-N3 for 68180@debbugs.gnu.org; Mon, 01 Jan 2024 20:59:22 -0500 Received: by mail-qk1-x72b.google.com with SMTP id af79cd13be357-781716c1291so374655585a.1 for <68180@debbugs.gnu.org>; Mon, 01 Jan 2024 17:59:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704160753; x=1704765553; 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=nVldo/xI6vAg0YNb0t5nPloeCUMMHKyWXV/W6O8S0NVWBYuSlncFiUdzT3GHXWHtho fKG7mRB6fGR1Y5UT6DCTgdYs0n4ZBiY3wNbUtUH8lZJ2tUHRgRgLf/ykBN3RXam4JcpJ 78eNU6mcL/8MXDBrGsuNvTUdW7EQPgSfEPBihrgngwiBaNeMJZYk6LqpxxwsbOnINAg8 7CzhaVgKoF6TKDNFVL7l1Gnv3VihSOQt1dzTBXlWyHUJK4Urnf2UvooClvLoJ37cgDkX PMeEjnSLU2oGUW7ZIDv3ij/ZS3i96alN5TMsFVClvtin6hXqCRlWagntHqL/1yBhNLfe SOhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704160753; x=1704765553; 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=tEXV7duHJHUv/EPxh+G+Wti+ur+XCYNwQWikcwSgP4o3OIegs1zwAmqyEVI3aszzo2 y5KwiHv+AGuNnFUAOy2I3UxQExJ7UfyWM6Yd2l5ZHcX/N0GqeoULjPnlLwaGno0rcvUB mdZVwayVtX/ZORfvHmp1gbDAIF47kTQxClCcfZcb7vBNkm4gzujL4/WabzsAi+JXQLTV NMZo/UD69/PW3mPlXYZ26hCXGaC71ucTi6jPJAA37BtswZa5j6Te/FyXqwUUKlrbAiJO g2hPyk894BrF806EiBd+FWfYxb7LnR3FpkMjYy2tCji9gNt9vZ3m3/Kp3I7Pb1oKsvsi nmOg== X-Gm-Message-State: AOJu0Yx3llBjuPeLRJpOAIqLWW9m6b2Cmsk2SnhleKddPEOIoUo2YRPq nnHFfGGCQ6cSz12KxCVYQHmROLARiAY= X-Google-Smtp-Source: AGHT+IEUgMJzhl0iMgZcWCVCUAkHRnnFM2qS5Sdexyuhm+vuAz/AHk28og0HwzbSoJyqtI8uTKTS5Q== X-Received: by 2002:a0c:d6c7:0:b0:67f:ff7a:1f6d with SMTP id l7-20020a0cd6c7000000b0067fff7a1f6dmr15783221qvi.80.1704160753157; Mon, 01 Jan 2024 17:59:13 -0800 (PST) Received: from localhost.localdomain (dsl-10-141-187.b2b2c.ca. [72.10.141.187]) by smtp.gmail.com with ESMTPSA id ec17-20020ad44e71000000b0067f90426698sm9082956qvb.23.2024.01.01.17.59.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jan 2024 17:59:12 -0800 (PST) From: Maxim Cournoyer Date: Mon, 1 Jan 2024 20:58:25 -0500 Message-ID: <88e21ca27f682c700f197dc6c097ae65c13fd775.1704160706.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 01:58: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: 58302 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 75E8227BBE9; Tue, 2 Jan 2024 02:02:53 +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 3017527BBE2 for ; Tue, 2 Jan 2024 02:02:53 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rKU5d-0000p1-IC; Mon, 01 Jan 2024 21:01:12 -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 1rKU4Y-00085T-RM for guix-patches@gnu.org; Mon, 01 Jan 2024 21:00:07 -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 1rKU4Y-0007Ja-Ha for guix-patches@gnu.org; Mon, 01 Jan 2024 21:00:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rKU4a-0008Te-KE for guix-patches@gnu.org; Mon, 01 Jan 2024 21:00:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68180] [PATCH v2 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 02: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.170416077332270 (code B ref 68180); Tue, 02 Jan 2024 02:00:04 +0000 Received: (at 68180) by debbugs.gnu.org; 2 Jan 2024 01:59:33 +0000 Received: from localhost ([127.0.0.1]:49086 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKU45-0008OK-DC for submit@debbugs.gnu.org; Mon, 01 Jan 2024 20:59:33 -0500 Received: from mail-qv1-xf35.google.com ([2607:f8b0:4864:20::f35]:47430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKU3v-0008NT-LQ for 68180@debbugs.gnu.org; Mon, 01 Jan 2024 20:59:24 -0500 Received: by mail-qv1-xf35.google.com with SMTP id 6a1803df08f44-67f9f6ca479so70799256d6.3 for <68180@debbugs.gnu.org>; Mon, 01 Jan 2024 17:59:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704160755; x=1704765555; 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=cr70d53Mcx9rZMfHt7956AreeEPo9x5Wil0QQWsCR8C98mtyFOl3D4MjNq8xxeonqi NplBOxEtOh4sil3X69GvoHxHXJTNgCLT06qYiFj1LYBsa1FA5cpyBW/Y1po0unKzyYp1 zArBJb7iCItoxLMV0uieIaHP0B/xjKcxKYvARKbeOEOBbK0fXVr6MMN3yu7ztN/GnZAV dPcYEA226OjDOzH1qJJdOl+avP0axSm+pxPf8KT56IdJ4sk5xitrHBNVrknNRGbDDS7B vypN2JETtq29hgzE77W7kx+o575/Gyugf6aiQ+5IIXLryTUVZx/tYAf0qazAktlEyWYb dnmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704160755; x=1704765555; 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=vdRMbvhOJ3+shmeCyUfMkuJ1eTpGXyONSXY7EG0yjC8gdFWKkNJBRuLUvfD5H2r/4D WBRLy1XEKTWnoVn0iXHxzOE+i3oAenJ6Yh1mf4a11gNLawCybc/LVjvgITCIEdo0E42z 27CXMn/DUwnmwzYhnM0ehsOI/XRtvHgXJnldsMd7Mi5aL3sBuVI1z+avkXSvTbUqg6dJ xES+CYYiKeownA+dlfClz68H2W4+maSNyK0ZQh6HgfmOTvJ8KIEGcPmXz5wJfecWrF13 0vtIH3O4+gsaCjZdad7OGXYgjUEj97+TByEQ9yXN9OVpuHQUvOc99g6Vs2hXRFJmgzNS H+Sw== X-Gm-Message-State: AOJu0YxLW40Tnz+vBli7x94fccfX3X9wbdNMGhBVaFBvXjgYVpsyRuJN OJfDvlnZOI1fTKHpXToVOWTpKTZUHcI= X-Google-Smtp-Source: AGHT+IEul45N33R59Zos7AxyGqCQzszYvBeed6swITiwhKNslfNpAK+LFw/tFBMSObm3xMIO3nCMEg== X-Received: by 2002:a05:6214:19e9:b0:680:c10c:ca7b with SMTP id q9-20020a05621419e900b00680c10cca7bmr624728qvc.37.1704160755737; Mon, 01 Jan 2024 17:59:15 -0800 (PST) Received: from localhost.localdomain (dsl-10-141-187.b2b2c.ca. [72.10.141.187]) by smtp.gmail.com with ESMTPSA id ec17-20020ad44e71000000b0067f90426698sm9082956qvb.23.2024.01.01.17.59.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jan 2024 17:59:15 -0800 (PST) From: Maxim Cournoyer Date: Mon, 1 Jan 2024 20:58:26 -0500 Message-ID: <33d7670f92964d14b773802e3204fcb5f15dedec.1704160706.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 01:58: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: 58303 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 5977C27BBE2; Tue, 2 Jan 2024 02:03:15 +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 089C127BBE9 for ; Tue, 2 Jan 2024 02:03:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rKU52-0000L1-6D; Mon, 01 Jan 2024 21:00:35 -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 1rKU4b-00085t-3a for guix-patches@gnu.org; Mon, 01 Jan 2024 21:00:08 -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 1rKU4Z-0007Lv-7Y for guix-patches@gnu.org; Mon, 01 Jan 2024 21:00:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rKU4b-0008Uq-9g; Mon, 01 Jan 2024 21:00:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68180] [PATCH v2 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 02: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.170416077432277 (code B ref 68180); Tue, 02 Jan 2024 02:00:05 +0000 Received: (at 68180) by debbugs.gnu.org; 2 Jan 2024 01:59:34 +0000 Received: from localhost ([127.0.0.1]:49088 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKU45-0008OR-NA for submit@debbugs.gnu.org; Mon, 01 Jan 2024 20:59:34 -0500 Received: from mail-qv1-xf2f.google.com ([2607:f8b0:4864:20::f2f]:54535) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rKU3x-0008Nd-Kp for 68180@debbugs.gnu.org; Mon, 01 Jan 2024 20:59:26 -0500 Received: by mail-qv1-xf2f.google.com with SMTP id 6a1803df08f44-680a06cc763so22002426d6.1 for <68180@debbugs.gnu.org>; Mon, 01 Jan 2024 17:59:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1704160757; x=1704765557; 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=Z/hn3ZjfA0I6UwvF4rW6x2v0aflAuULgQ2i35QfKJ54=; b=jrBUaR2LRXThfSJ4cfZvzBDtKR1JgIr0viBd3ZBO6zLSW659u2+L6ao7xZq8Ggioqz GZurl5HPlRUfRNk3Ww9LtTvz6e2IfKcCGiX0ajXglC87KaXqpm1jZZoYj5kFlazBujBH CunXd+JfNw6GkmfPdsMH8mzzYzzWN3yEHnPqY8KXT/zeYSYKBqf233ZRwof7YyONdCFD dpvsLcZqOYUVozVk9mb55xJvyIAxl8arWACkLDBNC9c7DNHSGpe9EarQG5sCL312GJu7 laGsxPYr2BXkpPa7d1S/GAEqP1vaTbUvKW/u4g5srNpoaFpUpNUHkR17e8oK55xG0v7w 5H1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704160757; x=1704765557; 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=Z/hn3ZjfA0I6UwvF4rW6x2v0aflAuULgQ2i35QfKJ54=; b=nGb6Z0Tx0GBwNy+OXYzDTSBGdpbN/iOKWBMjJUEsqGxPEF6BnB7WXoj7k3NN1txaIi fOBIeQxFkRFTznjj2WeeXCVqSOLqlb93FlUME5zHPYRyCbrTA0awo6mtSPUtVBy9m0hU /o+zdVccf6h1IXXRhj3ClxJW5vfIGlwyOMCjDBkXmIZFHTyhOMwOXzAPXiZjr7X+Ytnq pgJ1M5GJO4JXEZrDAA183auIg51wnU2MQ+rlhzqQdN3PgZFH+qn4LKFlAggdU+MNsT3B YWyxF+ts4vnBcrtlSZEsv97h6thPv+vKwpmbwMaga+nYNs+evVvYnIxdA+3O0y/L6tVq Q07w== X-Gm-Message-State: AOJu0Yxul0Y2U1VPdBGcvE9XjGbbD5T2PoLGPl1j1v2amFs/1KOaAvd7 uVTte6EN+DZMcYohvlAfsHMokNa3Bl8= X-Google-Smtp-Source: AGHT+IHciv/QvKQvezJvnW/4gfzMg3MrTNOzaXOIYNkOOVPAD1lvCzxdWE+bjRTcbCvaiutDu3Vnyg== X-Received: by 2002:a05:6214:20ad:b0:67a:a721:d779 with SMTP id 13-20020a05621420ad00b0067aa721d779mr23700045qvd.95.1704160757643; Mon, 01 Jan 2024 17:59:17 -0800 (PST) Received: from localhost.localdomain (dsl-10-141-187.b2b2c.ca. [72.10.141.187]) by smtp.gmail.com with ESMTPSA id ec17-20020ad44e71000000b0067f90426698sm9082956qvb.23.2024.01.01.17.59.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jan 2024 17:59:17 -0800 (PST) From: Maxim Cournoyer Date: Mon, 1 Jan 2024 20:58:27 -0500 Message-ID: <76e5781ad616a52b5590b1dd1c37fccf328cb04b.1704160707.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 --- (no changes since v1) 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")