From patchwork Sat Apr 17 17:06:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28607 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 4CE9D27BC78; Sat, 17 Apr 2021 18:08:43 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C7F7227BC79 for ; Sat, 17 Apr 2021 18:08:40 +0100 (BST) Received: from localhost ([::1]:55528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoQx-0000Tz-VA for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:08:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33674) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQO-0008Dx-6I for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32808) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQM-0000Cw-Hc for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQM-0005aP-AK for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 01/33] profiles: Add hook for Emacs subdirs. References: <20210408174616.13112-1-leo.prikler@student.tugraz.at> In-Reply-To: <20210408174616.13112-1-leo.prikler@student.tugraz.at> Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867923321111 (code B ref 47661); Sat, 17 Apr 2021 17:08:02 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:13 +0000 Received: from localhost ([127.0.0.1]:44285 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPY-0005UN-KF for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:12 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:50081) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPW-0005U7-Py for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:11 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzyg3Pqnz1LLyL for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:07:07 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzyg3Pqnz1LLyL DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679227; bh=J5bj57+Yt74u733Mf6T+Jaghn2u4TETbyXrzxPV4JCg=; h=From:To:Subject:Date:From; b=SJRPjJGHhWc5F6vmz1FFZCu9nBNuGlvRxV3sR2nXXwqUCfBsol2146B9lq+OqNCo8 yPJ7z6jy5Vxc5BorRZfiJXqzEOmtHv3K0vqwkbfibxr57V793vlr8MrUTnohip164G IvNjl+Q1Ygkk7TkF1Rrj1z7jFi62OAWRk0VGaR9M= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:16 +0200 Message-Id: <20210417170648.3810-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches * guix/profiles.scm (emacs-subdirs): New variable. (%default-profile-hooks): Add it here. * guix/status.scm (hook-message): Add a message for emacs-subdirs. --- guix/profiles.scm | 41 +++++++++++++++++++++++++++++++++++++++++ guix/status.scm | 2 ++ 2 files changed, 43 insertions(+) diff --git a/guix/profiles.scm b/guix/profiles.scm index 67d90532c1..26fe266a61 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -1115,6 +1115,46 @@ MANIFEST. Single-file bundles are required by programs such as Git and Lynx." `((type . profile-hook) (hook . ca-certificate-bundle)))) +(define (emacs-subdirs manifest) + (define build + (with-imported-modules (source-module-closure + '((guix build profiles) + (guix build utils))) + #~(begin + (use-modules (guix build utils) + (guix build profiles) + (ice-9 ftw) ; scandir + (srfi srfi-1) ; append-map + (srfi srfi-26)) + + (let ((destdir (string-append #$output "/share/emacs/site-lisp")) + (subdirs + (append-map + (lambda (dir) + (filter + file-is-directory? + (map (cute string-append dir "/" <>) + (scandir dir (negate (cute member <> '("." ".."))))))) + (filter file-exists? + (map (cute string-append <> "/share/emacs/site-lisp") + '#$(manifest-inputs manifest)))))) + (mkdir-p destdir) + (with-directory-excursion destdir + (call-with-output-file "subdirs.el" + (lambda (port) + (write + `(normal-top-level-add-to-load-path + (list ,@subdirs)) + port) + (newline port) + #t))))))) + (gexp->derivation "emacs-subdirs" build + #:local-build? #t + #:substitutable? #f + #:properties + `((type . profile-hook) + (hook . emacs-subdirs)))) + (define (glib-schemas manifest) "Return a derivation that unions all schemas from manifest entries and creates the Glib 'gschemas.compiled' file." @@ -1672,6 +1712,7 @@ MANIFEST." fonts-dir-file ghc-package-cache-file ca-certificate-bundle + emacs-subdirs glib-schemas gtk-icon-themes gtk-im-modules diff --git a/guix/status.scm b/guix/status.scm index 362ae2882c..2683678201 100644 --- a/guix/status.scm +++ b/guix/status.scm @@ -379,6 +379,8 @@ the current build phase." (G_ "building GHC package cache...")) ('ca-certificate-bundle (G_ "building CA certificate bundle...")) + ('emacs-subdirs + (G_ "listing Emacs subdirs...")) ('glib-schemas (G_ "generating GLib schema cache...")) ('gtk-icon-themes From patchwork Sat Apr 17 17:06:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28609 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 36E6427BC6C; Sat, 17 Apr 2021 18:08:44 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3F70127BC77 for ; Sat, 17 Apr 2021 18:08:41 +0100 (BST) Received: from localhost ([::1]:55560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoQy-0000VB-B5 for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:08:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33672) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQO-0008Dw-67 for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32809) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQM-0000DF-U0 for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQM-0005aY-Nd for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 02/33] gnu: emacs: Wrap EMACSLOADPATH. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867923621129 (code B ref 47661); Sat, 17 Apr 2021 17:08:02 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:16 +0000 Received: from localhost ([127.0.0.1]:44288 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPb-0005Ui-Ux for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:16 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:45503) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPX-0005UF-RJ for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:12 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzyj2HgPz1LBRw for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:07:09 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzyj2HgPz1LBRw DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679229; bh=rohbZmPPKSSwuzeiqghl2Zl84+0Rb3cswo+vBJqdj/8=; h=From:To:Subject:Date:In-Reply-To:References:From; b=eoIHDfOE40AEqN+Azu4MhmHrvxoWbl5sCMSJpJu9vBjUbrdLhUGgbtdMGXTjHP53u y+PMxLIyh98BnSzuB37B+4rbauwTYRlHP03hRGN5zOhOI1uMHmoQSoWXe+JrBK41/j ncN+3xR36gbwgbgKz8R2rh08/lySo/tzeVkPxXkc= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:17 +0200 Message-Id: <20210417170648.3810-2-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches With this, the search path specification of EMACSLOADPATH does no longer depend on the version of Emacs, which should make upgrading major versions less painful. See also: - - * gnu/packages/emacs.scm (emacs)[#:phases]: Add ‘wrap-load-path’. [native-search-path]: Do not search for builtin libraries. (emacs-next)[native-search-path]: Inherit from emacs. --- gnu/packages/emacs.scm | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 7447cfe33a..e1b01ac22b 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -201,6 +201,24 @@ (car (find-files "bin" "^emacs-([0-9]+\\.)+[0-9]+$")) "bin/emacs") #t))) + (add-after 'strip-double-wrap 'wrap-load-path + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lisp-dirs (find-files (string-append out "/share/emacs") + "^lisp$" + #:directories? #t))) + (for-each + (lambda (prog) + (wrap-program prog + `("EMACSLOADPATH" suffix ,lisp-dirs))) + (find-files (string-append out "/bin") + ;; Matches versioned and unversioned emacs binaries. + ;; We don't patch emacsclient, because it takes its + ;; environment variables from emacs. + ;; Likewise, we don't need to patch helper binaries + ;; like etags, ctags or ebrowse. + "^emacs(-[0-9]+(\\.[0-9]+)*)?$")) + #t))) (add-before 'reset-gzip-timestamps 'make-compressed-files-writable ;; The 'reset-gzip-timestamps phase will throw a permission error ;; if gzip files aren't writable then. This phase is needed when @@ -255,9 +273,7 @@ (native-search-paths (list (search-path-specification (variable "EMACSLOADPATH") - ;; The versioned entry is for the Emacs' builtin libraries. - (files (list "share/emacs/site-lisp" - (string-append "share/emacs/" version "/lisp")))) + (files '("share/emacs/site-lisp"))) (search-path-specification (variable "INFOPATH") (files '("share/info"))))) @@ -294,18 +310,7 @@ languages.") "0igjm9kwiswn2dpiy2k9xikbdfc7njs07ry48fqz70anljj8y7y3")))) (native-inputs `(("autoconf" ,autoconf) - ,@(package-native-inputs emacs))) - (native-search-paths - (list (search-path-specification - (variable "EMACSLOADPATH") - ;; The versioned entry is for the Emacs' builtin libraries. - (files (list "share/emacs/site-lisp" - (string-append "share/emacs/" - (version-major+minor+point version) - "/lisp")))) - (search-path-specification - (variable "INFOPATH") - (files '("share/info")))))))) + ,@(package-native-inputs emacs)))))) (define-public emacs-next-pgtk (let ((commit "ae18c8ec4f0ef37c8c9cda473770ff47e41291e2") From patchwork Sat Apr 17 17:06:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28604 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 5ED5427BC78; Sat, 17 Apr 2021 18:08:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9153527BC7A for ; Sat, 17 Apr 2021 18:08:28 +0100 (BST) Received: from localhost ([::1]:54766 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoQl-0008OQ-PG for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:08:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33668) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQO-0008Du-5w for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32811) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQN-0000DH-AN for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQN-0005ak-6B for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 03/33] gnu: emacs: Add coreutils and gzip to PATH. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867923721142 (code B ref 47661); Sat, 17 Apr 2021 17:08:03 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:17 +0000 Received: from localhost ([127.0.0.1]:44291 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPc-0005Uk-CQ for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:16 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:45713) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPZ-0005UY-M9 for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:14 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzyl3BmGz1LBRx for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:07:11 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzyl3BmGz1LBRx DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679231; bh=HTpADXlVHiUfk+dmBFj1xRx/M3eeV74QT3NrPBZYw50=; h=From:To:Subject:Date:In-Reply-To:References:From; b=JhM/JDoltWCAQOITuie/cQ544K0VGi6BMHZ4qPutkImCsVyNANeWBvyg4565azDfs l4VV1i7mG6p9QxyPbByFKJQcWBt1sdkNHZgTSz5ZF3jJ4dZgI4wocxucUkpSpE3wss qkGi4rQTdkTUZzVmxwsFQVoMSpNRmcRr4u9g760c= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:18 +0200 Message-Id: <20210417170648.3810-3-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches Some parts of Emacs (dired, compression handling, Tramp) shell out to commands and patching them all is a daunting task. Also, w.r.t. Tramp, we need those commands to be portable across multiple machines, which need not only be Guix machines (and even if they are, store items can be different). This patch ensures a ‘sane’ setup FSVO ‘sane’. * gnu/packages/emacs.scm (emacs)[wrap-load-path]: Rename to... [wrap-emacs-paths] ... this. Also patch PATH. --- gnu/packages/emacs.scm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index e1b01ac22b..5316d25151 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -201,8 +201,8 @@ (car (find-files "bin" "^emacs-([0-9]+\\.)+[0-9]+$")) "bin/emacs") #t))) - (add-after 'strip-double-wrap 'wrap-load-path - (lambda* (#:key outputs #:allow-other-keys) + (add-after 'strip-double-wrap 'wrap-emacs-paths + (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (lisp-dirs (find-files (string-append out "/share/emacs") "^lisp$" @@ -210,6 +210,13 @@ (for-each (lambda (prog) (wrap-program prog + ;; emacs-next and variants rely on uname being in PATH for + ;; Tramp. Tramp paths can't be hardcoded, because they + ;; need to be portable. + `("PATH" suffix + ,(map (lambda (in) (string-append in "/bin")) + (list (assoc-ref inputs "gzip") + (assoc-ref inputs "coreutils")))) `("EMACSLOADPATH" suffix ,lisp-dirs))) (find-files (string-append out "/bin") ;; Matches versioned and unversioned emacs binaries. @@ -231,6 +238,10 @@ `(("gnutls" ,gnutls) ("ncurses" ,ncurses) + ;; Required for "core" functionality, such as dired and compression. + ("coreutils" ,coreutils) + ("gzip" ,gzip) + ;; Avoid Emacs's limited movemail substitute that retrieves POP3 email ;; only via insecure channels. This is not needed for (modern) IMAP. ("mailutils" ,mailutils) @@ -361,7 +372,9 @@ also enabled and works without glitches even on X server.")))) (delete 'strip-double-wrap))))) (inputs `(("guix-emacs.el" ,(search-auxiliary-file "emacs/guix-emacs.el")) - ("ncurses" ,ncurses))) + ("ncurses" ,ncurses) + ("coreutils" ,coreutils) + ("gzip" ,gzip))) (native-inputs `(("pkg-config" ,pkg-config))))) From patchwork Sat Apr 17 17:06:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28602 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 EC81A27BC7A; Sat, 17 Apr 2021 18:08:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BECCA27BC77 for ; Sat, 17 Apr 2021 18:08:26 +0100 (BST) Received: from localhost ([::1]:54662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoQj-0008Gq-Nm for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:08:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33670) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQO-0008Dv-5W for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32812) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQN-0000DL-Q2 for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQN-0005ar-Jx for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 04/33] build-system: emacs: Use subdirectories again. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867924021168 (code B ref 47661); Sat, 17 Apr 2021 17:08:03 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:20 +0000 Received: from localhost ([127.0.0.1]:44295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPg-0005VJ-0Z for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:20 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:50813) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPb-0005Ug-Ul for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:16 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzyn27rGz1LBRw for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:07:13 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzyn27rGz1LBRw DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679233; bh=lfHuJ9JFLwibU5zrjF0yP0yF88mMyXDgL1d4imEHc2M=; h=From:To:Subject:Date:In-Reply-To:References:From; b=meOI9CmnatmPyZxh80SJJpRg9ntt6gxbJzOUIM65rMn7Ff7zxFGfYaKs0dLFHP5+U F3RlKxluSicwphgEtawbXITJunAETnb4U7XxHfK4ezTUd1w7lT5j1UQ4NOQO5fuHQ1 BgJhREmZJJwz2otguS6LBbylNgZyOfXy5YBFyHqc= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:19 +0200 Message-Id: <20210417170648.3810-4-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches With this, Emacs libraries are installed in the ELPA_NAME-VERSION subdirectory of site-lisp and potential subdirectories should no longer collide. * guix/build/emacs-build-system.scm (add-source-to-load-path): Rename to... (expand-load-path): ... this. Also expand lone subdirectories of site-lisp. (%standard-phases): Adjust accordingly. (elpa-directory): New variable. Export it publicly for use in other build systems. (build, patch-el-files, make-autoloads): Use ELPA name and version to construct subdirectories of %install-dir. (install): Install in subdirectory. --- guix/build/emacs-build-system.scm | 70 ++++++++++++++++++++----------- 1 file changed, 45 insertions(+), 25 deletions(-) diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm index 26ea59bc25..ae0f2e569e 100644 --- a/guix/build/emacs-build-system.scm +++ b/guix/build/emacs-build-system.scm @@ -26,13 +26,16 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) + #:use-module (ice-9 format) + #:use-module (ice-9 ftw) #:use-module (ice-9 rdelim) #:use-module (ice-9 regex) #:use-module (ice-9 match) #:export (%standard-phases %default-include %default-exclude - emacs-build)) + emacs-build + elpa-directory)) ;; Commentary: ;; @@ -73,33 +76,43 @@ archive, a directory, or an Emacs Lisp file." #t) (gnu:unpack #:source source))) -(define* (add-source-to-load-path #:key dummy #:allow-other-keys) - "Augment the EMACSLOADPATH environment variable with the source directory." +(define* (expand-load-path #:key (prepend-source? #t) #:allow-other-keys) + "Expand EMACSLOADPATH, so that inputs, whose code resides in subdirectories, +are properly found. +If @var{prepend-source?} is @code{#t} (the default), also add the current +directory to EMACSLOADPATH in front of any other directories." (let* ((source-directory (getcwd)) (emacs-load-path (string-split (getenv "EMACSLOADPATH") #\:)) - ;; XXX: Make sure the Emacs core libraries appear at the end of - ;; EMACSLOADPATH, to avoid shadowing any other libraries depended - ;; upon. - (emacs-load-path-non-core (filter (cut string-contains <> - "/share/emacs/site-lisp") - emacs-load-path)) + (emacs-load-path* + (map + (lambda (dir) + (match (scandir dir (negate (cute member <> '("." "..")))) + ((sub) (string-append dir "/" sub)) + (_ dir))) + emacs-load-path)) (emacs-load-path-value (string-append - (string-join (cons source-directory - emacs-load-path-non-core) - ":") + (string-join + (if prepend-source? + (cons source-directory emacs-load-path*) + emacs-load-path*) + ":") ":"))) (setenv "EMACSLOADPATH" emacs-load-path-value) - (format #t "source directory ~s prepended to the `EMACSLOADPATH' \ -environment variable\n" source-directory))) + (when prepend-source? + (format #t "source directory ~s prepended to the `EMACSLOADPATH' \ +environment variable\n" source-directory)) + (let ((diff (lset-difference string=? emacs-load-path* emacs-load-path))) + (unless (null? diff) + (format #t "expanded load paths for ~{~a~^, ~}\n" + (map basename diff)))))) (define* (build #:key outputs inputs #:allow-other-keys) "Compile .el files." (let* ((emacs (string-append (assoc-ref inputs "emacs") "/bin/emacs")) - (out (assoc-ref outputs "out")) - (site-lisp (string-append out %install-dir))) + (out (assoc-ref outputs "out"))) (setenv "SHELL" "sh") (parameterize ((%emacs emacs)) - (emacs-byte-compile-directory site-lisp)))) + (emacs-byte-compile-directory (elpa-directory out))))) (define* (patch-el-files #:key outputs #:allow-other-keys) "Substitute the absolute \"/bin/\" directory with the right location in the @@ -116,7 +129,8 @@ store in '.el' files." #:binary #t)) (let* ((out (assoc-ref outputs "out")) - (site-lisp (string-append out %install-dir)) + (elpa-name-ver (store-directory->elpa-name-version out)) + (el-dir (string-append out %install-dir "/" elpa-name-ver)) ;; (ice-9 regex) uses libc's regexp routines, which cannot deal with ;; strings containing NULs. Filter out such files. TODO: Remove ;; this workaround when is fixed. @@ -130,7 +144,7 @@ store in '.el' files." (error "patch-el-files: unable to locate " cmd-name)) (string-append "\"" cmd "\""))))) - (with-directory-excursion site-lisp + (with-directory-excursion el-dir ;; Some old '.el' files (e.g., tex-buf.el in AUCTeX) are still ;; ISO-8859-1-encoded. (unless (false-if-exception (substitute-program-names)) @@ -181,14 +195,14 @@ parallel. PARALLEL-TESTS? is ignored when using a non-make TEST-COMMAND." (not (any (cut match-stripped-file "excluded" <>) exclude))))) (let* ((out (assoc-ref outputs "out")) - (site-lisp (string-append out %install-dir)) + (el-dir (elpa-directory out)) (files-to-install (find-files source install-file?))) (cond ((not (null? files-to-install)) (for-each (lambda (file) (let* ((stripped-file (string-drop file (string-length source))) - (target-file (string-append site-lisp stripped-file))) + (target-file (string-append el-dir stripped-file))) (format #t "`~a' -> `~a'~%" file target-file) (install-file file (dirname target-file)))) files-to-install) @@ -219,11 +233,11 @@ parallel. PARALLEL-TESTS? is ignored when using a non-make TEST-COMMAND." "Generate the autoloads file." (let* ((emacs (string-append (assoc-ref inputs "emacs") "/bin/emacs")) (out (assoc-ref outputs "out")) - (site-lisp (string-append out %install-dir)) (elpa-name-ver (store-directory->elpa-name-version out)) - (elpa-name (package-name->name+version elpa-name-ver))) + (elpa-name (package-name->name+version elpa-name-ver)) + (el-dir (elpa-directory out))) (parameterize ((%emacs emacs)) - (emacs-generate-autoloads elpa-name site-lisp)))) + (emacs-generate-autoloads elpa-name el-dir)))) (define* (enable-autoloads-compilation #:key outputs #:allow-other-keys) "Remove the NO-BYTE-COMPILATION local variable embedded in the generated @@ -258,10 +272,16 @@ second hyphen. This corresponds to 'name-version' as used in ELPA packages." strip-store-file-name) store-dir)) +(define (elpa-directory store-dir) + "Given the store directory STORE-DIR return the absolute install directory +for libraries following the ELPA convention." + (string-append store-dir %install-dir "/" + (store-directory->elpa-name-version store-dir))) + (define %standard-phases (modify-phases gnu:%standard-phases (replace 'unpack unpack) - (add-after 'unpack 'add-source-to-load-path add-source-to-load-path) + (add-after 'unpack 'expand-load-path expand-load-path) (delete 'bootstrap) (delete 'configure) (delete 'build) From patchwork Sat Apr 17 17:06:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28611 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 2EC6627BC77; Sat, 17 Apr 2021 18:09:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B5C7727BC6C for ; Sat, 17 Apr 2021 18:09:22 +0100 (BST) Received: from localhost ([::1]:56476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoRd-00013p-Sr for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:09:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQQ-0008Ex-0M for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32813) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQO-0000De-8s for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQO-0005az-4L for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 05/33] gnu: emacs-libgit: Adjust to changes in emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867924121174 (code B ref 47661); Sat, 17 Apr 2021 17:08:04 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:21 +0000 Received: from localhost ([127.0.0.1]:44297 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPg-0005VN-KL for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:20 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:62479) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPd-0005V3-O2 for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:18 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzyq44CRz1LBRx for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:07:15 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzyq44CRz1LBRx DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679235; bh=6nK2NM42HqEpH+kCqz23sS1FB9MrVUxwezoqXvygrLs=; h=From:To:Subject:Date:In-Reply-To:References:From; b=UPT3TfK1ht1HrGPETK3oUezf/hbwOlPup1Cbk7HK04ES2ZdBNaY3XugLN8i0RS13h ut5wjNKyJuZpwNt8sRb2zM3vV1i6TuVTnWg4+3HIvwOF2zXepnWZCpsaIqk8hTKCqN yjM+E482j8A3aGVhLBffqx9+ktvLIHjOsA1VZpUU= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:20 +0200 Message-Id: <20210417170648.3810-5-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-libgit)[set-libgit--module-file]: Use elpa-directory for libgit--module-file path. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7548c26eab..9f96a22e09 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -503,7 +503,7 @@ on stdout instead of using a socket as the Emacsclient does.") (make-file-writable "libgit.el") (emacs-substitute-variables "libgit.el" ("libgit--module-file" - (string-append out "/share/emacs/site-lisp/libegit2.so"))) + (string-append (emacs:elpa-directory out) "/libegit2.so"))) #t))) (add-before 'install 'prepare-for-install (lambda _ From patchwork Sat Apr 17 17:06:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28615 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 9FE0627BC77; Sat, 17 Apr 2021 18:10:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D6BF427BC78 for ; Sat, 17 Apr 2021 18:10:07 +0100 (BST) Received: from localhost ([::1]:57428 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoSN-0001r6-0T for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:10:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33688) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQQ-0008Ey-1T for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32817) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQO-0000EL-Sq for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQO-0005bD-Mk for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 06/33] gnu: emacs-guix: Adjust to changes in emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867924321192 (code B ref 47661); Sat, 17 Apr 2021 17:08:04 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:23 +0000 Received: from localhost ([127.0.0.1]:44300 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPi-0005Vh-VC for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:23 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:4331) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPf-0005VB-HA for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:19 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzys2XHsz1LBRw for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:07:17 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzys2XHsz1LBRw DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679237; bh=I5Qgh9AHc4l76s/4eXIs4YnT8vZnAjaryvBsBppWpgw=; h=From:To:Subject:Date:In-Reply-To:References:From; b=LMzdFrze87ueWuBaFZT2D9Qd4/ra+0mh86TILNRsuWp+laBQft4yjlbYi3il2jlel 5ZDYajOJgOxZv9XJLO/ptshGxXQdXr1nwpLz3kQ2ONjXhY4fDFbb9VWjxfINTwIWHd ug0WoUxgXIvrLVsLJjhNopUgJX6nJuK5LA0ov1hw= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:21 +0200 Message-Id: <20210417170648.3810-6-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-guix)[#:phases]: Add expand-load-path. [#:configure-flags]: Install to elpa-directory. --- gnu/packages/emacs-xyz.scm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9f96a22e09..f825436f5e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3034,6 +3034,23 @@ type, for example: packages, buffers, files, etc.") (base32 "1pqw7zbgxzwpig4xr0izc3z8h80c72i6bl5yi12br0d7aq6dbkvj")))) (build-system gnu-build-system) + (arguments + `(#:modules ((guix build gnu-build-system) + ((guix build emacs-build-system) #:prefix emacs:) + (guix build utils)) + #:imported-modules (,@%gnu-build-system-modules + (guix build emacs-build-system) + (guix build emacs-utils)) + #:configure-flags + (list (string-append "--with-lispdir=" + (emacs:elpa-directory (assoc-ref %outputs "out")))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'expand-load-path + (lambda _ + ((assoc-ref emacs:%standard-phases 'expand-load-path) + #:prepend-source? #f) + #t))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) From patchwork Sat Apr 17 17:06:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28605 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 8386827BC7A; Sat, 17 Apr 2021 18:08:31 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1DE7827BC79 for ; Sat, 17 Apr 2021 18:08:27 +0100 (BST) Received: from localhost ([::1]:54674 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoQk-0008IF-7W for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:08:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33690) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQQ-0008Ez-1W for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32820) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQP-0000ER-OS for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQP-0005bY-Hd for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 07/33] gnu: emacs-telega: Adjust to changes in emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867924421203 (code B ref 47661); Sat, 17 Apr 2021 17:08:05 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:24 +0000 Received: from localhost ([127.0.0.1]:44302 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPj-0005Vl-Il for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:24 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:62992) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPh-0005VZ-ED for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:22 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzyv12qbz1LBRx for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:07:19 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzyv12qbz1LBRx DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679239; bh=7iqX/M+PZC3wa8utgNZwd2ggyn1iwh3SJq5hIssJlCI=; h=From:To:Subject:Date:In-Reply-To:References:From; b=UHc9N5/D9/SYRfZXRuyF1BHbN/s8slKxjaW4+yNg045c9plksWkvqkbuiYchOndbI TlAJAJTQ07BVAZPlaWNvS6lOHeiRkSJIjMXl7a4bQTLGmgUiviEFza3HhynS2xot/t zq1oZbzzOO/USgj3PLb/cEY1s7xxcCh8KzSJ9Eu0= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:22 +0200 Message-Id: <20210417170648.3810-7-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-telega.scm (emacs-telega)[#:phases]: Reorder. : Rename to... : ... this. Also don't patch paths to subdirs. Remove the snippet, that would push contrib to the load path. : Rename to... : ... this. : Also install etc. : Removed phases. --- gnu/packages/emacs-xyz.scm | 62 +++++++++----------------------------- 1 file changed, 15 insertions(+), 47 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f825436f5e..6740657eb0 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25206,7 +25206,9 @@ other @code{helm-type-file} sources such as @code{helm-locate}.") (("python3 run_tests.py") "")) #t)) - (add-after 'check 'telega-paths-patch + (add-after 'unpack 'expand-load-path + (assoc-ref emacs:%standard-phases 'expand-load-path)) + (add-after 'unpack 'patch-sources (lambda* (#:key inputs #:allow-other-keys) ;; Hard-code paths to `ffplay` and `ffmpeg`. (let ((ffplay-bin (string-append (assoc-ref inputs "ffmpeg") @@ -25222,24 +25224,15 @@ other @code{helm-type-file} sources such as @code{helm-locate}.") (string-append "(and (file-executable-p \"" ffmpeg-bin "\")" "\"" ffmpeg-bin "\")")))) - ;; Modify telega-util to reflect unique dir name in - ;; `telega-install-data' phase. - (substitute* "telega-util.el" - (("\\(concat \"etc/\" filename\\) telega--lib-directory") - "(concat \"telega-data/\" filename) - (locate-dominating-file telega--lib-directory - \"telega-data\")")) - ;; Modify telega.el to reflect unique dir name in - ;; `telega-install-contrib' phase. + ;; This would push the "contrib" sources to the load path, + ;; but as contrib is not installed alongside telega, it does + ;; nothing. (substitute* "telega.el" - (("\\(push \\(expand-file-name \"contrib\" telega--lib-directory\\) load-path\\)") - "(push (expand-file-name \"telega-contrib\" - (locate-dominating-file telega--lib-directory - \"telega-contrib\")) load-path)")) + (("\\(push .* load-path\\)") "")) #t)) ;; The server test suite has a hardcoded path. ;; Reset this behavior to use the proper path. - (add-after 'unpack 'server-suite-patch + (add-after 'unpack 'patch-test-suite (lambda _ (substitute* "server/run_tests.py" (("~/.telega/telega-server") @@ -25251,39 +25244,14 @@ other @code{helm-type-file} sources such as @code{helm-locate}.") (invoke "python3" "server/run_tests.py") #t)) (delete 'configure) - ;; Build emacs-side using `emacs-build-system' - (add-after 'compress-documentation 'emacs-add-source-to-load-path - (assoc-ref emacs:%standard-phases 'add-source-to-load-path)) - ;; Manually invoke bytecompilation for the contrib - ;; subdirectory. - (add-after 'emacs-add-source-to-load-path 'emacs-bytecomp-contrib - (lambda _ - (substitute* "Makefile" - (("byte-recompile-directory \".\"") - "byte-recompile-directory \"contrib\"")) - (invoke "make" "compile") - #t)) - (add-after 'emacs-bytecomp-contrib 'emacs-install - (assoc-ref emacs:%standard-phases 'install)) - ;; This step installs subdir /etc, which contains images, sounds and - ;; various other data, next to the site-lisp dir. - (add-after 'emacs-install 'telega-install-data - (lambda* (#:key outputs #:allow-other-keys) - (copy-recursively - "etc" - (string-append (assoc-ref outputs "out") - "/share/emacs/telega-data/")) - #t)) - (add-after 'emacs-install 'telega-install-contrib - (lambda* (#:key outputs #:allow-other-keys) - (copy-recursively - "contrib" - (string-append (assoc-ref outputs "out") - "/share/emacs/telega-contrib")) - #t)) - (add-after 'telega-install-contrib 'emacs-build + (add-after 'expand-load-path 'emacs-install + (lambda args + (apply (assoc-ref emacs:%standard-phases 'install) + #:include `("etc" ,@emacs:%default-include) + args))) + (add-after 'emacs-install 'emacs-build (assoc-ref emacs:%standard-phases 'build)) - (add-after 'telega-install-contrib 'emacs-make-autoloads + (add-after 'emacs-install 'emacs-make-autoloads (assoc-ref emacs:%standard-phases 'make-autoloads))))) (inputs `(("ffmpeg" ,ffmpeg))) ; mp4/gif support. From patchwork Sat Apr 17 17:06:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28603 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 C485B27BC6C; Sat, 17 Apr 2021 18:08:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id F0A8E27BC78 for ; Sat, 17 Apr 2021 18:08:26 +0100 (BST) Received: from localhost ([::1]:54672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoQk-0008Hr-2k for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:08:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33710) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQS-0008F5-Au for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32826) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQQ-0000FK-NY for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQQ-0005bw-HP for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 08/33] gnu: Add emacs-telega-contrib. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867924721221 (code B ref 47661); Sat, 17 Apr 2021 17:08:06 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:27 +0000 Received: from localhost ([127.0.0.1]:44306 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPn-0005WC-4W for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:27 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:4738) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPj-0005Vi-Gc for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:24 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzyx0TQ6z1LBRw for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:07:21 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzyx0TQ6z1LBRw DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679241; bh=q1mhtq+9WiJhnei9049+w8NP77uuyQQJBIvrxsXGBd4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=mhUyw/HqT2BVRLStzMy3tbHp3gT3BTJOdYz7JctRQEUWLmE4Pk5uQGqQr9kHiDSBV Ppbbfk9xcpKi1mW6yl2bfj/t/bqAkznxDWWuVapYy9B+UybmF8/j82ZM0GfnKTWurA Dc71MFbWe9i89m4xBrLixoqCDv2gayNpImwKSXHE= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:23 +0200 Message-Id: <20210417170648.3810-8-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-telega-contrib): New variable. --- gnu/packages/emacs-xyz.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 6740657eb0..32492a5535 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25277,6 +25277,21 @@ Telegram messaging platform.") (home-page "https://zevlg.github.io/telega.el/") (license license:gpl3+)))) +(define-public emacs-telega-contrib + (package/inherit emacs-telega + (name "emacs-telega-contrib") + (build-system emacs-build-system) + (arguments + `(#:exclude '("telega-live-location.el") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "contrib") #t))))) + (propagated-inputs + `(("emacs-telega" ,emacs-telega) + ("emacs-alert" ,emacs-alert) + ("emacs-all-the-icons" ,emacs-all-the-icons))))) + (define-public emacs-doom-modeline (package (name "emacs-doom-modeline") From patchwork Sat Apr 17 17:06:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28619 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 1D21427BC77; Sat, 17 Apr 2021 18:10:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 92C9727BC78 for ; Sat, 17 Apr 2021 18:10:22 +0100 (BST) Received: from localhost ([::1]:58398 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoSb-0002EK-Pk for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:10:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33724) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQT-0008FL-QG for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32827) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQS-0000G5-Bm for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQR-0005cF-7P for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 09/33] gnu: emacs-emacsql: Adjust to changes in emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867924721232 (code B ref 47661); Sat, 17 Apr 2021 17:08:07 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:27 +0000 Received: from localhost ([127.0.0.1]:44309 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPn-0005WE-Dl for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:27 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:4985) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPl-0005W3-B3 for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:25 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzyz0x2Jz1LBRx for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:07:23 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzyz0x2Jz1LBRx DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679243; bh=xcwEybTmbOosr1PNZFtTf7pZwD0xYMWJh8YQM+Uyejc=; h=From:To:Subject:Date:In-Reply-To:References:From; b=TmwGKfvrD/KuY93qFn6d4ikEt71INoW+Z9rXGbEb/g/qFdPgCB1Jnv4IOl958+c+5 f7bF2buneT7kTQB/AzEPYyZZIoxZHTnyZ4f9ed4JGgiqxqr2OvTPNNzz/7LnkDPvJR YQ39qWHPgO35Gr4qWZciB8zmhYCyiIfUk6UbBSDA= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:24 +0200 Message-Id: <20210417170648.3810-9-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-emacsql)[#:phases]: Use standard build and install phases. [build-emacsql-sqlite]: Use cc-for-target. --- gnu/packages/emacs-xyz.scm | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 32492a5535..360c7d0a2b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15565,7 +15565,6 @@ object has been freed.") (srfi srfi-26)) #:phases (modify-phases %standard-phases - (delete 'build) ;‘build-emacsql-sqlite’ compiles ‘*.el’ files. (add-before 'install 'patch-elisp-shell-shebangs (lambda _ (substitute* (find-files "." "\\.el") @@ -15576,7 +15575,7 @@ object has been freed.") (setenv "SHELL" "sh"))) (add-after 'setenv-shell 'build-emacsql-sqlite (lambda _ - (invoke "make" "binary" "CC=gcc"))) + (invoke "make" "binary" (string-append "CC=" ,(cc-for-target))))) (add-after 'build-emacsql-sqlite 'install-emacsql-sqlite ;; This build phase installs emacs-emacsql binary. (lambda* (#:key outputs #:allow-other-keys) @@ -15597,16 +15596,7 @@ object has been freed.") ;; in the right place. ("(defvar emacsql-sqlite-executable" (string-append (assoc-ref outputs "out") - "/bin/emacsql-sqlite")))))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) - (install-file "sqlite/emacsql-sqlite" - (string-append out "/bin")) - (for-each (cut install-file <> - (string-append out "/share/emacs/site-lisp")) - (find-files "." "\\.elc*$"))) - #t))))) + "/bin/emacsql-sqlite"))))))))) (inputs `(("emacs-minimal" ,emacs-minimal) ("mariadb" ,mariadb "lib") From patchwork Sat Apr 17 17:06:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28612 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 6DB1927BC77; Sat, 17 Apr 2021 18:09:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0BA4927BC6C for ; Sat, 17 Apr 2021 18:09:24 +0100 (BST) Received: from localhost ([::1]:56514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoRe-00015F-Iw for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:09:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQT-0008FP-QZ for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32831) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQS-0000Gj-QI for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQR-0005cM-LY for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 10/33] gnu: emacs-howm: Adjust to changes in emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867925321264 (code B ref 47661); Sat, 17 Apr 2021 17:08:07 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:33 +0000 Received: from localhost ([127.0.0.1]:44313 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPs-0005Wo-P5 for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:33 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:5149) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPn-0005WA-4T for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:27 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzz06lMzz1LBRw for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:07:24 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzz06lMzz1LBRw DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679245; bh=gm+sMYUVKwPENMPb6ePChO7gv+8cPywp+Ns457oVPwY=; h=From:To:Subject:Date:In-Reply-To:References:From; b=jVxgytuHsxMcFjYjSpYzPAgSvCwK1OClLwsZ52CY0sV3vh52HgL9EJhbu4YJGXrum vd5TgCm0vmo16B4naAMn0rQAohcr+Zedykbz4U0sju3DB7DHAjB7Y+xk7SBjV3s2Pb B8WytkBGb0j1Mg/mcmIqON3/SRskCHS0fILMB0dk= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:25 +0200 Message-Id: <20210417170648.3810-10-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-howm)[#:configure-flags]: Install to elpa-directory. --- gnu/packages/emacs-xyz.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 360c7d0a2b..66a981cae6 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2373,8 +2373,7 @@ a set of simplified face specifications and a user-supplied color palette") `(("emacs" ,emacs-minimal))) (arguments `(#:configure-flags - (list (string-append "--with-howmdir=" %output - "/share/emacs/site-lisp/")) + (list (string-append "--with-howmdir=" (emacs:elpa-directory %output))) #:modules ((guix build gnu-build-system) ((guix build emacs-build-system) #:prefix emacs:) (guix build utils)) From patchwork Sat Apr 17 17:06:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28606 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 D0BA727BC6C; Sat, 17 Apr 2021 18:08:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C388427BC78 for ; Sat, 17 Apr 2021 18:08:40 +0100 (BST) Received: from localhost ([::1]:55512 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoQx-0000TM-Um for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:08:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33722) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQT-0008FK-Pi for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32828) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQS-0000Gf-8x for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQS-0005cT-3S for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 11/33] gnu: emacs-ert-runner: Adjust to changes in emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867925321273 (code B ref 47661); Sat, 17 Apr 2021 17:08:08 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:33 +0000 Received: from localhost ([127.0.0.1]:44316 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPt-0005Ws-5o for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:33 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:52481) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPo-0005WW-T4 for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:29 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzz25Hndz1LBRx for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:07:26 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzz25Hndz1LBRx DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679246; bh=B09ghscdV0xTlASjZrYpMrRROOYmBCHXVzJw/Aq1ql8=; h=From:To:Subject:Date:In-Reply-To:References:From; b=JIjE45KORqLu22AwOt+zwAaCRxfTL49Nn5J/+lyrkqNKN0Ckc1E9ERfW7L6QqO+BG kXvXbh7vjcZG2LcZ54KTvXZ+l9m1GkWBUIsyQsGhI5BPujGQeaSUzi3NdU+3u8vRMD pE/gTFcLnluLozf33j+K4ChhfBsG931U+jfYgbvY= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:26 +0200 Message-Id: <20210417170648.3810-11-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-ert-runner)[install-executable]: Use elpa-directory for the value of ERT_RUNNER. --- gnu/packages/emacs-xyz.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 66a981cae6..626ad5e329 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13256,8 +13256,7 @@ variable instead, to remind you of that variable's meaning.") (getenv "TMPDIR") "/source"))) (substitute* "bin/ert-runner" (("ERT_RUNNER=\"\\$\\(dirname \\$\\(dirname \\$0\\)\\)") - (string-append "ERT_RUNNER=\"" out - "/share/emacs/site-lisp"))) + (string-append "ERT_RUNNER=\"" (elpa-directory out)))) (install-file "bin/ert-runner" (string-append out "/bin")) (wrap-program (string-append out "/bin/ert-runner") (list "EMACSLOADPATH" ":" 'prefix From patchwork Sat Apr 17 17:06:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28616 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 2EDB427BC77; Sat, 17 Apr 2021 18:10:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 88E3B27BC6C for ; Sat, 17 Apr 2021 18:10:08 +0100 (BST) Received: from localhost ([::1]:57476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoSN-0001sD-KA for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:10:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33730) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQT-0008FO-QG for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32829) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQS-0000Gh-Lo for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQS-0005cb-HR for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 12/33] gnu: emacs-pdf-tools: Adjust to changes in emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Cc: Xinglu Chen Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867925421279 (code B ref 47661); Sat, 17 Apr 2021 17:08:08 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:34 +0000 Received: from localhost ([127.0.0.1]:44318 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPt-0005X3-IZ for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:33 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:5648) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPq-0005We-Sj for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:31 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzz43dBWz1LBRw; Sat, 17 Apr 2021 19:07:28 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzz43dBWz1LBRw DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679248; bh=slMvxDfF3Yf4Q/jytjnt9ZP+2Z/geUyTgxIY2qoPnlk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UKlT7GUkSRFhpq89JrAUukVFDNTr6vwC0jlt9e0QMGEEqQA8NchtrVjHQpM9bdQFB b6jltG/tKkOc1cq0YpfNzg754toSMj/TWX07lK+fFo8uMxqgMiG1FwhUIstpYBlLdu 5v22pwdWOFgFqMSR2oURwpatxDDUG82j37ODFTI8= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:27 +0200 Message-Id: <20210417170648.3810-12-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches From: Xinglu Chen * gnu/packages/emacs-xyz.scm (emacs-pdf-tools)[#:phases]: Rename 'emacs-add-source-to-load-path' to 'emacs-expand-load-path'. Use expand-load-path, which replaces add-source-to-load-path. Signed-off-by: Leo Prikler --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 626ad5e329..0f8b7654ba 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2942,8 +2942,8 @@ during idle time, while Emacs is doing nothing else.") ;; upgrading" that pdf-tools tries to perform. (emacs-substitute-variables "pdf-tools.el" ("pdf-tools-handle-upgrades" '())))) - (add-after 'emacs-patch-variables 'emacs-add-source-to-load-path - (assoc-ref emacs:%standard-phases 'add-source-to-load-path)) + (add-after 'emacs-patch-variables 'emacs-expand-load-path + (assoc-ref emacs:%standard-phases 'expand-load-path)) (add-after 'emacs-add-source-to-load-path 'emacs-install (assoc-ref emacs:%standard-phases 'install)) (add-after 'emacs-install 'emacs-build From patchwork Sat Apr 17 17:06:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28617 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 B438227BC77; Sat, 17 Apr 2021 18:10:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5691B27BC6C for ; Sat, 17 Apr 2021 18:10:11 +0100 (BST) Received: from localhost ([::1]:57578 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoSQ-0001uu-Hg for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:10:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33728) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQT-0008FN-QM for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32832) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQT-0000Gl-BI for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQT-0005co-5D for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 13/33] gnu: emacs-shroud: Adjust to changes in emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867925921310 (code B ref 47661); Sat, 17 Apr 2021 17:08:09 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:39 +0000 Received: from localhost ([127.0.0.1]:44323 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPy-0005Xc-T0 for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:39 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:5895) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPs-0005Wl-La for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:33 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzz63VyLz1LBRx for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:07:30 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzz63VyLz1LBRx DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679250; bh=8AAlqCTr/sgQuTeL1OUgHQ6mOv9BERSVnNOa7AJ3HMQ=; h=From:To:Subject:Date:In-Reply-To:References:From; b=Dp8U3xSuPKHDRMcXQalrBeJZb9NEfOigwmkfLK/GS9SjQ/EJeWSRjfOwLRK6aSN55 aoOw6/ewXYok3eSGN4tVy3b5ZLlZM2mkcx3JEzuobPA4cF0RuHTdkJ5BQvEO+jHl8S 2MRwRcZ+HpMnNUJuD54JvIOwuRmT2p9KVO5qj52Q= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:28 +0200 Message-Id: <20210417170648.3810-13-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-shroud)[#:phases]: Add ‘expand-load-path’. [#:configure-flags]: Use elpa-directory for lispdir. --- gnu/packages/emacs-xyz.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0f8b7654ba..ed22832fcb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1074,6 +1074,19 @@ for editing Racket's Scribble documentation syntax in Emacs.") (sha256 (base32 "0q2pb3w8s833fjhkzicciw2php4lsnismad1dnwgp2lcway757ra")))) (build-system gnu-build-system) + (arguments + `(#:modules ((guix build gnu-build-system) + ((guix build emacs-build-system) #:prefix emacs:) + (guix build utils)) + #:imported-modules (,@%gnu-build-system-modules + (guix build emacs-build-system) + (guix build emacs-utils)) + #:configure-flags (list (string-append "--with-lispdir=" + (emacs:elpa-directory %output))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'expand-load-path + (assoc-ref emacs:%standard-phases 'expand-load-path))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) From patchwork Sat Apr 17 17:06:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28618 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 5375927BC78; Sat, 17 Apr 2021 18:10:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E054727BC77 for ; Sat, 17 Apr 2021 18:10:21 +0100 (BST) Received: from localhost ([::1]:58344 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoSb-0002D6-1Z for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:10:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQV-0008G0-MR for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32835) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQT-0000H9-Sg for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQT-0005cx-Lp for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 14/33] gnu: emacs-sly-stepper: Adjust to changes in emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867925921317 (code B ref 47661); Sat, 17 Apr 2021 17:08:09 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:39 +0000 Received: from localhost ([127.0.0.1]:44325 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPz-0005Xe-4r for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:39 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:64488) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPu-0005XG-GI for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:34 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzz822KBz1LBSW for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:07:32 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzz822KBz1LBSW DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679252; bh=UVCK6qSd33NJjYPt04dMAZlqBN+Xk/kwYMqFxqrLJvs=; h=From:To:Subject:Date:In-Reply-To:References:From; b=MJbCtdnfu4KQpZFZxVDee6zwbyKU69FJ63yToC1QxBpOM0XYPAW6muIPkolpPb8zV 5crGfI3SsWDbjjvWRU1mMWHdXa3+H2ZD7bc1RsJ/ZmkmZkObYyG3TZo02GW2c0PCKq aWTnvj1X5DaZTEacPCaNQjXOQoHVELKxPK8j571A= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:29 +0200 Message-Id: <20210417170648.3810-14-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-sly-stepper)[#:phases]: : Rename to... : ... this. Use find-files to find contrib directory. : Find slynk-stepper.lisp in elpa-directory. --- gnu/packages/emacs-xyz.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ed22832fcb..9ffae08600 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10408,24 +10408,26 @@ inside the source file.") (propagated-inputs `(("emacs-sly" ,emacs-sly))) (arguments - '(#:include (cons* "\\.lisp$" "\\.asd$" %default-include) + `(#:include (cons* "\\.lisp$" "\\.asd$" %default-include) #:phases (modify-phases %standard-phases ;; The package provides autoloads. (delete 'make-autoloads) (delete 'enable-autoloads-compilation) - (add-after 'add-source-to-load-path 'add-contrib-to-emacs-load-path + (add-after 'expand-load-path 'expand-sly-contrib (lambda* (#:key inputs #:allow-other-keys) - (let ((sly (assoc-ref inputs "emacs-sly"))) + (let* ((sly (assoc-ref inputs "emacs-sly")) + (contrib (find-files sly "^contrib$" #:directories? #t))) (setenv "EMACSLOADPATH" - (string-append sly "/share/emacs/site-lisp/contrib:" - (getenv "EMACSLOADPATH")))) - #t)) + (string-append (string-join contrib ":") + ":" + (getenv "EMACSLOADPATH"))) + #t))) (add-after 'install 'find-agnostic-lizard (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (file (string-append out "/share/emacs/site-lisp/" - "slynk-stepper.lisp")) + (file (string-append (elpa-directory out) + "/slynk-stepper.lisp")) (asd (string-append (assoc-ref inputs "cl-agnostic-lizard") "/share/common-lisp/systems/agnostic-lizard.asd"))) From patchwork Sat Apr 17 17:06:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28623 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 B6F3627BC78; Sat, 17 Apr 2021 18:10:46 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2645127BC6C for ; Sat, 17 Apr 2021 18:10:46 +0100 (BST) Received: from localhost ([::1]:59312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoSz-0002bX-A1 for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:10:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33748) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQV-0008GJ-NK for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32839) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQU-0000Hj-E7 for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQU-0005dC-7L for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 15/33] gnu: emacs-sly-stepper: Remove generated sources. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867926921365 (code B ref 47661); Sat, 17 Apr 2021 17:08:10 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:49 +0000 Received: from localhost ([127.0.0.1]:44327 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPz-0005Xm-E7 for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:49 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:6351) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPw-0005XO-9i for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:36 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzzB0pSTz1LBRx for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:07:34 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzzB0pSTz1LBRx DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679254; bh=lI2fqNZrbClNUeJUXKGLPMDHn18CIyaJHwuQCPy49p0=; h=From:To:Subject:Date:In-Reply-To:References:From; b=bpq1hPGLpG8JFUBi/fzAbxQ3lCT/Cu1dikaC4gqrep3WIVyG1QgPtNrvf37+ICmnC WsycXlvkS7bYSeS7sJliDhQXsxLVrve354mn7gEUQJgS1fpJrI5ixPzZ6tw3Ama4EK R2XLKTYYLCUjMbDh4pVVMXV4+wvnqiWagMfUADjQ= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:30 +0200 Message-Id: <20210417170648.3810-15-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (sly-stepper)[source]: Add snippet to remove autoloads. [#:phases]: Do not delete ‘make-autoloads’ or ‘enable-autoloads-compilation’. --- gnu/packages/emacs-xyz.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9ffae08600..76b7517566 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10401,7 +10401,12 @@ inside the source file.") (file-name (git-file-name name version)) (sha256 (base32 - "1hxniaxifdw3m4y4yssgy22xcmmf558wx7rpz66wy5hwybjslf7b")))) + "1hxniaxifdw3m4y4yssgy22xcmmf558wx7rpz66wy5hwybjslf7b")) + (modules '((guix build utils))) + (snippet + '(begin + (map delete-file (find-files "." ".*-autoloads\\.elc?$")) + #t)))) (build-system emacs-build-system) (inputs `(("cl-agnostic-lizard" ,cl-agnostic-lizard))) @@ -10411,9 +10416,6 @@ inside the source file.") `(#:include (cons* "\\.lisp$" "\\.asd$" %default-include) #:phases (modify-phases %standard-phases - ;; The package provides autoloads. - (delete 'make-autoloads) - (delete 'enable-autoloads-compilation) (add-after 'expand-load-path 'expand-sly-contrib (lambda* (#:key inputs #:allow-other-keys) (let* ((sly (assoc-ref inputs "emacs-sly")) From patchwork Sat Apr 17 17:06:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28610 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 A192127BC77; Sat, 17 Apr 2021 18:09:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3D4E427BC6C for ; Sat, 17 Apr 2021 18:09:22 +0100 (BST) Received: from localhost ([::1]:56466 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoRd-00013f-FX for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:09:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33750) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQV-0008GW-OP for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32844) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQV-0000Hk-Bk for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQV-0005de-5e for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 16/33] gnu: emacs-org-contrib: Adjust to changes in emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867926921372 (code B ref 47661); Sat, 17 Apr 2021 17:08:11 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:49 +0000 Received: from localhost ([127.0.0.1]:44334 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQ9-0005YY-8J for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:49 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:53563) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoPy-0005XV-3M for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:38 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzzC6ZBMz1LBSW for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:07:35 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzzC6ZBMz1LBSW DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679255; bh=xy9dv9tGHuDGvZY4An/AAfWbM7LNl0UDdKoxtS90H60=; h=From:To:Subject:Date:In-Reply-To:References:From; b=F7wR0srtsawSjeyUPigIislLRZm8aNMOsVuSz86/ZbwUXHilTh8WL+B/QvGH6mxeu JSXyY8+F43rhghufpJGaN0TRMODfqVnmV6i5YBdW1ZC3fFOKdBynav2y1rv4XLyucf EWQSDgtgwJSPa5KtuqZbIkDEDWQ9ykZWyy6R8NsM= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:31 +0200 Message-Id: <20210417170648.3810-16-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-org-contrib)[delete-org-files]: Excurse into elpa-directory. --- gnu/packages/emacs-xyz.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 76b7517566..fd38b70c59 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11191,8 +11191,7 @@ programming and reproducible research.") (duplicates (lset-intersection string=? contrib-files org+contrib-files))) - (with-directory-excursion - (string-append out "/share/emacs/site-lisp") + (with-directory-excursion (elpa-directory out) (for-each delete-file duplicates)) #t)))))) (propagated-inputs From patchwork Sat Apr 17 17:06:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28626 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 7F00327BC7A; Sat, 17 Apr 2021 18:11:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 478DD27BC79 for ; Sat, 17 Apr 2021 18:11:51 +0100 (BST) Received: from localhost ([::1]:60258 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoU2-0002zp-E0 for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:11:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33756) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQX-0008HA-KB for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32845) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQV-0000IB-VJ for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQV-0005du-Qz for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 17/33] gnu: emacs-edbi: Adjust to changes in emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867927021380 (code B ref 47661); Sat, 17 Apr 2021 17:08:11 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:50 +0000 Received: from localhost ([127.0.0.1]:44336 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQ9-0005Yf-Gp for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:49 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:48735) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQ0-0005Xt-M5 for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:41 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzzF52zpz1LBRx for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:07:37 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzzF52zpz1LBRx DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679257; bh=oC38L5iX7Y2eQRNaPFNngbwrz11RTcnubzDUvu9kSVo=; h=From:To:Subject:Date:In-Reply-To:References:From; b=PdKPzplMk+Jv1mU/YNU+nMVZfp+dALhIaJfbdcKao2jNnmsZP5Z8bZFQQZWTpV6TN pCvsv6NEB8eLdzWnQ+Lgyd87ffpqnyqmg/PWXCkk+AAWmNOiWTVFt3P1GTGuPgrci7 jPz4/AvaZP6zXnzy+gYQc3CAZsNVVc9qyYAJkWLs= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:32 +0200 Message-Id: <20210417170648.3810-17-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-edbi)[patch-path]: Execute after unpack. [wrap-edbi-bridge]: New phase (after wrap). Find edbi-bridge in elpa-directory. --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index fd38b70c59..00a3368620 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21494,17 +21494,21 @@ asynchronous communications, the RPC response is fairly good.") `(#:include '("\\.el$" "\\.pl$") #:phases (modify-phases %standard-phases - (add-after 'install 'patch-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((perl (assoc-ref inputs "perl")) - (dir (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp"))) - (substitute* (string-append dir "/edbi.el") + (add-after 'unpack 'patch-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((perl (assoc-ref inputs "perl"))) + (substitute* "edbi.el" (("\"perl\"") (string-append "\"" perl "/bin/perl\""))) - (chmod (string-append dir "/edbi-bridge.pl") #o555) - (wrap-program (string-append dir "/edbi-bridge.pl") - `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB")))) - #t)))))) + #t))) + (add-after 'wrap 'wrap-edbi-bridge + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bridge (string-append (elpa-directory out) + "/edbi-bridge.pl"))) + (chmod bridge #o555) + (wrap-program bridge + `("PERL5LIB" ":" prefix (,(getenv "PERL5LIB"))))) + #t))))) (synopsis "Database Interface for Emacs Lisp") (description "This program connects the database server through Perl's DBI, and provides DB-accessing API and the simple management UI.") From patchwork Sat Apr 17 17:06:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28608 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 E84D627BC79; Sat, 17 Apr 2021 18:08:43 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 798D927BC6C for ; Sat, 17 Apr 2021 18:08:42 +0100 (BST) Received: from localhost ([::1]:55694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoQz-0000Zg-L1 for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:08:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33754) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQX-0008H9-KV for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32847) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQW-0000In-El for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQW-0005e1-9g for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 18/33] gnu: emacs-scel: Adjust to changes in emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867927021386 (code B ref 47661); Sat, 17 Apr 2021 17:08:12 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:50 +0000 Received: from localhost ([127.0.0.1]:44338 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQ9-0005Yn-Ti for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:50 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:54087) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQ2-0005Y0-JI for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:42 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzzJ279Mz1LBRw for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:07:40 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzzJ279Mz1LBRw DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679260; bh=tRbrmcfY7kpXCqmYMZ26440r/LlYyxEzyeapEwZM0eo=; h=From:To:Subject:Date:In-Reply-To:References:From; b=e0qcHQcU1iBlffWk56agi0i/s7EdB79rj+UJLRIPSejF2UAZEnnYWdKCe5xtW+anW E+Wtq64Gr7+qUgE45YD6Y4Z1e85BhW7LH+/ZJqJqSmMo74G5FSepR69DWe+l0yARwJ rKN74eBqOvcgYluisSNVAxmvbHpDJYsOf1xrHA3s= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:33 +0200 Message-Id: <20210417170648.3810-18-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-scel)[#:phases]: Use elpa-directory. : Adjust location. --- gnu/packages/emacs-xyz.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 00a3368620..90031faf15 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6138,12 +6138,11 @@ to a key in your preferred mode.") (lambda* (#:key outputs #:allow-other-keys) (substitute* "el/CMakeLists.txt" (("share/emacs/site-lisp/SuperCollider") - (string-append - "share/emacs/site-lisp"))) + (elpa-directory (assoc-ref outputs "out")))) ((assoc-ref cmake:%standard-phases 'configure) #:outputs outputs #:configure-flags '("-DSC_EL_BYTECOMPILE=OFF")))) - (add-after 'add-source-to-load-path 'add-el-dir-to-emacs-load-path + (add-after 'expand-load-path 'add-el-dir-to-emacs-load-path (lambda _ (setenv "EMACSLOADPATH" (string-append (getcwd) "/el:" (getenv "EMACSLOADPATH"))) From patchwork Sat Apr 17 17:06:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28622 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 E858027BC77; Sat, 17 Apr 2021 18:10:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 78C4427BC6C for ; Sat, 17 Apr 2021 18:10:41 +0100 (BST) Received: from localhost ([::1]:59244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoSt-0002ZB-L5 for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:10:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33752) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQX-0008H8-KS for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32848) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQW-0000J5-Vq for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQW-0005eE-RP for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 19/33] gnu: emacs-vterm: Adjust to changes in emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867927121396 (code B ref 47661); Sat, 17 Apr 2021 17:08:12 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:51 +0000 Received: from localhost ([127.0.0.1]:44341 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQB-0005Z0-7W for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:51 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:49207) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQ4-0005Y9-8m for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:44 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzzL0jt5z1LBRx for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:07:42 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzzL0jt5z1LBRx DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679262; bh=kJAwqwB0sbeyDW9P2C0EdHrkPWPr+u3qf9AVbBBZ5mw=; h=From:To:Subject:Date:In-Reply-To:References:From; b=XdEy704QI631l+QcEGwZ/qUFLrzz1LJi/5FQC38qhcHPDZsCCdPMM74j3C7q//835 vWOV57YXXquM7Pd3wWo32NzKfrdxWVtBZbS9SpwMeJphM4/XeHImjX432W0rJz9Jew QZYvqViWHausXa38oqtIQVt/7jBWd7oBuNOZz13g= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:34 +0200 Message-Id: <20210417170648.3810-19-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-vterm)[substitute-vterm-module-path]: Move after ‘unpack’. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 90031faf15..3dbb37e377 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21660,7 +21660,7 @@ stored playlists.") (guix build cmake-build-system)) #:phases (modify-phases %standard-phases - (add-before 'add-source-to-load-path 'substitute-vterm-module-path + (add-after 'unpack 'substitute-vterm-module-path (lambda* (#:key outputs #:allow-other-keys) (chmod "vterm.el" #o644) (emacs-substitute-sexps "vterm.el" From patchwork Sat Apr 17 17:06:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28613 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 9205227BC77; Sat, 17 Apr 2021 18:09:43 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4598927BC6C for ; Sat, 17 Apr 2021 18:09:43 +0100 (BST) Received: from localhost ([::1]:56640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoRy-0001Ca-FI for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:09:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33758) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQX-0008HK-OL for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32849) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQX-0000JA-GC for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQX-0005eL-8a for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 20/33] gnu: notmuch: Adjust to changes in emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867927121404 (code B ref 47661); Sat, 17 Apr 2021 17:08:13 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:51 +0000 Received: from localhost ([127.0.0.1]:44343 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQB-0005Z3-FL for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:51 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:1499) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQ6-0005YH-2C for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:46 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzzM6KzFz1LBRw for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:07:43 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzzM6KzFz1LBRw DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679263; bh=Duz/4FgBbBZ0C7NE3J8dhvIIqaLsNQ4M6LpQmeZaHlA=; h=From:To:Subject:Date:In-Reply-To:References:From; b=HQvqmbw4odHLRXY6aN4G8xEKDTymq8/9y+rkZEIvxp+TfCA7LeKTQLWX7GSbax3+2 AA1cEoMsuFSbd24z+hAzBnx1mbVKkF2RutRqUUkX3wtse+1biqkhW9taGvN3x3iy9W 9xpg+5EqGb9d1HSFzGZWuuxI74wVr9fAX0AldE/E= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:35 +0200 Message-Id: <20210417170648.3810-20-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/mail.scm (notmuch)[configure]: Use elpa-directory. --- gnu/packages/mail.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index c8f29b80d6..43dec741a0 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1362,8 +1362,7 @@ invoking @command{notifymuch} from the post-new hook.") (setenv "CONFIG_SHELL" (which "sh")) (let* ((out (assoc-ref outputs "out")) - (elisp - (string-append out "/share/emacs/site-lisp/"))) + (elisp (emacs:elpa-directory out))) (invoke "./configure" (string-append "--prefix=" out) (string-append "--emacslispdir=" elisp) From patchwork Sat Apr 17 17:06:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28614 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 29EE127BC79; Sat, 17 Apr 2021 18:10:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8BFD227BC6C for ; Sat, 17 Apr 2021 18:10:07 +0100 (BST) Received: from localhost ([::1]:57394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoSM-0001q3-Gj for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:10:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33760) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQY-0008IL-4s for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32850) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQX-0000Jc-TF for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:13 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQX-0005eT-Od for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 21/33] gnu: emacs-pyim: Update to 3.6. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867927221411 (code B ref 47661); Sat, 17 Apr 2021 17:08:13 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:52 +0000 Received: from localhost ([127.0.0.1]:44345 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQB-0005ZB-Q7 for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:52 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:7915) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQ8-0005YP-4R for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:48 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzzP4nFgz1LBRx for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:07:45 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzzP4nFgz1LBRx DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679265; bh=3NVI5hfrH2VM5k0/ETHIg6A27BHQztkAMmlEl83rpS8=; h=From:To:Subject:Date:In-Reply-To:References:From; b=SclPrlq6u57G/IHULsCG+7vdlVTYH1Plnb/rgclLG3e1cCw6jjeVx9Ks4R7eqsiAC CNM/MXJaGztaebiWJYWTKJknbjiFrjxunqpe6O6/3CUNtGD10N9IuqrZW61VaOWjSv rtnkphY9N/TScQ95iPaoKhwXYr6LR0Gtrx/WuwUU= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:36 +0200 Message-Id: <20210417170648.3810-21-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-pyim): Update to 3.6. --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3dbb37e377..40ab1f38a1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12657,13 +12657,13 @@ containing words from the Rime project.") (define-public emacs-pyim (package (name "emacs-pyim") - (version "3.2") + (version "3.6") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/pyim-" version ".tar")) (sha256 - (base32 "1rr9mq334dqf7mx1ii7910zkigw7chl63iws4sw0qsn014kjlb0a")))) + (base32 "1fmbzh33s9xdvrfjhkqr9ydcqbiv8lr04k5idvbpc9vwjjjan5y0")))) (build-system emacs-build-system) (propagated-inputs `(("emacs-async" ,emacs-async) From patchwork Sat Apr 17 17:06:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28621 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 93B3027BC78; Sat, 17 Apr 2021 18:10:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7F42627BC6C for ; Sat, 17 Apr 2021 18:10:21 +0100 (BST) Received: from localhost ([::1]:58296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoSa-0002C5-Lv for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:10:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33762) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQY-0008L4-L7 for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32851) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQY-0000Jz-Bn for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQY-0005ea-6U for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 22/33] gnu: emacs-realgud: Adjust to changes in emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:14 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867927921457 (code B ref 47661); Sat, 17 Apr 2021 17:08:14 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:07:59 +0000 Received: from localhost ([127.0.0.1]:44350 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQH-0005Zs-79 for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:59 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:55150) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQA-0005Yl-0s for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:52 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzzR5Ndyz1LBRw for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:07:47 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzzR5Ndyz1LBRw DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679267; bh=BS+tUd2rwImxp3ik3BqsqbiO1kWnJOuUxiAz7LMrFB8=; h=From:To:Subject:Date:In-Reply-To:References:From; b=mWMRKsuNDjhL91Bkv0/iJjetW6QG8Fq0jq3x0AvxOMilvwd4GPaJ5ACMZbJxwtBDn BOCRQkh0adCNvn/U6bgoJxPCYsMRnsZC6wxlMHB9XdWvNrE8GCo0vx4vxPW5uWFQxW sTXSfFhHtG3GqZf0cJVe29E+H0P6ZPee/IVAt/rc= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:37 +0200 Message-Id: <20210417170648.3810-22-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-realgud)[fix-autogen-script]: Move after ‘expand-load-path’. --- gnu/packages/emacs-xyz.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 40ab1f38a1..0dc7b8961b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7759,7 +7759,7 @@ after buffer changes.") "(require-relative-list \ '(\"../../common/run\") \"realgud:\")\n"))) #t)) - (add-after 'unpack 'fix-autogen-script + (add-after 'expand-load-path 'fix-autogen-script (lambda _ (substitute* "autogen.sh" (("./configure") "sh configure")) From patchwork Sat Apr 17 17:06:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28632 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 8372C27BC77; Sat, 17 Apr 2021 18:12:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A520827BC6C for ; Sat, 17 Apr 2021 18:12:16 +0100 (BST) Received: from localhost ([::1]:32966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoUR-0003br-QL for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:12:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33766) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQZ-0008Mz-39 for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32852) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQY-0000KC-Ps for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQY-0005eh-Kg for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:14 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 23/33] gnu: emacs-geiser: Update to 0.13. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:14 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Cc: Morgan Smith Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867928421525 (code B ref 47661); Sat, 17 Apr 2021 17:08:14 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:08:04 +0000 Received: from localhost ([127.0.0.1]:44353 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQJ-0005a2-Dj for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:08:04 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:2207) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQC-0005ZH-Aw for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:53 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzzT4T5jz1LBRx; Sat, 17 Apr 2021 19:07:49 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzzT4T5jz1LBRx DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679269; bh=PYi0BuEQ6UQRsIzo0KIE2kGpWbave/ZsrkryueoOb2E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RvcDkTA3p2tUoXGEX1G0lVI4LeGZkHfvZ3uMumSarGNJN1T0xxeiI7tTs9dSslKGi 44PJde82A4OeL44y5jh4CkmBMVeCzJdbiOWicFe85uEdAdOjDlDP7yefflzBY9rawi xCY4BGU7p6bcZumUH/+Ta/jnW1lIzamj98YOraPI= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:38 +0200 Message-Id: <20210417170648.3810-23-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches From: Morgan Smith * gnu/packages/patches/emacs-geiser-autoload-activate-implementation.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it here. * gnu/packages/emacs-xyz.scm (emacs-geiser): Update to 0.13. [source]: Change upstream URL. [build-system]: Change to emacs-build-system. [arguments]: Adjust accordingly. [native-inputs]: Remove emacs, autoconf, and automake. [description]: State that other packages are needed for geiser to be useful. Signed-off-by: Leo Prikler --- gnu/local.mk | 1 + gnu/packages/emacs-xyz.scm | 46 +++++++++++-------- ...ser-autoload-activate-implementation.patch | 26 +++++++++++ 3 files changed, 54 insertions(+), 19 deletions(-) create mode 100644 gnu/packages/patches/emacs-geiser-autoload-activate-implementation.patch diff --git a/gnu/local.mk b/gnu/local.mk index 50b11a8ca2..393fa61bf5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -968,6 +968,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-exec-path.patch \ %D%/packages/patches/emacs-exwm-fix-fullscreen-states.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ + %D%/packages/patches/emacs-geiser-autoload-activate-implementation.patch \ %D%/packages/patches/emacs-ignore-empty-xim-styles.patch \ %D%/packages/patches/emacs-json-reformat-fix-tests.patch \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0dc7b8961b..85295524a5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -219,43 +219,51 @@ (define-public emacs-geiser (package (name "emacs-geiser") - (version "0.12") + (version "0.13") (source (origin (method git-fetch) (uri (git-reference - (url "https://gitlab.com/jaor/geiser/") + (url "https://gitlab.com/emacs-geiser/geiser.git") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0n718xpys7v94zaf9lpmsx97qgn6qxif1acr718wyvpmfr4hiv08")))) - (build-system gnu-build-system) + (base32 "0bwjcfmcyv6z0i5ivqirgcibxdkrlf5vyxcbj7k8dk7flwg1fpd9")) + (patches + (search-patches "emacs-geiser-autoload-activate-implementation.patch")))) + (build-system emacs-build-system) (arguments '(#:phases (modify-phases %standard-phases - (add-after 'install 'post-install - (lambda* (#:key outputs #:allow-other-keys) - (symlink "geiser-install.el" - (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp/" - "geiser-autoloads.el")) - #t))))) - (inputs - `(("guile" ,guile-2.2))) + ;; Move the source files to the top level, which is included in + ;; the EMACSLOADPATH. + (add-after 'unpack 'move-source-files + (lambda _ + (let ((el-files (find-files "./elisp" ".*\\.el$"))) + (for-each (lambda (f) + (rename-file f (basename f))) + el-files)) + #t)) + (add-before 'install 'make-info + (lambda _ + (with-directory-excursion "doc" + (invoke "makeinfo" "--no-split" + "-o" "geiser.info" "geiser.texi"))))))) (native-inputs - `(("emacs" ,emacs-minimal) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("texinfo" ,texinfo))) + `(("texinfo" ,texinfo))) (home-page "https://nongnu.org/geiser/") - (synopsis "Collection of Emacs modes for Guile and Racket hacking") + (synopsis "Collection of Emacs modes for Scheme hacking") (description "Geiser is a collection of Emacs major and minor modes that conspire with one or more Scheme implementations to keep the Lisp Machine Spirit alive. The continuously running Scheme interpreter takes the center of the stage in Geiser. A bundle of Elisp shims orchestrates the dialog between the Scheme implementation, Emacs and, ultimately, the schemer, giving them access to live -metadata.") +metadata. + +This package provides just the core of Geiser. To effectively use it with your +favourite Scheme implementation, you also need the corresponding geiser package, +e.g. emacs-geiser-guile for Guile.") (license license:bsd-3))) (define-public emacs-ac-geiser diff --git a/gnu/packages/patches/emacs-geiser-autoload-activate-implementation.patch b/gnu/packages/patches/emacs-geiser-autoload-activate-implementation.patch new file mode 100644 index 0000000000..47d513b3a3 --- /dev/null +++ b/gnu/packages/patches/emacs-geiser-autoload-activate-implementation.patch @@ -0,0 +1,26 @@ +From 9fd3174cead8bfa17a8413bffa38362853d71a02 Mon Sep 17 00:00:00 2001 +From: jao +Date: Mon, 5 Apr 2021 23:06:56 +0100 +Subject: [PATCH] autoload geiser activate implementation + +--- + elisp/geiser.el | 3 +++ + readme.org | 4 ++-- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/elisp/geiser.el b/elisp/geiser.el +index 887b8da..96c1dd6 100644 +--- a/elisp/geiser.el ++++ b/elisp/geiser.el +@@ -104,6 +104,9 @@ + ;;;###autoload + (autoload 'geiser-mode--maybe-activate "geiser-mode") + ++;;;###autoload ++(autoload 'geiser-activate-implementation "geiser-impl") ++ + ;;;###autoload + (mapc (lambda (group) + (custom-add-load group (symbol-name group)) +-- +GitLab From patchwork Sat Apr 17 17:06:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28633 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 18FAF27BC77; Sat, 17 Apr 2021 18:12:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 16BEC27BC6C for ; Sat, 17 Apr 2021 18:12:32 +0100 (BST) Received: from localhost ([::1]:33718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoUh-00040d-Bo for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:12:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33772) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQZ-0008On-HM for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:15 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32853) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQZ-0000Kr-6c for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQZ-0005ep-27 for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 24/33] gnu: Add emacs-geiser-guile. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:15 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Cc: Morgan Smith Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867928521545 (code B ref 47661); Sat, 17 Apr 2021 17:08:15 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:08:05 +0000 Received: from localhost ([127.0.0.1]:44362 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQO-0005b8-GI for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:08:05 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:50472) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQE-0005Za-IQ for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:55 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzzW6jvrz1DDYw; Sat, 17 Apr 2021 19:07:51 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzzW6jvrz1DDYw DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679272; bh=oHRhjYLTkFXbQz3b7yTNkqT/Rt/SaHEJmxPrZFgsEEE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TgULysSv2mqDXSodkjwa/VZbdS9jLdBuxLgQL1+WriI7f3TqIuOsF8tsTb52acuGO pm84HW2tIXVkBhhFlJts4e9RPuo5vCitauqBJCwIZk59aQd7baMD7R30z0N6zwbCn1 f3X50Mm1uAyvVsrvmed+migyxu4V6LRF4f5Y8uTg= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:39 +0200 Message-Id: <20210417170648.3810-24-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches From: Morgan Smith * gnu/packages/patches/emacs-geiser-guile-auto-activate.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it here. * gnu/packages/emacs-xyz.scm (emacs-geiser-guile): New variable. Signed-off-by: Leo Prikler --- gnu/local.mk | 1 + gnu/packages/emacs-xyz.scm | 42 +++++++++++++++++++ .../emacs-geiser-guile-auto-activate.patch | 34 +++++++++++++++ 3 files changed, 77 insertions(+) create mode 100644 gnu/packages/patches/emacs-geiser-guile-auto-activate.patch diff --git a/gnu/local.mk b/gnu/local.mk index 393fa61bf5..9c632fc2d7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -968,6 +968,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-exec-path.patch \ %D%/packages/patches/emacs-exwm-fix-fullscreen-states.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ + %D%/packages/patches/emacs-geiser-guile-auto-activate.patch \ %D%/packages/patches/emacs-geiser-autoload-activate-implementation.patch \ %D%/packages/patches/emacs-ignore-empty-xim-styles.patch \ %D%/packages/patches/emacs-json-reformat-fix-tests.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 85295524a5..38b3ed0687 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -266,6 +266,48 @@ favourite Scheme implementation, you also need the corresponding geiser package, e.g. emacs-geiser-guile for Guile.") (license license:bsd-3))) +(define-public emacs-geiser-guile + (package + (name "emacs-geiser-guile") + (version "0.13") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/emacs-geiser/guile.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0w264pjwlxna31260ll6gd0n77jlynhzf3h2dws5wr7jflns5mbc")) + (patches (search-patches + "emacs-geiser-guile-auto-activate.patch")))) + (build-system emacs-build-system) + (arguments + '(#:include (cons "^src/" %default-include) + #:phases + (modify-phases %standard-phases + (add-after 'make-autoloads 'patch-autoloads + (lambda* (#:key outputs #:allow-other-keys) + (substitute* (string-append + (elpa-directory (assoc-ref outputs "out")) + "/geiser-guile-autoloads.el") + ;; Activating implementations fails when Geiser is not yet + ;; loaded, so let's defer that until it is. + (("\\(geiser-activate-implementation .*\\)" all) + (string-append + "(eval-after-load 'geiser-impl '" all ")"))) + #t))))) + (inputs + `(("guile" ,guile-2.2))) + (propagated-inputs + `(("geiser" ,emacs-geiser))) + (home-page "https://nongnu.org/geiser/") + (synopsis "Guile Scheme support for Geiser") + (description + "This package adds support for the Guile Scheme implementation to Geiser, +a generic Scheme interaction mode for the GNU Emacs editor.") + (license license:bsd-3))) + (define-public emacs-ac-geiser (let ((commit "93818c936ee7e2f1ba1b315578bde363a7d43d05") (revision "0")) diff --git a/gnu/packages/patches/emacs-geiser-guile-auto-activate.patch b/gnu/packages/patches/emacs-geiser-guile-auto-activate.patch new file mode 100644 index 0000000000..44837f90df --- /dev/null +++ b/gnu/packages/patches/emacs-geiser-guile-auto-activate.patch @@ -0,0 +1,34 @@ +From 93ef7101fdfcc7eac6f465b4b9788c384a323c14 Mon Sep 17 00:00:00 2001 +From: jao +Date: Mon, 5 Apr 2021 20:17:50 +0100 +Subject: [PATCH] fix: auto-activate guile implementation + +--- + geiser-guile.el | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/geiser-guile.el b/geiser-guile.el +index 340442b..deeb76f 100644 +--- a/geiser-guile.el ++++ b/geiser-guile.el +@@ -25,6 +25,7 @@ + (require 'geiser-syntax) + (require 'geiser-custom) + (require 'geiser-repl) ++(require 'geiser-impl) + (require 'geiser-base) + (require 'geiser-eval) + (require 'geiser-edit) +@@ -474,6 +475,9 @@ it spawn a server thread." + + (geiser-impl--add-to-alist 'regexp "\\.scm$" 'guile t) + ++;;;###autoload ++(geiser-activate-implementation 'guile) ++ + ;;;###autoload + (autoload 'run-guile "geiser-guile" "Start a Geiser Guile REPL." t) + +-- +GitLab + From patchwork Sat Apr 17 17:06:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28620 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 0E5D827BC78; Sat, 17 Apr 2021 18:10:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 848EA27BC77 for ; Sat, 17 Apr 2021 18:10:24 +0100 (BST) Received: from localhost ([::1]:58548 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoSd-0002I5-Li for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:10:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQa-0008Qh-2Q for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32854) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQZ-0000LO-Md for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQZ-0005ew-FZ for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 25/33] gnu: emacs-guix: Update to 0.5.2-4.8ce6d21. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:15 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Cc: Morgan Smith Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867928621558 (code B ref 47661); Sat, 17 Apr 2021 17:08:15 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:08:06 +0000 Received: from localhost ([127.0.0.1]:44366 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQP-0005bT-CN for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:08:05 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:50755) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQG-0005Zk-Nh for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:57 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzzZ1MGNz1LBCm; Sat, 17 Apr 2021 19:07:54 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzzZ1MGNz1LBCm DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679274; bh=1ZawuDLpOiGEWDHR24TMt6heqqNuxCt/a3vsru+UfAE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Tgj5jFpygvJaG8mVWLZacXbnRWo5idoGCW+DlMrg+akTd01Z+aZO+UCTXQcsWW14N /ohyQ+dQ769zB9Y/Y0UuRMZfh9WKjcJ8UggOPEtHLD0uo6YbQd09k1zZJarNm0gfZJ +bx7W0s6gifyo+mI/D8jXCVhVVfmfrsxXXjXetMQ= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:40 +0200 Message-Id: <20210417170648.3810-25-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches From: Morgan Smith * gnu/packages/emacs-xyz.scm (emacs-guix): Update to 0.5.2-4.8ce6d21. [source]: Update upstream URL. [propagated-inputs]: Add emacs-geiser-guile. Signed-off-by: Leo Prikler --- gnu/packages/emacs-xyz.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 38b3ed0687..46716f9b5d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3080,8 +3080,8 @@ type, for example: packages, buffers, files, etc.") (license license:gpl3+))) (define-public emacs-guix - (let* ((commit "a694fdbcedb6edd2239a31d326e475c763ee32f8") - (revision "3")) + (let ((commit "8ce6d219e87c5097abff9ce6f1f5a4293cdfcb31") + (revision "4")) (package (name "emacs-guix") (version (git-version "0.5.2" revision commit)) @@ -3089,12 +3089,12 @@ type, for example: packages, buffers, files, etc.") (method git-fetch) (uri (git-reference ;; TODO: Use the official version when it has a new home - (url "https://github.com/jsoo1/guix.el") + (url "https://github.com/alezost/guix.el") (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 - "1pqw7zbgxzwpig4xr0izc3z8h80c72i6bl5yi12br0d7aq6dbkvj")))) + "0awbd8x154c4dk4av7inpgd63n07xzng84vvc8qckmgljknc0j7k")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) @@ -3125,6 +3125,7 @@ type, for example: packages, buffers, files, etc.") ("guix" ,guix))) (propagated-inputs `(("geiser" ,emacs-geiser) + ("geiser-guile" ,emacs-geiser-guile) ("guile-gcrypt" ,guile-gcrypt) ("dash" ,emacs-dash) ("bui" ,emacs-bui) From patchwork Sat Apr 17 17:06:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28634 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 465E427BC77; Sat, 17 Apr 2021 18:12:51 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C463527BC6C for ; Sat, 17 Apr 2021 18:12:50 +0100 (BST) Received: from localhost ([::1]:34370 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoV0-0004Ln-1k for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:12:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33782) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQa-0008Rq-HU for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32855) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQa-0000Lq-5q for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:16 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQZ-0005f4-VQ for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 26/33] gnu: emacs-flycheck-guile: Add missing input. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:15 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Cc: Morgan Smith Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867928621568 (code B ref 47661); Sat, 17 Apr 2021 17:08:15 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:08:06 +0000 Received: from localhost ([127.0.0.1]:44369 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQP-0005bf-PP for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:08:06 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:3142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQI-0005Zu-SG for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:07:59 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzzc2PcKz1LBCr; Sat, 17 Apr 2021 19:07:56 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzzc2PcKz1LBCr DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679276; bh=gin8Vgs/JdoIDtBhGgWDl9t+boaDbDd5w2TLi3LgMmc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mvAMERmuUCUkT8d286pQta/HZPVhJP+DqK/8svPVL5vsgRZdnaBYfxe2zz7wTtGNd WnNfWdkwmtinPg6hl0yCZdDPXmY9kXc7W8y1XN7MCeZHQECWngp6In5wPl/VfQeEBz 1qnfUmT/9dtbuM32CaMxWWBVSDSS/GbZOzOsDZXs= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:41 +0200 Message-Id: <20210417170648.3810-26-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches From: Morgan Smith * gnu/packages/emacs-xyz.scm (emacs-flycheck-guile)[propagated-inputs]: Add emacs-geiser-guile. Signed-off-by: Leo Prikler --- gnu/packages/emacs-xyz.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 46716f9b5d..2a28e98bff 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5111,7 +5111,8 @@ repetitions for example).") (base32 "0cs5r0ik6a3bl1k3imjl0r8y1i69kx9x9m9cgxj470qk34brwyj5")))) (propagated-inputs `(("emacs-flycheck" ,emacs-flycheck) - ("emacs-geiser" ,emacs-geiser))) + ("emacs-geiser" ,emacs-geiser) + ("emacs-geiser-guile" ,emacs-geiser-guile))) (build-system emacs-build-system) (home-page "https://github.com/flatwhatson/flycheck-guile") (synopsis "GNU Guile support for Flycheck") From patchwork Sat Apr 17 17:06:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28624 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 140A127BC6C; Sat, 17 Apr 2021 18:10:47 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4146627BC77 for ; Sat, 17 Apr 2021 18:10:46 +0100 (BST) Received: from localhost ([::1]:59310 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoSz-0002bR-DC for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:10:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33792) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQa-0008Sh-TT for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:16 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32856) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQa-0000M2-JR for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:16 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQa-0005fB-DH for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 27/33] gnu: guile-studio: Add missing input. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:16 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Cc: Morgan Smith Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867928621581 (code B ref 47661); Sat, 17 Apr 2021 17:08:16 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:08:06 +0000 Received: from localhost ([127.0.0.1]:44371 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQQ-0005bp-70 for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:08:06 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:51206) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQK-0005aB-MP for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:08:00 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzzf3RkZz1LBCm; Sat, 17 Apr 2021 19:07:58 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzzf3RkZz1LBCm DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679278; bh=qFJwL/qy2cPFSEe71nbYRXpRN90GCXahYOMm7rOU954=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hV67yQvMUnwElqxFFIsmmoB+jRE+eWNvmae1H37fHSAf7Qyv4N1YCm7CU0hz8NhPC NeQEwG2omuKiRoHKSUeZ5c5zibehMlb9b0fgPX7tuN8lBGcDW7PiZDj7q7AYuBhwK4 ghusimdLyHa8yAm9yJsB0qVIz/Csw7IhabXRx3Ds= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:42 +0200 Message-Id: <20210417170648.3810-27-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches From: Morgan Smith * gnu/packages/guile-xyz.scm (guile-studio)[inputs]: Add emacs-geiser-guile. Signed-off-by: Leo Prikler --- gnu/packages/guile-xyz.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 089a9a3b55..42e3737d99 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2742,6 +2742,7 @@ The picture values can directly be displayed in Geiser.") ("emacs-doom-modeline" ,emacs-doom-modeline) ("emacs-modus-themes" ,emacs-modus-themes) ("emacs-geiser" ,emacs-geiser) + ("emacs-geiser-guile" ,emacs-geiser-guile) ("emacs-company" ,emacs-company) ("emacs-ivy" ,emacs-ivy) ("emacs-flycheck" ,emacs-flycheck) From patchwork Sat Apr 17 17:06:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28625 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 6F26F27BC78; Sat, 17 Apr 2021 18:10:48 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CDEDA27BC6C for ; Sat, 17 Apr 2021 18:10:47 +0100 (BST) Received: from localhost ([::1]:59478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoT0-0002fb-TS for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:10:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33798) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQb-0008UG-8S for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:17 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32857) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQb-0000ML-04 for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:17 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQa-0005fI-RA for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 28/33] gnu: geiser-gauche: Adjust to changes in emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:16 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867929021648 (code B ref 47661); Sat, 17 Apr 2021 17:08:16 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:08:10 +0000 Received: from localhost ([127.0.0.1]:44381 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQT-0005cz-M1 for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:08:09 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:51455) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQM-0005aU-Oa for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:08:03 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzzh2G2Fz1LB1y for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:08:00 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzzh2G2Fz1LB1y DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679280; bh=apHEcMxVIKwZJ+27wfiL/fiyr6czFLuLilzuDOMZtAw=; h=From:To:Subject:Date:In-Reply-To:References:From; b=aKweUdoOIXu61AlHfo8WpHH38Pesh8CvS9L8rvwUFb7I/ro2if9Z5s3xBgT0K7ufF Ukq215dmY11no345W30DhS3gj895j0kYmtEiuOozoLXzPaZ2BsiVHVaLHidUBIKt0d ZEEtvzXH+ZMS6rZL2orl3Iw8vPtefmaE02VSxgsM= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:43 +0200 Message-Id: <20210417170648.3810-28-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (geiser-gauche)[arguments]: Use #:include rather than #:phases to add geiser-gauche.scm. --- gnu/packages/emacs-xyz.scm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2a28e98bff..103d26e621 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -349,16 +349,7 @@ using geiser.") (base32 "0rxncnzx7qgcpvc8nz0sd8r0hwrplazzraahdwhbpq0q6z8ywqgg")))) (build-system emacs-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'install 'install-scheme - (lambda* (#:key outputs #:allow-other-keys) - (install-file - "geiser-gauche.scm" - (string-append - (assoc-ref outputs "out") - "/share/emacs/site-lisp")) - #t))))) + `(#:include (cons "^geiser-gauche\\.scm$" %default-include))) (native-inputs `(("geiser" ,emacs-geiser))) (home-page "https://gitlab.com/emacs-geiser/gauche") From patchwork Sat Apr 17 17:06:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28627 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 CCA3527BC79; Sat, 17 Apr 2021 18:11:53 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0C4BC27BC77 for ; Sat, 17 Apr 2021 18:11:50 +0100 (BST) Received: from localhost ([::1]:60128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoU1-0002wl-5t for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:11:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33804) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQf-00005n-ME for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:21 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32858) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQd-0000N3-Eh for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:19 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQb-0005fQ-9T for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 29/33] gnu: emacs-dvc: Adjust to changes in emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:17 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867929021662 (code B ref 47661); Sat, 17 Apr 2021 17:08:17 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:08:10 +0000 Received: from localhost ([127.0.0.1]:44384 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQU-0005d6-0g for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:08:10 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:51709) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQO-0005b5-Ie for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:08:05 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzzk2rn2z1LB20 for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:08:02 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzzk2rn2z1LB20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679282; bh=+qPMVlRaLzsQTA7sJAm7PnvxLbhtc2GWbUlKlzVN7Ds=; h=From:To:Subject:Date:In-Reply-To:References:From; b=UDJ9/0DysOpgddMAKj0sAU2UH4YY5QHQU0AUGHvqGosCzZlMapfvu/TGaeXdWEMqo xz8KH4MKsiCvOBLBQe0FMpBhP7KrNC/wApKIcs3G2fy4Z2J5LZ8sCbC9O38iw2/+if plpRE4Zzlq/ft0nryZdlzXFcXlEhpPYFM4Ll4H7A= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:44 +0200 Message-Id: <20210417170648.3810-29-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-dvc)[#:configure-flags]: Use elpa-directory for lispdir. --- gnu/packages/emacs-xyz.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 103d26e621..ee3df7cf19 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5243,9 +5243,15 @@ completion of relevant keywords.") (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments - `(#:configure-flags - (list (string-append "--with-lispdir=" (assoc-ref %outputs "out") - "/share/emacs/site-lisp/")) + `(#:modules ((guix build gnu-build-system) + ((guix build emacs-build-system) #:prefix emacs:) + (guix build utils)) + #:imported-modules (,@%gnu-build-system-modules + (guix build emacs-build-system) + (guix build emacs-utils)) + #:configure-flags + (list (string-append "--with-lispdir=" + (emacs:elpa-directory (assoc-ref %outputs "out")))) #:tests? #f ;no test suite #:phases (modify-phases %standard-phases From patchwork Sat Apr 17 17:06:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28630 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 EE05427BC77; Sat, 17 Apr 2021 18:12:15 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8437827BC6C for ; Sat, 17 Apr 2021 18:12:15 +0100 (BST) Received: from localhost ([::1]:32818 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoUQ-0003YG-Nq for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:12:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQg-00006D-3N for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:22 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32861) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQd-0000Nj-RM for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:19 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQb-0005fY-MC for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 30/33] gnu: emacs-w3m: Adjust to changes in emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:17 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867929121676 (code B ref 47661); Sat, 17 Apr 2021 17:08:17 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:08:11 +0000 Received: from localhost ([127.0.0.1]:44386 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQU-0005dK-C3 for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:08:10 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:57274) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQQ-0005bn-Ci for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:08:07 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzzm1L1Rz1LB1y for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:08:04 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzzm1L1Rz1LB1y DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679284; bh=hF3nvnkG8M+/Kv0lDrMaCP1XusduTmPyumX681h1G38=; h=From:To:Subject:Date:In-Reply-To:References:From; b=D9zc2ZEopBR2DWoRE712NVKdy77erSJyPoquTwaIc7XW4NdaesjUoDOzDpGYGv2cH zvHy7nYqfiOOSuA9+Ldbq4wCTCu7JIxFKJV4NuVSZVn7c4vPcPXSu2XdfM5aBnyDjp hnrvIu2Pf+TSWQEiIJWNx8xUpVbHA6WRlbKC19jU= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:45 +0200 Message-Id: <20210417170648.3810-30-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-w3m)[#:configure-flags]: Use elpa-directory to determine lispdir. [#:phases]: Likewise. --- gnu/packages/emacs-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ee3df7cf19..949659e617 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1721,14 +1721,16 @@ or unexpected behavior inside an elisp configuration file (typically ("imagemagick" ,imagemagick))) (arguments `(#:modules ((guix build gnu-build-system) + ((guix build emacs-build-system) #:prefix emacs:) (guix build utils) (guix build emacs-utils)) #:imported-modules (,@%gnu-build-system-modules + (guix build emacs-build-system) (guix build emacs-utils)) #:configure-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "--with-lispdir=" - out "/share/emacs/site-lisp") + (emacs:elpa-directory out)) (string-append "--with-icondir=" out "/share/images/emacs-w3m") ;; Leave .el files uncompressed, otherwise GC can't @@ -1773,8 +1775,7 @@ or unexpected behavior inside an elisp configuration file (typically (lambda* (#:key outputs #:allow-other-keys) (invoke "make" "install" "install-icons") (with-directory-excursion - (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp") + (emacs:elpa-directory (assoc-ref outputs "out")) (for-each delete-file '("ChangeLog" "ChangeLog.1")) (symlink "w3m-load.el" "w3m-autoloads.el") #t)))))) From patchwork Sat Apr 17 17:06:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28629 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 E43F027BC78; Sat, 17 Apr 2021 18:11:55 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4101B27BC6C for ; Sat, 17 Apr 2021 18:11:52 +0100 (BST) Received: from localhost ([::1]:60402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoU3-00033W-EL for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:11:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33810) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQg-00006H-Ha for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:22 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32862) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQe-0000OH-9b for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:20 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQc-0005fe-4T for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:18 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 31/33] gnu: emacs-wget: Port to emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:08:18 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867929121690 (code B ref 47661); Sat, 17 Apr 2021 17:08:18 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:08:11 +0000 Received: from localhost ([127.0.0.1]:44390 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQU-0005dV-VD for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:08:11 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:57662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQS-0005cX-Ft for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:08:08 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzzp04ZJz1LB20 for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:08:05 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzzp04ZJz1LB20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679286; bh=Q1UhrOdMk4Jp+YIo+fj5+fK/SM1QxuTXzwcHEmbmjcI=; h=From:To:Subject:Date:In-Reply-To:References:From; b=noSGWEbrTaXhrnn9ZYH9ybFGaTJVWayT0bXqc+Qil8Znx21JrJDVLk9MpQ0x3iF/M nQwXfC9Inh5mqs+wmD/OQz094HUMwRLaTLRr2fSCwuXFjP9FNLyw8nxyl763EwIrHd Vq50juKkK8BOsg/KRHtrpLMP3FNHbRo9TX6UEFZc= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:46 +0200 Message-Id: <20210417170648.3810-31-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-wget)[build-system]: Use emacs-build-system. [arguments]: Drop #:modules and #:imported-modules. Adjust #:phases accordingly. --- gnu/packages/emacs-xyz.scm | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 949659e617..90fe5b3a24 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1795,35 +1795,18 @@ or unexpected behavior inside an elisp configuration file (typically version ".orig.tar.gz")) (sha256 (base32 "10byvyv9dk0ib55gfqm7bcpxmx2qbih1jd03gmihrppr2mn52nff")))) - (build-system gnu-build-system) + (build-system emacs-build-system) (inputs `(("wget" ,wget))) (native-inputs `(("emacs" ,emacs-minimal))) (arguments - `(#:modules ((guix build gnu-build-system) - (guix build utils) - (guix build emacs-utils)) - #:imported-modules (,@%gnu-build-system-modules - (guix build emacs-utils)) - #:tests? #f ; no check target + `(#:tests? #f ; no check target #:phases (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "Makefile" - (("/usr/local") (assoc-ref outputs "out")) - (("/site-lisp/emacs-wget") "/site-lisp")) - #t)) - (add-before 'build 'patch-exec-paths + (add-after 'unpack 'patch-exec-paths (lambda* (#:key inputs outputs #:allow-other-keys) (let ((wget (assoc-ref inputs "wget"))) (emacs-substitute-variables "wget.el" ("wget-command" (string-append wget "/bin/wget")))) - #t)) - (add-after 'install 'post-install - (lambda* (#:key outputs #:allow-other-keys) - (emacs-generate-autoloads - "wget" (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp/")) #t))))) (home-page "https://www.emacswiki.org/emacs/EmacsWget") (synopsis "Simple file downloader for Emacs based on wget") From patchwork Sat Apr 17 17:06:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28628 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 E5EE127BC78; Sat, 17 Apr 2021 18:11:54 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1E5A727BC78 for ; Sat, 17 Apr 2021 18:11:51 +0100 (BST) Received: from localhost ([::1]:60240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoU2-0002zU-9f for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:11:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34122) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoRK-0001Yh-Sw for guix-patches@gnu.org; Sat, 17 Apr 2021 13:09:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32865) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoRK-0000tD-LH for guix-patches@gnu.org; Sat, 17 Apr 2021 13:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoRK-0005h3-GM for guix-patches@gnu.org; Sat, 17 Apr 2021 13:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 32/33] gnu: emacs-haskell-mode: Adjust to changes in emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867931321844 (code B ref 47661); Sat, 17 Apr 2021 17:09:02 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:08:33 +0000 Received: from localhost ([127.0.0.1]:44407 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQc-0005fX-LM for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:08:33 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:52478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQU-0005d4-AH for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:08:10 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzzr0kxhz1LB1y for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:08:08 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzzr0kxhz1LB1y DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679288; bh=PqzFaWxh0mtiyNpWxzsmN26tc2faQljCxhxpPubajkk=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ZluvTVYJH2poTYUiy6J4mbixbLEFZ5ksrtoSqfpOpjtBtobFD1xUSX0aOakm482o3 uL8VDrBq2F3uE91AYgMYEhqlZNgdnwTDy/d1VI+CKqugIg8Bz7fDPyV46o97zysvV9 JYTQWhLon9QnYBbBCdV+5LSkb/iukIjGb9p2dLrM= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:47 +0200 Message-Id: <20210417170648.3810-32-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-haskell-mode)[#:phases]: Install to elpa-directory. --- gnu/packages/emacs-xyz.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 90fe5b3a24..13d55af0e3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1241,7 +1241,11 @@ replacement.") "/bin/emacs")) #:modules ((ice-9 match) (srfi srfi-26) + ((guix build emacs-build-system) #:prefix emacs:) ,@%gnu-build-system-modules) + #:imported-modules (,@%gnu-build-system-modules + (guix build emacs-build-system) + (guix build emacs-utils)) #:phases (modify-phases %standard-phases (delete 'configure) @@ -1282,7 +1286,7 @@ replacement.") (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (el-dir (string-append out "/share/emacs/site-lisp")) + (el-dir (emacs:elpa-directory out)) (doc (string-append out "/share/doc/haskell-mode-" ,version)) (info (string-append out "/share/info"))) From patchwork Sat Apr 17 17:06:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28631 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 73FB627BC78; Sat, 17 Apr 2021 18:12:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AE0B127BC77 for ; Sat, 17 Apr 2021 18:12:17 +0100 (BST) Received: from localhost ([::1]:33084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoUS-0003f2-TQ for patchwork@mira.cbaines.net; Sat, 17 Apr 2021 13:12:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoRL-0001Zo-91 for guix-patches@gnu.org; Sat, 17 Apr 2021 13:09:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32866) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoRL-0000tW-24 for guix-patches@gnu.org; Sat, 17 Apr 2021 13:09:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoRK-0005hB-Tj for guix-patches@gnu.org; Sat, 17 Apr 2021 13:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 33/33] gnu: emacs-julia-snail: Adjust to changes in emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Apr 2021 17:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161867931421850 (code B ref 47661); Sat, 17 Apr 2021 17:09:02 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:08:34 +0000 Received: from localhost ([127.0.0.1]:44411 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQr-0005gG-Pa for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:08:34 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:4721) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQW-0005dt-2r for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:08:12 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzzs6RCmz1LB20 for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:08:09 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzzs6RCmz1LB20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679289; bh=7GS4geqdzenZo4oEzgmh2T8nZGQo0V0xOTBCldNmYdc=; h=From:To:Subject:Date:In-Reply-To:References:From; b=e4daKykultmaEK1fuGNnovNPolwuMtBjvg7gtGGMvOyUAQDgmQ2/mcFa1zuJEf1LA hysk041KVfebLP5VZbMXqzPzx0jWMngRKKp44RROH0fHvINVz1sGd7Zgmw3t/mIBDT XW6jXNo7tfvDZpCVVE1sdGgWsLRtx750LAQ9oWDM= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:48 +0200 Message-Id: <20210417170648.3810-33-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-julia-snail)[arguments]: Drop #:phases. Use #:include to add julia sources. --- gnu/packages/emacs-xyz.scm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 13d55af0e3..41ab0f6f98 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8891,14 +8891,7 @@ mode with the package emacs-julia-mode.") "065ix3jycsx3wvkq7a6060i93caxisdvgxgqb1l6rq15n4qln78y")))) (build-system emacs-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'install 'JuliaSnail-jl - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (install-file "JuliaSnail.jl" - (string-append out "/share/emacs/site-lisp/"))) - #t))))) + `(#:include (cons "^JuliaSnail\\.jl" %default-include))) (inputs `(("emacs-dash" ,emacs-dash) ("emacs-s" ,emacs-s)