From unknown Wed Sep 10 09:28:50 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#47661 <47661@debbugs.gnu.org> To: bug#47661 <47661@debbugs.gnu.org> Subject: Status: [PATCH 00/33] Improve Emacs UX. Reply-To: bug#47661 <47661@debbugs.gnu.org> Date: Wed, 10 Sep 2025 16:28:50 +0000 retitle 47661 [PATCH 00/33] Improve Emacs UX. reassign 47661 guix-patches submitter 47661 Leo Prikler severity 47661 normal tag 47661 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:47:01 2021 Received: (at submit) by debbugs.gnu.org; 8 Apr 2021 17:47:01 +0000 Received: from localhost ([127.0.0.1]:48153 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYk9-0003YP-AL for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:47:01 -0400 Received: from lists.gnu.org ([209.51.188.17]:60504) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYk6-0003YH-Va for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:47:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38848) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUYk6-00039k-Mz for guix-patches@gnu.org; Thu, 08 Apr 2021 13:46:58 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:42424) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUYk3-00023D-5O for guix-patches@gnu.org; Thu, 08 Apr 2021 13:46:57 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTGc6gW7z1LWny for ; Thu, 8 Apr 2021 19:46:48 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTGc6gW7z1LWny DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904008; bh=/DWxczuu6gelaTqcYAOqzB1kf516CzPt6x9jvmgOWfw=; h=From:To:Subject:Date:From; b=ZA3fkSqAi97/iIcf+V8WxbIxpesXRyDbXu9ov0Mt2RdLljmeU0rwWIukPLrun88Po +cUH8D72PagB0XrLb0Zg/aaMoQi0qBjvRwbOKnbSfENwOLwoFna1pD1eDPfal5DTd2 dAotwabKEFsHlysy2/FVSRMMvPW3W/MKoC4G9r64= From: Leo Prikler To: guix-patches@gnu.org Subject: [PATCH 00/33] Improve Emacs UX. Date: Thu, 8 Apr 2021 19:46:17 +0200 Message-Id: <20210408174616.13112-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 Received-SPF: pass client-ip=129.27.2.202; envelope-from=leo.prikler@student.tugraz.at; helo=mailrelay.tugraz.at X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) This patch set supersedes the wip-emacs branch. It can be deleted, once it's merged. Hi Guix, as you all recall, I recently put in some efforts into improving the Emacs user experience in Guix. There are three bugs addressed by this patch set: 1. Emacs libraries may inadvertently overwrite files in other libraries (solved by using ELPA-style subdirectories) 2. Emacs cannot find its own load-path after an update. (Solved with a wrapper). 3. Emacs can't find core programs, such as "ls" or "gzip". Below are some git statistics, have fun with them while I'm waiting for a bug number to send the patches :) Regards, Leo Leo Prikler (27): profiles: Add hook for Emacs subdirs. gnu: emacs: Wrap EMACSLOADPATH. gnu: emacs: Patch more program file names. build-system: emacs: Use subdirectories again. gnu: emacs-libgit: Adjust to changes in emacs-build-system. gnu: emacs-guix: Adjust to changes in emacs-build-system. gnu: emacs-telega: Adjust to changes in emacs-build-system. gnu: Add emacs-telega-contrib. gnu: emacs-emacsql: Adjust to changes in emacs-build-system. gnu: emacs-howm: Adjust to changes in emacs-build-system. gnu: emacs-ert-runner: Adjust to changes in emacs-build-system. gnu: emacs-shroud: Adjust to changes in emacs-build-system. gnu: emacs-sly-stepper: Adjust to changes in emacs-build-system. gnu: emacs-sly-stepper: Remove generated sources. gnu: emacs-org-contrib: Adjust to changes in emacs-build-system. gnu: emacs-edbi: Adjust to changes in emacs-build-system. gnu: emacs-scel: Adjust to changes in emacs-build-system. gnu: emacs-vterm: Adjust to changes in emacs-build-system. gnu: notmuch: Adjust to changes in emacs-build-system. gnu: emacs-pyim: Update to 3.6. gnu: emacs-realgud: Adjust to changes in emacs-build-system. gnu: geiser-gauche: Adjust to changes in emacs-build-system. gnu: emacs-dvc: Adjust to changes in emacs-build-system. gnu: emacs-w3m: Adjust to changes in emacs-build-system. gnu: emacs-wget: Port to emacs-build-system. gnu: emacs-haskell-mode: Adjust to changes in emacs-build-system. gnu: emacs-julia-snail: Adjust to changes in emacs-build-system. Morgan Smith (5): gnu: emacs-geiser: Update to 0.13. gnu: Add emacs-geiser-guile. gnu: emacs-guix: Update to 0.5.2-4.8ce6d21. gnu: emacs-flycheck-guile: Add missing input. gnu: guile-studio: Add missing input. Xinglu Chen (1): gnu: emacs-pdf-tools: Adjust to changes in emacs-build-system. gnu/local.mk | 2 + gnu/packages/emacs-xyz.scm | 369 ++++++++++-------- gnu/packages/emacs.scm | 52 ++- gnu/packages/guile-xyz.scm | 1 + gnu/packages/mail.scm | 3 +- ...ser-autoload-activate-implementation.patch | 26 ++ .../emacs-geiser-guile-auto-activate.patch | 34 ++ guix/build/emacs-build-system.scm | 70 ++-- guix/profiles.scm | 41 ++ guix/status.scm | 2 + 10 files changed, 391 insertions(+), 209 deletions(-) create mode 100644 gnu/packages/patches/emacs-geiser-autoload-activate-implementation.patch create mode 100644 gnu/packages/patches/emacs-geiser-guile-auto-activate.patch -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:50:37 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:50:38 +0000 Received: from localhost ([127.0.0.1]:48161 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYnc-0003ei-U8 for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:37 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:6561) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYna-0003eY-QZ for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:35 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTLv3Ld8z1LWpG for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:50:31 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTLv3Ld8z1LWpG DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904231; bh=J5bj57+Yt74u733Mf6T+Jaghn2u4TETbyXrzxPV4JCg=; h=From:To:Subject:Date:From; b=QPBYa1YKo4cuQMh8M1UOeS9xmrJkTyFzqI0dpHPrhBdujY/Ey3NEJMoTTdrIe4Z1p 74HVbo/j/uFAs1QZuPuvrTmDtYx1LPBsejBo183Zw577WHMNbq0/eT3wXSm0HMwDeQ 8Zubo80O43QMqjArfLIk6Mgs0J/vzEOePoWTNWlE= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 01/33] profiles: Add hook for Emacs subdirs. Date: Thu, 8 Apr 2021 19:49:35 +0200 Message-Id: <20210408175007.13360-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:50:39 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:50:39 +0000 Received: from localhost ([127.0.0.1]:48164 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYne-0003f5-Uk for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:39 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:10929) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYnc-0003eg-6M for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:36 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTLx2l6Pz1LWpZ for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:50:33 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTLx2l6Pz1LWpZ DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904233; bh=rohbZmPPKSSwuzeiqghl2Zl84+0Rb3cswo+vBJqdj/8=; h=From:To:Subject:Date:In-Reply-To:References:From; b=AEbktFEfibuKqJoXK1U9T+4WCDTNOMkGzRtloGjbJ/9YdzeS+AksYlwtt7ZLwUzTC OYQV+GzkYSL+a2srQGVaJ9y3RW13F9BX6mg8iW6R1dPezqY5l2IkbGTgh++5+iXE7v iGkWoPgR13FunCrd1dSxXosldDeHr1TPQw2Sinvo= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 02/33] gnu: emacs: Wrap EMACSLOADPATH. Date: Thu, 8 Apr 2021 19:49:36 +0200 Message-Id: <20210408175007.13360-2-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 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") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:50:40 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:50:40 +0000 Received: from localhost ([127.0.0.1]:48166 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYng-0003fE-9E for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:40 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:14142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYne-0003eq-1v for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:38 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTLz4gW9z1LWny for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:50:35 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTLz4gW9z1LWny DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904235; bh=Maz4zMth+hA493F08i2obhl+erojL0oiSNpPiQ2/BHo=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ITFiJ/JEgK9XMueAU0R6a1ar5gYJtQr8lOtkO7Nf1fzJwvz2SUNkdmK1esfZfzsfY jA5x2lWRR67jyk9z0nB2TflPM0apLxXkdGDzCAWUYP6kWByrHWS9HHLvNvuXkpQ3oi WTTbUY64epRj8FNDklv5UOxA8NY4h7WaaoE+Uq54= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 03/33] gnu: emacs: Patch more program file names. Date: Thu, 8 Apr 2021 19:49:37 +0200 Message-Id: <20210408175007.13360-3-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/emacs.scm (patch-program-file-names): Patch "ls", "sh" and "gzip". --- gnu/packages/emacs.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index e1b01ac22b..93db9fa242 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -136,6 +136,15 @@ "lisp/progmodes/sh-script.el") (("\"/bin/sh\"") (format #f "~s" (which "sh")))) + (substitute* "lisp/files.el" + (("\\(purecopy \"ls\"\\)") + (format #f "(purecopy ~s)" (which "ls")))) + (substitute* '("src/filelock.c" + "lisp/dired-aux.el" + "lisp/jka-compr.el" + "lisp/jka-cmpr-hook.el") + (("\"(sh\|gzip)\"" all cmd) + (format #f "~s" (which cmd)))) #t)) (add-before 'configure 'fix-/bin/pwd (lambda _ @@ -231,6 +240,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 +374,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))))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:50:43 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:50:43 +0000 Received: from localhost ([127.0.0.1]:48170 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYni-0003fT-Gh for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:43 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:14417) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYng-0003fD-Ef for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:41 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTM13r1bz1LWpG for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:50:37 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTM13r1bz1LWpG DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904237; bh=lfHuJ9JFLwibU5zrjF0yP0yF88mMyXDgL1d4imEHc2M=; h=From:To:Subject:Date:In-Reply-To:References:From; b=k4ZJF7w+Br1KuU1wpzy2MdyL03+rscBRKqZ4CrPUFaEjpQUG6jTVEebApdtno87PC SUj4qwc1AbaKcDAjAjtLwCLTZRNbm0C237HolEmVqul2Kf2JYRhpN3h2NPZYNxhbor xiBdKBCiMcCXOpMATy43EvWKrktplXhc+UZDjbWg= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 04/33] build-system: emacs: Use subdirectories again. Date: Thu, 8 Apr 2021 19:49:38 +0200 Message-Id: <20210408175007.13360-4-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:50:44 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:50:44 +0000 Received: from localhost ([127.0.0.1]:48172 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYnk-0003fi-3f for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:44 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:14662) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYni-0003fS-9z for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:42 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTM36f70z1LWny for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:50:39 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTM36f70z1LWny DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904239; bh=1XkRQ+SOU/eb7OI02c52aKSoejTiPy0EQGY9HuS3QBk=; h=From:To:Subject:Date:In-Reply-To:References:From; b=fvp7U5A3gdndac1ZtCli58+1UpfuFFxJuJZdWYUJyZaiIvxSdX85LnrzmiXngrwCb 1sinIlICuDWoT0hIixmZ06gz4J5tgHq5Sf//3BSJOgkyBw+uosavazdAXELYqP4gVp yO5oddwbBcSceldfQeVw7K9ad4DgNzlv9/4lnaaY= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 05/33] gnu: emacs-libgit: Adjust to changes in emacs-build-system. Date: Thu, 8 Apr 2021 19:49:39 +0200 Message-Id: <20210408175007.13360-5-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 8e80ccbb56..b0d5e0189c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -501,7 +501,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 _ -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:50:45 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:50:45 +0000 Received: from localhost ([127.0.0.1]:48175 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYnl-0003fv-Kb for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:45 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:8046) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYnk-0003fg-6L for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:44 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTM55c4Rz1LWpG for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:50:41 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTM55c4Rz1LWpG DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904241; bh=QSHpU62ZjkrPRi914NuyYzL+tCFZx3WjpGNysUxUwco=; h=From:To:Subject:Date:In-Reply-To:References:From; b=D21va5bIZIZM06gOGEKza6bQnd9GEnXh6i3yqpxoMMzpCVUFqQHEIiVZChxzEqnbn +3VUPfaoORHQ0FA3fR8GhKtWdeEDfHDBuaYpDmXtMWnYQ1EI5tv2WiRRJ7z2axL30W 7gQVpvW0i79LITu8vRau3YV9IusJ8zyD7IFQBnlg= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 06/33] gnu: emacs-guix: Adjust to changes in emacs-build-system. Date: Thu, 8 Apr 2021 19:49:40 +0200 Message-Id: <20210408175007.13360-6-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 b0d5e0189c..f918ade782 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3009,6 +3009,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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:50:48 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:50:48 +0000 Received: from localhost ([127.0.0.1]:48178 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYnn-0003gA-RL for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:48 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:12255) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYnm-0003g1-5p for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:46 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTM74pSfz1LWny for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:50:43 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTM74pSfz1LWny DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904243; bh=wFpOxO08PT99LU5tUj3mRkXt4L8gYo9gCd9HUUoDOrE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=F0oJ+dbBvK4WFR/AdJ9/MvTFnLLjVdgkoUzRmqFCZ9NJVNL0t5A+uApm8+fX+3cZ3 BgKJl8hFbdW3hbAEJjCW8jNckIRr3E2w5grqqlRwPjhyDCnJhh38S6/GoVO5hhKVXU q6+sv78iHaqIicTH3KjZ1Y73yCKa3082ba7OfhZk= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 07/33] gnu: emacs-telega: Adjust to changes in emacs-build-system. Date: Thu, 8 Apr 2021 19:49:41 +0200 Message-Id: <20210408175007.13360-7-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 f918ade782..fd38f023d3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25131,7 +25131,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") @@ -25147,24 +25149,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") @@ -25176,39 +25169,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. -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:50:50 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:50:50 +0000 Received: from localhost ([127.0.0.1]:48181 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYnq-0003gR-6c for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:50 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:12496) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYno-0003gB-C2 for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:49 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTM94jPGz1LWpG for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:50:45 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTM94jPGz1LWpG DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904245; bh=e+j59VVyPkRFUbFfmMUY4nVD6m1otf5QU4WEe2MT+N8=; h=From:To:Subject:Date:In-Reply-To:References:From; b=mXaui/6dbeAUwgYaUibbMFxlJdoO6yNwXKwcn/pS3wNmPdmPK2OhzSHmbq7X6mYqZ hRTCJl1muGJcJd0U5kKoeQ9Jown5Hy4J4Szs2+yCrTQ7hDSra4WeYOntUJdKFrrlPN WKd0R6CY7LOOQ8l8alkq/Uf/o3YCvJKauyu4JtZs= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 08/33] gnu: Add emacs-telega-contrib. Date: Thu, 8 Apr 2021 19:49:42 +0200 Message-Id: <20210408175007.13360-8-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 fd38f023d3..8861909bf1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25202,6 +25202,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") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:50:51 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:50:51 +0000 Received: from localhost ([127.0.0.1]:48184 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYnr-0003gg-Fo for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:51 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:36603) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYnq-0003gQ-8j for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:50 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTMC5zlxz1LWny for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:50:47 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTMC5zlxz1LWny DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904247; bh=Ro+IhA6HglDoDrQR30HDmY40iOfXh/oNIuMh2gJDZhQ=; h=From:To:Subject:Date:In-Reply-To:References:From; b=KWTNgrm/bfk2DZRVDvcqNZMC4FbiMwOZwGmHVH0uU4KMDQaGqk/YTOUe6+r+3hOoV x8KeO3TmhZH+PMMHqgXGutiDdZTuk1LiMqqMStClGABzRYQLnIBa0j7jM/++NKHOdD Mnxxc8JnM8Fq3L9m2FLdNZN9lBHQI9Wql+KbPH5M= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 09/33] gnu: emacs-emacsql: Adjust to changes in emacs-build-system. Date: Thu, 8 Apr 2021 19:49:43 +0200 Message-Id: <20210408175007.13360-9-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 8861909bf1..79c3c42613 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -15490,7 +15490,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") @@ -15501,7 +15500,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) @@ -15522,16 +15521,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") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:50:53 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:50:54 +0000 Received: from localhost ([127.0.0.1]:48187 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYnt-0003gw-NW for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:53 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:8951) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYns-0003gn-4B for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:52 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTMF5HkDz1LWpG for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:50:49 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTMF5HkDz1LWpG DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904249; bh=PbVKyicCKpJ91Wc8Rpi+frZbfL9qrRitezeL+FKjnL0=; h=From:To:Subject:Date:In-Reply-To:References:From; b=HV6tqCyqQgsO65zK1tuArxPsHzXmEum/9A2f4jX7QbEka1NI6AFe0ZIIZWjUPS+u1 QztrWZs29/k/XikMKhFlYuMBQwB9lpWImU8Xhrj0ae9ZhcZsYoJHqq0hnDq/sqkzrX 346JldJqH8hhc5lhv9mAkHWV+B+lwEewmu4rcCWU= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 10/33] gnu: emacs-howm: Adjust to changes in emacs-build-system. Date: Thu, 8 Apr 2021 19:49:44 +0200 Message-Id: <20210408175007.13360-10-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 79c3c42613..ecf0e7ace6 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2348,8 +2348,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)) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:50:55 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:50:55 +0000 Received: from localhost ([127.0.0.1]:48190 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYnu-0003h9-UE for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:55 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:13192) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYnt-0003gv-W2 for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:54 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTMH4HKzz1LWny for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:50:51 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTMH4HKzz1LWny DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904251; bh=k7SSbvAwgLlr0b8/kVqz6hBybNIz8vqxcyPhCZ+5wvo=; h=From:To:Subject:Date:In-Reply-To:References:From; b=qpvj8byCDcL7m74xEOnTkLU7Cg3ES1//WQoSMGZQsdLxsRAbwxp/fTFlCPqBUWWUf CY4f14cP04XkgVlkAvjGzpCNKtqCsX5e45XSd5JPvvkg2h+swczHxgAMBbo8971rer N84eTLWU7EAjiowgD1Pj/WwdLgh08TtDrgjG9ZhY= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 11/33] gnu: emacs-ert-runner: Adjust to changes in emacs-build-system. Date: Thu, 8 Apr 2021 19:49:45 +0200 Message-Id: <20210408175007.13360-11-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 ecf0e7ace6..7c26e872fe 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13181,8 +13181,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 -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:50:57 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:50:57 +0000 Received: from localhost ([127.0.0.1]:48193 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYnx-0003hP-64 for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:57 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:9467) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYnw-0003hH-0M for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:56 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTMK3Mr5z1LWpG; Thu, 8 Apr 2021 19:50:53 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTMK3Mr5z1LWpG DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904253; bh=kMaKwgj6UsLF13D57b+w/Im8qVgWw3+TzMSXXeKGr+I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n/7SDN2Ke+u90GokG36Ynoo2hk+iT+BrV8Is9ETvxR3hnwpTmQ10R44XfZVNIAlO8 RVtVFAMLoisU1HeXjxRfN/Jfgz8lDQf09eHmUpTxOjsu4lXyLWqVI7Z828tWekvEtl D9mkvrmhe3V3vOb3FSfTdCd444sgWfQsf5Z0ABN0= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 12/33] gnu: emacs-pdf-tools: Adjust to changes in emacs-build-system. Date: Thu, 8 Apr 2021 19:49:46 +0200 Message-Id: <20210408175007.13360-12-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: 47661 Cc: Xinglu Chen X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) 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 7c26e872fe..1902327265 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2917,8 +2917,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 -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:50:59 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:50:59 +0000 Received: from localhost ([127.0.0.1]:48196 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYnz-0003he-Dk for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:59 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:16416) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYnx-0003hX-SB for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:58 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTMM3QT7z1LWny for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:50:55 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTMM3QT7z1LWny DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904255; bh=HRhp55Wat0jic4gAFQLfijWeCmJB1RpXJIVUtau83cw=; h=From:To:Subject:Date:In-Reply-To:References:From; b=hG3dERGTjRnpfp2TWch0AbGE2USGAMCJQXMoxuOOH8vI3aE/p/+vO/ROlM5T6F6jr Hp5OMJhW2yK4aHWn+Oz9yjvkUCkqcuv5+PoyG2TKA2GRJ4SwKekvyMksE4bwKJ5Oht 51KLjnH9H5zs/wEjNyK2vd2e1eUUan1WGyOKokVo= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 13/33] gnu: emacs-shroud: Adjust to changes in emacs-build-system. Date: Thu, 8 Apr 2021 19:49:47 +0200 Message-Id: <20210408175007.13360-13-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 1902327265..96df1ecadd 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1049,6 +1049,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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:51:02 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:51:02 +0000 Received: from localhost ([127.0.0.1]:48199 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYo1-0003i0-N4 for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:02 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:16639) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYnz-0003hf-OL for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:00 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTMP2T79z1LWpZ for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:50:57 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTMP2T79z1LWpZ DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904257; bh=9ZGM1Y4FMfojT4bt5dJm3L1PCdycNoxCYpCGukMKr3o=; h=From:To:Subject:Date:In-Reply-To:References:From; b=L9apLV0CjgfpsU+dOYNiCmLsGjD+/OsHT7ASJxBz+Un0XmN4eSvcVK8b3PTc766ac 4gQ8xbtFw3Pfb9Evn++sRbhfmBMgdXGCpbBxmVBhubiMyEtRtW5gmgvkt0JAv5pnBq 6SC1yky8BUEBCPOBhwwUzpt56GuxYWTF71Otas+Y= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 14/33] gnu: emacs-sly-stepper: Adjust to changes in emacs-build-system. Date: Thu, 8 Apr 2021 19:49:48 +0200 Message-Id: <20210408175007.13360-14-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 96df1ecadd..8615269546 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10333,24 +10333,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"))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:51:03 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:51:03 +0000 Received: from localhost ([127.0.0.1]:48205 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYo3-0003id-5F for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:03 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:37946) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYo1-0003ht-Jy for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:02 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTMR1fzjz1LWny for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:50:59 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTMR1fzjz1LWny DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904259; bh=fmsnVXpvHvNp5VVDZIWZXuDvrM4RuOhz/PNNWR/6fkg=; h=From:To:Subject:Date:In-Reply-To:References:From; b=YZrWGB8MBU63xoBcC7Vc3KkRuVi6P3alavxyICKtmYVzkvvcDsrCvOpbXgKG3LHGp pPvwA6kdX9bj/S0j6tFRzi6HZTdTqj2bJsxJqugt/f+9iCRn62eTHJ78pDE3hjxF96 SC+tDGG2GZw/D5MV9sds6MmwsASQ4+ThGCEOJvA0= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 15/33] gnu: emacs-sly-stepper: Remove generated sources. Date: Thu, 8 Apr 2021 19:49:49 +0200 Message-Id: <20210408175007.13360-15-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 8615269546..53dd61e924 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -10326,7 +10326,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))) @@ -10336,9 +10341,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")) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:51:06 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:51:06 +0000 Received: from localhost ([127.0.0.1]:48216 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYo6-0003jj-DG for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:06 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:10544) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYo3-0003ic-FF for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:03 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTMT0jCPz1LWpZ for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:51:01 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTMT0jCPz1LWpZ DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904261; bh=KrUYgxW8taXkFUKUH44oWYI+s8snZKlGRJ4A/K7+V/w=; h=From:To:Subject:Date:In-Reply-To:References:From; b=bAQqHzjV+e5ZfwkWV/5cB6M9aCB1s9IyCDeoGvTl1ArZACc4ehZqVo7Ax9YbH9S7y 94Jgn8gmX8j8+mljH32k4/qBcj4h71Ek0Np4nztNiXIo2m/pmiB7R4nrAXt/RhSZ4q Ryuc4cgUNhT3yXxiZbbPvj6n8IUJrWPr4DbOeEK0= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 16/33] gnu: emacs-org-contrib: Adjust to changes in emacs-build-system. Date: Thu, 8 Apr 2021 19:49:50 +0200 Message-Id: <20210408175007.13360-16-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 53dd61e924..be000dede3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11116,8 +11116,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 -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:51:09 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:51:09 +0000 Received: from localhost ([127.0.0.1]:48224 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYo8-0003ka-ON for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:09 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:17408) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYo6-0003jX-7P for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:06 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTMV6lmQz1DH6p for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:51:02 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTMV6lmQz1DH6p DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904263; bh=DVUaVP6A9csp5hcBh/4XLN54LGcUr+eAWC7sGfQJXvI=; h=From:To:Subject:Date:In-Reply-To:References:From; b=bWzt/CzVjVHZtA/EeVqopZLxtGiLIWxCk93R4FFdWePgi89i++lmqWQehDfS1BDtP r3tv6kyWizgvDjwXPNcSwZKBIgkKyzhJiL6IwElOUyrCA4sFLwiJEUCY580Zip1a/U O8drPkguM7YVpbVsYe0d9eJBFaq8wE42VzzyMrcE= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 17/33] gnu: emacs-edbi: Adjust to changes in emacs-build-system. Date: Thu, 8 Apr 2021 19:49:51 +0200 Message-Id: <20210408175007.13360-17-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 be000dede3..f3d9f98189 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21419,17 +21419,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.") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:51:10 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:51:10 +0000 Received: from localhost ([127.0.0.1]:48227 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYo9-0003kv-OR for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:09 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:15022) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYo7-0003kE-UA for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:08 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTMY3r9Zz1DH6r for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:51:05 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTMY3r9Zz1DH6r DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904265; bh=X85pdlYFqXGX/9iaL2HVz6lbqhyyvQOTI90qd476Q6k=; h=From:To:Subject:Date:In-Reply-To:References:From; b=jSnm/X7Ad6gyewkE89FYFM2uPemYShgNAfZstBMzuDcZxo6t/yDt77N9bEnYx/2GY Q3kktVpOacWgqkfYbrXsGLuBQ2PzPHGm7pQkMzpY8vK0+c2Q4B4zcEFjKyQ3KQKu5g eGbLtiJGhHZs956zRvWHEma/VX/ZXjlT7ZOcKTXs= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 18/33] gnu: emacs-scel: Adjust to changes in emacs-build-system. Date: Thu, 8 Apr 2021 19:49:52 +0200 Message-Id: <20210408175007.13360-18-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 f3d9f98189..3e0650e87e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6087,12 +6087,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"))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:51:13 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:51:13 +0000 Received: from localhost ([127.0.0.1]:48231 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoD-0003lL-04 for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:13 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:11285) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYo9-0003ks-Q5 for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:10 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTMb2yZnz1DH6p for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:51:07 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTMb2yZnz1DH6p DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904267; bh=cErPvceOBp8zA+sx3QElEBtdt6a6Gf15F1h5siVflAU=; h=From:To:Subject:Date:In-Reply-To:References:From; b=WBqiKLonH2H8JCzXyPqRKRf8ziu3ySMgcU+/OzaSfBnQXismPkRQJtKuuTzR0OV3/ Rt1ggrJYLLYEzCDC8Wi+bs2AviCMt6LoUICrBG0n4FW3qL2nl2XurKPTk6yYbqGJIq DKHHakhMjogeKPiZQ05OD4Ret7WvLOaGeRaQD34c= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 19/33] gnu: emacs-vterm: Adjust to changes in emacs-build-system. Date: Thu, 8 Apr 2021 19:49:53 +0200 Message-Id: <20210408175007.13360-19-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 3e0650e87e..16e17bac0c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -21585,7 +21585,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" -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:51:14 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:51:14 +0000 Received: from localhost ([127.0.0.1]:48234 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoE-0003lX-Ae for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:14 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:11499) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoB-0003lD-MC for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:12 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTMd21N1z1DH6r for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:51:09 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTMd21N1z1DH6r DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904269; bh=a30NMckXo/U/Ka+ndWEYbBa7YsiLS4XtEnXL8RaYatk=; h=From:To:Subject:Date:In-Reply-To:References:From; b=fvyBSKVf0TyMdVz0Aw7moYZ6pF/5Y45/rPy7dNqgphPt/obeRITx70e+IPNRHk3iC DIYKp60HpYFuk9akxsWQxor6XvaQvqYA2beS773pNKLOhEaa7lNLZSrMMaGRrPHjDY Ce+NkeAOtexRMnyFG7Padbx32s9OpicBQGs7sZNo= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 20/33] gnu: notmuch: Adjust to changes in emacs-build-system. Date: Thu, 8 Apr 2021 19:49:54 +0200 Message-Id: <20210408175007.13360-20-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 56fae3fcba..abef94baf8 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1317,8 +1317,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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:51:16 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:51:16 +0000 Received: from localhost ([127.0.0.1]:48237 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoG-0003lm-Jj for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:16 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:15763) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoD-0003lS-RX for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:14 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTMg18Jtz1LWny for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:51:11 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTMg18Jtz1LWny DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904271; bh=A6rJYko+6iF2XC1/fakqKU7Iv0NGfMnnZtCA+zs1xIw=; h=From:To:Subject:Date:In-Reply-To:References:From; b=oIGvqKcYoI0JwWohtcqXl3FYZCpaAkmrGaVty22pBSTJ6vWKUsHSvi19O86ns5d0a DEuH3qv+1pdP/6n9IN4LhU8VAZV8qLBYxcNYbnRgvHT0Eq0dGOGeA15yqfgJqDXCuI iSpyJcaCbAoKUAuy41fZ5nVK7HHRKqKygRud7ecU= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 21/33] gnu: emacs-pyim: Update to 3.6. Date: Thu, 8 Apr 2021 19:49:55 +0200 Message-Id: <20210408175007.13360-21-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 16e17bac0c..c92277854d 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -12582,13 +12582,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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:51:20 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:51:20 +0000 Received: from localhost ([127.0.0.1]:48240 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoI-0003m6-R4 for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:20 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:18576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoF-0003lk-Nq for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:17 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTMj2Nm3z1LWpG for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:51:13 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTMj2Nm3z1LWpG DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904273; bh=qsrluS+LHdmWh7HBKmP8sk8rx3px+bglgyoqSocvjJ0=; h=From:To:Subject:Date:In-Reply-To:References:From; b=HXoCcTeYxGkBfqLuB/55LQx/ledI0uYhtI19wX5i07/RwMKKWfQbJko1WBaUsyM7q H8yVwc0CE+8oD/PeCZog6byh07AEMdQErJSGzDQHFmN6MgvLmpULmOM1m/ixTE9Zl5 EGKMApjdiOqW7LmBmw9bMvRWveE6627MU9c3tbyc= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 22/33] gnu: emacs-realgud: Adjust to changes in emacs-build-system. Date: Thu, 8 Apr 2021 19:49:56 +0200 Message-Id: <20210408175007.13360-22-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 c92277854d..ed731267dc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -7708,7 +7708,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")) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:51:28 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:51:28 +0000 Received: from localhost ([127.0.0.1]:48243 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoL-0003mM-R7 for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:28 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:40147) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoI-0003lu-4S for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:18 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTMl1Y2nz1LWny; Thu, 8 Apr 2021 19:51:15 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTMl1Y2nz1LWny DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904275; bh=eI1aFUIaXmgKW+RMGFgcnVhmj0Qrw14X/Per5Jxcpq8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ULV8H7VE/H5atoY1VIPq+uFjwBDj+0Uyfa+aEWE7ncureOLgHuvEh0z6rp58B2or6 FdeHVA+rXVxifqeq9OoSoxnEGFoJvH6OFb0Hp/v4NH4atJgwU+KO1fmFkYK4eb5rCC bGumGU5jxhsslAzFdX9ecdPblTIX+a+JQUQWa8yA= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 23/33] gnu: emacs-geiser: Update to 0.13. Date: Thu, 8 Apr 2021 19:49:57 +0200 Message-Id: <20210408175007.13360-23-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 Cc: Morgan Smith X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 075504e302..c4eb1ab1f5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -967,6 +967,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 ed731267dc..74f82293fc 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -217,43 +217,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 -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:51:29 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:51:29 +0000 Received: from localhost ([127.0.0.1]:48248 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoS-0003mr-OY for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:29 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:40439) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoK-0003m8-DY for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:21 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTMn4M6pz1LWpZ; Thu, 8 Apr 2021 19:51:17 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTMn4M6pz1LWpZ DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904277; bh=I+5QoBEKmP1DvwvgFWake5mhPnvc8vy6fbWyCMDzSQw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e2vlnxD8ezgQJETiW4tmhwlpE1i258vaaxWffP6NZLeJVjHwkZ7SWGnz1YQpuRYny QWYd5xb2MMfIgRwmRCY7J6NmmhZScufATEDKBiLbrx/lAXbxwUXpfPw00oVjJHOaY7 6T/1zCbZDnSmR1dCMTQoHVhnfk2Dhchkd5EdwIWg= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 24/33] gnu: Add emacs-geiser-guile. Date: Thu, 8 Apr 2021 19:49:58 +0200 Message-Id: <20210408175007.13360-24-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 Cc: Morgan Smith X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 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 c4eb1ab1f5..2175e542d9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -967,6 +967,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 74f82293fc..dc1b1e0c7e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -264,6 +264,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 + -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:51:29 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:51:30 +0000 Received: from localhost ([127.0.0.1]:48251 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoT-0003n4-MP for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:29 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:19407) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoM-0003mN-MA for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:22 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTMq6NXYz1LWny; Thu, 8 Apr 2021 19:51:19 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTMq6NXYz1LWny DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904279; bh=ps7IjnpxVH82JWQZIwYV1w5wf2z7P215MczvMIa7P5A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZhRS/o+ymNBLnfT3qvBXW+h5UmVcMK7xL9+jPmDDnGqSH3IVoyzd0ZGY/7ZUtlVDZ Z2IrHiXgtAFmaP9tA+Cp2TnWxXt5q5g5HPHSVB1GOG4RGeNAAYld1s+2O4MaMXPPno pQTGwc5hMSZu7WmOt9M3XHxsANCPOx7s+370pklY= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 25/33] gnu: emacs-guix: Update to 0.5.2-4.8ce6d21. Date: Thu, 8 Apr 2021 19:49:59 +0200 Message-Id: <20210408175007.13360-25-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 Cc: Morgan Smith X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 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 dc1b1e0c7e..95699088f1 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -3055,8 +3055,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)) @@ -3064,12 +3064,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) @@ -3100,6 +3100,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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:51:30 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:51:30 +0000 Received: from localhost ([127.0.0.1]:48253 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoT-0003nB-UN for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:30 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:17110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoO-0003mX-SE for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:25 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTMt18x6z1LWpG; Thu, 8 Apr 2021 19:51:22 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTMt18x6z1LWpG DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904282; bh=NGSNV4tuU1mKcWD6geyoT671Nv8ru2/pQfvQLMcZReQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nZReEiTjz9G5rm8rhEobwGK6dpe07pCpr2Ok8QFn9NcOBqfmaAZTB2rgA8rJI2hzy qWeCcre41+caTvzCKhYvdqaGnSoc4661o9UGjveWlcdb8AKnpybOG0fLefMcOTyxXm 036Xis+/9oC+7SEVC2Y/qaYGljCGHa9m/sFJ4mrA= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 26/33] gnu: emacs-flycheck-guile: Add missing input. Date: Thu, 8 Apr 2021 19:50:00 +0200 Message-Id: <20210408175007.13360-26-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 Cc: Morgan Smith X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 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 95699088f1..29238e1b16 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5060,7 +5060,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") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:51:45 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:51:45 +0000 Received: from localhost ([127.0.0.1]:48255 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoU-0003nI-55 for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:45 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:17314) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoQ-0003mh-Pj for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:27 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTMw2V2cz1LWny; Thu, 8 Apr 2021 19:51:24 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTMw2V2cz1LWny DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904284; bh=1lQcalawQ8TErzYXWb2PIn03LTlcadGPKa9sotUlIRI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VGKe8xnI99NKclPtvUSrJbxLyuir70rf0EudHLh8C0kKaXTS50vBZvpk42x1R/6eb FuF+EPHHEJK21dI+8WWmtoe2BH94gt35FkAqqDVbLpVZj3AcAOxG3xmazLpACFGd/C UkHsct/JzPPdGrssHspdpvHagkhgPZNYaMrnPFLg= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 27/33] gnu: guile-studio: Add missing input. Date: Thu, 8 Apr 2021 19:50:01 +0200 Message-Id: <20210408175007.13360-27-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 Cc: Morgan Smith X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 e2ee5454a0..9bfb19c333 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2750,6 +2750,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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:51:45 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:51:45 +0000 Received: from localhost ([127.0.0.1]:48263 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoj-0003oI-8h for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:45 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:17570) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoS-0003mp-UW for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:29 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTMy1xYPz1LWpG for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:51:26 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTMy1xYPz1LWpG DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904286; bh=jkiE73B2I480BUORnS7GTIW7bLs9Ig0hxDeNfhX5XiM=; h=From:To:Subject:Date:In-Reply-To:References:From; b=D3fF9tG103Z6rThKjqT1LII9XBl8bUcfLBkgJWYksVF0vDnT6YPlSuUH54Ec+UzBa 42wa9sBl8C6DVIw8lTbXnsNRtVQJDT4/PZfaiwtxiVFkEex+o2DnphNZu8URjkuwoN 9jNmFivb1hn5ToiFc0+lOtqCD6Fc64cab6dDxvyA= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 28/33] gnu: geiser-gauche: Adjust to changes in emacs-build-system. Date: Thu, 8 Apr 2021 19:50:02 +0200 Message-Id: <20210408175007.13360-28-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 29238e1b16..074fb9ba89 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -347,16 +347,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") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:51:45 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:51:45 +0000 Received: from localhost ([127.0.0.1]:48265 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoj-0003oP-I3 for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:45 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:17831) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoW-0003nO-1K for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:32 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTN031Wsz1LWny for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:51:28 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTN031Wsz1LWny DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904288; bh=tj2F88lP2TaA/IgEdgIb0FKMeO65Rox13pfBwmBKd1g=; h=From:To:Subject:Date:In-Reply-To:References:From; b=K+zVOuu7n2w+7iiA7D9S0+0Xkmo73uGFlUz+uFNErWkcFQ/MKih/WgiEZwDU15Qu1 uCUtd8NJSFQpGrzwD/7sfp/IoXtBxDXkbR0cN0AMVYAWP5OyQi+idshkOIELjz/t0K oiiYAxwmOhsapTQ89A4QCiKBS3TfKhhdgOqyzLPc= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 29/33] gnu: emacs-dvc: Adjust to changes in emacs-build-system. Date: Thu, 8 Apr 2021 19:50:03 +0200 Message-Id: <20210408175007.13360-29-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 074fb9ba89..31312e9001 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -5192,9 +5192,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 -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:51:46 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:51:46 +0000 Received: from localhost ([127.0.0.1]:48267 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoj-0003oW-PX for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:46 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:14366) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoW-0003nS-Nh for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:33 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTN22Cq6z1LWpG for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:51:30 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTN22Cq6z1LWpG DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904290; bh=KB39wTovS1cKXYQx8pn1IiwD+Hs9nWvLDWQgDWAUv4U=; h=From:To:Subject:Date:In-Reply-To:References:From; b=P+bhEYtpCGJpOYx8p/rucSROcIKiDOykmpR/LthxnDvYX1S83LpI/Bd5CWyBsnC5y /zPGlxgKB8STu+byoQpopLuWPBqHfohIdU35YeHhenEO1Yml2r/DnVHV6w/3/rRCa9 2GM2zcg86mSysyNgiFfQ9P1ozedQXq5lUUZXfeKc= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 30/33] gnu: emacs-w3m: Adjust to changes in emacs-build-system. Date: Thu, 8 Apr 2021 19:50:04 +0200 Message-Id: <20210408175007.13360-30-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 31312e9001..a7a1925c8e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1696,14 +1696,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 @@ -1748,8 +1750,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)))))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:51:46 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:51:46 +0000 Received: from localhost ([127.0.0.1]:48271 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYok-0003op-Dr for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:46 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:20914) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoY-0003nl-S9 for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:35 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTN41Rxyz1LWpZ for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:51:32 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTN41Rxyz1LWpZ DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904292; bh=EaxhhrQMZkfD3JorEmxEYj4Ir6Rr1EI+v0mfA9smuBE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=pxuBgypG+qCC9hgkSbNOAanWtscXxjSAPrFDVorXAqn+05+m9pNNJZYycgYkOHzBH H4M1jxg9ZNQE9mAteAgRMGcRBrY+3K012S1+ltrhtYO4klCPBZudpj2raDNaHV99jp Gpw4ylU5FOdDjEVl7lfu+boJBOet+xAYIYrnjPMI= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 31/33] gnu: emacs-wget: Port to emacs-build-system. Date: Thu, 8 Apr 2021 19:50:05 +0200 Message-Id: <20210408175007.13360-31-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 a7a1925c8e..e940c75303 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1770,35 +1770,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") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:51:47 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:51:47 +0000 Received: from localhost ([127.0.0.1]:48273 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYok-0003ox-Pm for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:47 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:42487) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoa-0003nt-RP for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:37 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTN62TH2z1LWny for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:51:34 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTN62TH2z1LWny DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904294; bh=LyIYOZB6bJkkna8U/JzlQ6Vxw9LKElr/9s/tRZDsk6g=; h=From:To:Subject:Date:In-Reply-To:References:From; b=M7di2r41SvfyeLld3nt6CJzAuX4J2eitqfJC+xmKkBXLaiXx9ez38JM52YRNRCMRV A8OmWNBULZZAg//6ScWg4dxKUSxJF8DQPehFOOuh6IZHy847AZ2E+U2Mu0Rgq9oubz fYHPlhYuboKMGXmOrCAq4qPkgADDSxZTs5R7mTFE= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 32/33] gnu: emacs-haskell-mode: Adjust to changes in emacs-build-system. Date: Thu, 8 Apr 2021 19:50:06 +0200 Message-Id: <20210408175007.13360-32-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 e940c75303..86b18401ed 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1216,7 +1216,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) @@ -1257,7 +1261,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"))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 08 13:51:47 2021 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:51:47 +0000 Received: from localhost ([127.0.0.1]:48275 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYol-0003p4-34 for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:47 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:42762) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoc-0003o1-Jm for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:38 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTN81Yntz1LWpG for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:51:36 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTN81Yntz1LWpG DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904296; bh=Em00HaIcxnndVKY7BpdM72WC58WUu0KZI08FKx/TqqE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=amemDdZJ007nHn9Lv/yI7le0t+lEddESaPf+Qt/gq9zhg2tDKQzU3Vo2nzWyesYny B4R92pkvKZdJqNcBlEz3ULIbrRNcVL2a8EQotylIMvLx/tMxFvz1wbuATKFnq5rwwb G96rhG2Lju45JrX1E8ySBnaSGDTjrGvvMf6Lflmc= From: Leo Prikler To: 47661@debbugs.gnu.org Subject: [PATCH 33/33] gnu: emacs-julia-snail: Adjust to changes in emacs-build-system. Date: Thu, 8 Apr 2021 19:50:07 +0200 Message-Id: <20210408175007.13360-33-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 86b18401ed..31e0a407e5 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -8840,14 +8840,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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:07:12 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 01/33] profiles: Add hook for Emacs subdirs. 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 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:07:16 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 02/33] gnu: emacs: Wrap EMACSLOADPATH. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 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") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:07:17 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 03/33] gnu: emacs: Add coreutils and gzip to PATH. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 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))))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:07:20 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 04/33] build-system: emacs: Use subdirectories again. 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 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:07:20 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 05/33] gnu: emacs-libgit: Adjust to changes in emacs-build-system. 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 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 _ -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:07:23 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 06/33] gnu: emacs-guix: Adjust to changes in emacs-build-system. 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 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:07:24 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 07/33] gnu: emacs-telega: Adjust to changes in emacs-build-system. 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 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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. -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:07:27 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 08/33] gnu: Add emacs-telega-contrib. 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 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:07:27 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 09/33] gnu: emacs-emacsql: Adjust to changes in emacs-build-system. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:07:33 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 10/33] gnu: emacs-howm: Adjust to changes in emacs-build-system. 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 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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)) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:07:33 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 11/33] gnu: emacs-ert-runner: Adjust to changes in emacs-build-system. 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 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:07:33 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 12/33] gnu: emacs-pdf-tools: Adjust to changes in emacs-build-system. 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 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -0.3 (/) X-Debbugs-Envelope-To: 47661 Cc: Xinglu Chen X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.3 (-) 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 -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:07:39 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 13/33] gnu: emacs-shroud: Adjust to changes in emacs-build-system. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:07:39 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 14/33] gnu: emacs-sly-stepper: Adjust to changes in emacs-build-system. 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 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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"))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:07:49 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 15/33] gnu: emacs-sly-stepper: Remove generated sources. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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")) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:07:49 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 16/33] gnu: emacs-org-contrib: Adjust to changes in emacs-build-system. 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 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:07:49 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 17/33] gnu: emacs-edbi: Adjust to changes in emacs-build-system. 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 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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.") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:07:50 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 18/33] gnu: emacs-scel: Adjust to changes in emacs-build-system. 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 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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"))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:07:51 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 19/33] gnu: emacs-vterm: Adjust to changes in emacs-build-system. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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" -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:07:51 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 20/33] gnu: notmuch: Adjust to changes in emacs-build-system. 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 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:07:52 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 21/33] gnu: emacs-pyim: Update to 3.6. 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 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:07:59 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 22/33] gnu: emacs-realgud: Adjust to changes in emacs-build-system. 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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")) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:08:04 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 23/33] gnu: emacs-geiser: Update to 0.13. 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 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 Cc: Morgan Smith X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 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 -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:08:05 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 24/33] gnu: Add emacs-geiser-guile. 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 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 Cc: Morgan Smith X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 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 + -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:08:05 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 25/33] gnu: emacs-guix: Update to 0.5.2-4.8ce6d21. 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 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 Cc: Morgan Smith X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:08:06 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 26/33] gnu: emacs-flycheck-guile: Add missing input. 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 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 Cc: Morgan Smith X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 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") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:08:06 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 27/33] gnu: guile-studio: Add missing input. 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 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 Cc: Morgan Smith X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:08:10 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 28/33] gnu: geiser-gauche: Adjust to changes in emacs-build-system. 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 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:08:10 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 29/33] gnu: emacs-dvc: Adjust to changes in emacs-build-system. 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 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:08:11 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 30/33] gnu: emacs-w3m: Adjust to changes in emacs-build-system. 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 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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)))))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:08:11 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 31/33] gnu: emacs-wget: Port to emacs-build-system. 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 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:08:33 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 32/33] gnu: emacs-haskell-mode: Adjust to changes in emacs-build-system. 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 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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"))) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Sat Apr 17 13:08:34 2021 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 To: 47661@debbugs.gnu.org Subject: [PATCH v2 33/33] gnu: emacs-julia-snail: Adjust to changes in emacs-build-system. 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 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 29 08:16:38 2021 Received: (at 47661) by debbugs.gnu.org; 29 Apr 2021 12:16:38 +0000 Received: from localhost ([127.0.0.1]:54998 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lc5aw-0004ub-8v for submit@debbugs.gnu.org; Thu, 29 Apr 2021 08:16:38 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:41442 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lc5as-0004uJ-QE for 47661@debbugs.gnu.org; Thu, 29 Apr 2021 08:16:36 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1619698587; bh=HLJz5ii8YyZC689yZ8YW+VVxfKd22QUdomDsI9Ml5LE=; h=From:To:Subject:In-Reply-To:References:Date; b=VmwJkRFNMcM44c68ovGcyPlg5CvXPDpI1tQVjQr2c2jnGdWqYwp/xb6AI52NNQNIZ rI/NMMhByZ3EJ21EhtKbFCUHx76apVnrststwAzPrYg9B2XlYBCzDgbnXeICMxok+o 5Hc8wolBRYgP4ZQUgfpNrMxIMRUdjKzlqElVKB8U= To: Leo Prikler , 47661@debbugs.gnu.org Subject: Re: [bug#47661] [PATCH 00/33] Improve Emacs UX. In-Reply-To: <20210408174616.13112-1-leo.prikler@student.tugraz.at> References: <20210408174616.13112-1-leo.prikler@student.tugraz.at> Date: Thu, 29 Apr 2021 14:16:26 +0200 Message-ID: <87v985uvz9.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 2.9 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi, On Thu, Apr 08 2021, Leo Prikler wrote: > Hi Guix, > > as you all recall, I recently put in some efforts into improving the > Emacs user experience in Guix. There are three bugs addressed by this > patch set: > > 1. Emacs libraries may inad [...] Content analysis details: (2.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.9 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hi, On Thu, Apr 08 2021, Leo Prikler wrote: > Hi Guix, > > as you all recall, I recently put in some efforts into improving the > Emacs user experience in Guix. There are three bugs addressed by this > patch set: > > 1. Emacs libraries may inad [...] Content analysis details: (2.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 1.0 BULK_RE_SUSP_NTLD Precedence bulk and RE: from a suspicious TLD 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager Hi, On Thu, Apr 08 2021, Leo Prikler wrote: > Hi Guix, > > as you all recall, I recently put in some efforts into improving the > Emacs user experience in Guix. There are three bugs addressed by this > patch set: > > 1. Emacs libraries may inadvertently overwrite files in other libraries > (solved by using ELPA-style subdirectories) > 2. Emacs cannot find its own load-path after an update. (Solved with a > wrapper). > 3. Emacs can't find core programs, such as "ls" or "gzip". I just wanted to let you know that I have been using these patches with Emacs for a few days, and things have been working fine so far :) I haven=E2=80=99t tested all the updated packages, though. Out of curiosity, what are the differences between v2 and v1 of the series? It would be nice to include a cover letter for v2 to give an overview of the changes since v1. Thanks for working on this! From debbugs-submit-bounces@debbugs.gnu.org Thu Apr 29 10:59:20 2021 Received: (at 47661) by debbugs.gnu.org; 29 Apr 2021 14:59:20 +0000 Received: from localhost ([127.0.0.1]:56587 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lc88O-0000hZ-Fn for submit@debbugs.gnu.org; Thu, 29 Apr 2021 10:59:20 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:58625) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lc88M-0000hL-Hr for 47661@debbugs.gnu.org; Thu, 29 Apr 2021 10:59:19 -0400 Received: from [10.0.0.4] (91-114-247-246.adsl.highway.telekom.at [91.114.247.246]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FWJYZ3r19z1LWph; Thu, 29 Apr 2021 16:59:14 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FWJYZ3r19z1LWph DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1619708354; bh=hYrsp/YCyM2QSR5AxQjtHFUnQOWbw01+fnxZVYavux8=; h=Subject:From:To:Date:In-Reply-To:References:From; b=WBmKMeqbgiIWOUj8Li+xsMeB6AdheALDuQnC7O7pLXNP5f+nPb6LO1337zxCcA6zj V6yc/Covh7PV47ITaIGl3JdkgJLjUhXkOHH1GyDShLdYljI5JSXdlSblskFZc6j3ct SYXHfwzi27xCAELV+aXFZCXfYQkLrmMxRMLKEmZE= Message-ID: <040332f67d721597f7885e4605259b8d562d29be.camel@student.tugraz.at> Subject: Re: [bug#47661] [PATCH 00/33] Improve Emacs UX. From: Leo Prikler To: Xinglu Chen , 47661@debbugs.gnu.org Date: Thu, 29 Apr 2021 16:58:53 +0200 In-Reply-To: <87v985uvz9.fsf@yoctocell.xyz> References: <20210408174616.13112-1-leo.prikler@student.tugraz.at> <87v985uvz9.fsf@yoctocell.xyz> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Am Donnerstag, den 29.04.2021, 14:16 +0200 schrieb Xinglu Chen: > Hi, > > On Thu, Apr 08 2021, Leo Prikler wrote: > > > Hi Guix, > > > > as you all recall, I recently put in some efforts into improving > > the > > Emacs user experience in Guix. There are three bugs addressed by > > this > > patch set: > > > > 1. Emacs libraries may inadvertently overwrite files in other > > libraries > > (solved by using ELPA-style subdirectories) > > 2. Emacs cannot find its own load-path after an update. (Solved > > with a > > wrapper). > > 3. Emacs can't find core programs, such as "ls" or "gzip". > > I just wanted to let you know that I have been using these patches > with > Emacs for a few days, and things have been working fine so far :) I > haven’t tested all the updated packages, though. > > Out of curiosity, what are the differences between v2 and v1 of the > series? It would be nice to include a cover letter for v2 to give an > overview of the changes since v1. The difference of v2 w.r.t. v1 lies in how Emacs finds core binaries ([03/33] in the respective series). v1 hardcodes them, but as I feared, that won't work with tramp, so I changed it to adjusting PATH in v2. You can test that this has a visible effect by checking some variant of emacs-next both with v1 and v2. Regards, Leo From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 30 04:25:39 2021 Received: (at 47661) by debbugs.gnu.org; 30 Apr 2021 08:25:39 +0000 Received: from localhost ([127.0.0.1]:57433 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lcOSw-0005Hv-UJ for submit@debbugs.gnu.org; Fri, 30 Apr 2021 04:25:39 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:38236 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lcOSv-0005Hg-J0 for 47661@debbugs.gnu.org; Fri, 30 Apr 2021 04:25:38 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1619771132; bh=MCLzQqpTpq1++FdRJS4fGBSIOts13oRNZ/bFtQEudK8=; h=From:To:Subject:In-Reply-To:References:Date; b=FCiL/ZVeT2s+UOfd/XSY5YplnjvzqtMwcb125A1davcidxECS+of9Ur/HdWGzQglM 4+o8oehBD8U4WqREUJcBJpOMe5O2sAClumgZKod2pSpIhReEmf9CZ7C96EXVfcSAMZ jq8rP3auej7Pbn8QnLkVSgMC6n1sqHulLYr9S8QY= To: Leo Prikler , 47661@debbugs.gnu.org Subject: Re: [bug#47661] [PATCH 00/33] Improve Emacs UX. In-Reply-To: <040332f67d721597f7885e4605259b8d562d29be.camel@student.tugraz.at> References: <20210408174616.13112-1-leo.prikler@student.tugraz.at> <87v985uvz9.fsf@yoctocell.xyz> <040332f67d721597f7885e4605259b8d562d29be.camel@student.tugraz.at> Date: Fri, 30 Apr 2021 10:25:29 +0200 Message-ID: <87fsz8npqe.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 2.9 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On Thu, Apr 29 2021, Leo Prikler wrote: >> Out of curiosity, what are the differences between v2 and v1 of the >> series? It would be nice to include a cover letter for v2 to give an >> overview of the changes since v1. > The difference of [...] Content analysis details: (2.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD X-Debbugs-Envelope-To: 47661 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 2.9 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: On Thu, Apr 29 2021, Leo Prikler wrote: >> Out of curiosity, what are the differences between v2 and v1 of the >> series? It would be nice to include a cover letter for v2 to give an >> overview of the changes since v1. > The difference of [...] Content analysis details: (2.9 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 1.0 BULK_RE_SUSP_NTLD Precedence bulk and RE: from a suspicious TLD 0.4 RDNS_DYNAMIC Delivered to internal network by host with dynamic-looking rDNS 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager On Thu, Apr 29 2021, Leo Prikler wrote: >> Out of curiosity, what are the differences between v2 and v1 of the >> series? It would be nice to include a cover letter for v2 to give an >> overview of the changes since v1. > The difference of v2 w.r.t. v1 lies in how Emacs finds core binaries > ([03/33] in the respective series). v1 hardcodes them, but as I > feared, that won't work with tramp, so I changed it to adjusting PATH > in v2. You can test that this has a visible effect by checking some > variant of emacs-next both with v1 and v2. Ok, thanks for explaining. From debbugs-submit-bounces@debbugs.gnu.org Sat May 01 14:45:31 2021 Received: (at 47661-done) by debbugs.gnu.org; 1 May 2021 18:45:31 +0000 Received: from localhost ([127.0.0.1]:37818 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lcucN-0004S1-4K for submit@debbugs.gnu.org; Sat, 01 May 2021 14:45:31 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:45849) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lcucK-0004Ru-Mm for 47661-done@debbugs.gnu.org; Sat, 01 May 2021 14:45:29 -0400 Received: from nijino.local (91-114-247-246.adsl.highway.telekom.at [91.114.247.246]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FXdTc5PwKz3xsF; Sat, 1 May 2021 20:45:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1619894724; bh=rRoMAJLqFG0+Okjve1w8kDrwaYMLHyUOXRAKKWyJrxc=; h=Subject:From:To:Date:In-Reply-To:References; b=Pl5Su7Lgfh4GE8y3b93oZflJAz+A47+6SqJ1BRtKocopKlChvxonYa/vhfHvHcpaS xs/mmITbWK6G/wFXeQbk/exlDYkSBcHulSXaVmZOFUCk1fcZu84VcLUCAFGd21E4BQ vBNj5ME/YYPhOxER8cwXMDb2e3T4kPP4srK10bKI= Message-ID: <7b548f6326d2f14eff1077afa37fac7400fbbce7.camel@student.tugraz.at> Subject: Re: [bug#47661] [PATCH 00/33] Improve Emacs UX. From: Leo Prikler To: Xinglu Chen , 47661-done@debbugs.gnu.org Date: Sat, 01 May 2021 20:45:23 +0200 In-Reply-To: <87fsz8npqe.fsf@yoctocell.xyz> References: <20210408174616.13112-1-leo.prikler@student.tugraz.at> <87v985uvz9.fsf@yoctocell.xyz> <040332f67d721597f7885e4605259b8d562d29be.camel@student.tugraz.at> <87fsz8npqe.fsf@yoctocell.xyz> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) I've now pushed this patch set. Thanks, everyone who contributed packages. Thanks, everyone who submitted bugs. And thanks to Xinglu Chen for helping me test. I apologize in advance for all the bugs, that we didn't catch in the last fourteen days. Please yell at me as loud as you can if you find one. I wish you all enjoy a wonderful Labour Day. Leo From debbugs-submit-bounces@debbugs.gnu.org Tue May 04 01:13:59 2021 Received: (at 47661-done) by debbugs.gnu.org; 4 May 2021 05:13:59 +0000 Received: from localhost ([127.0.0.1]:50796 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ldnNe-0004O0-Uo for submit@debbugs.gnu.org; Tue, 04 May 2021 01:13:59 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:53154) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ldnNc-0004Nu-N3 for 47661-done@debbugs.gnu.org; Tue, 04 May 2021 01:13:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Type:MIME-Version:Message-ID:Date: References:In-Reply-To:Subject:To:From:Sender:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Zc3UcDPMkIypnE1NvCXfHqzIdQByVwjz5Et1GGr6oqg=; b=k/MEUtwZScSMc98VK/dDiBF1F Sr2yconVwEk9zpzF62vzg6/koafq2oUam1TdQe+gh3ChDdvbz5bcaqiuNPsuGUULMiqdoRJxxYobX AEdI+5IlA8hCP1uAG14SkVL8i+EYRIIQ9mlZ1+AQDelSN6UnmEODgq4cbFgJNgqXZucBypLrVZCXz ZdvqD5Ftl4rDNF177bOj+KaBoy54x6x5UGOYrg3UzpRP/3p5+dF5SAM0ui2WGOR+AM7akLQ0jLVbL wb+QbcJCky/lh/R5IjE3S6Wwuj3Fwjx3mx+Vki2o6wfdQZ++xu/XVl/bjJevKjWBqJtBu5i8zxFTN LLJ0/f9/g==; Received: from [192.168.2.1] (helo=steel) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1ldnNa-0000Ap-4a; Tue, 04 May 2021 10:43:54 +0530 From: Arun Isaac To: Leo Prikler , 47661-done@debbugs.gnu.org Subject: Re: bug#47661: [PATCH 00/33] Improve Emacs UX. In-Reply-To: <7b548f6326d2f14eff1077afa37fac7400fbbce7.camel@student.tugraz.at> References: <20210408174616.13112-1-leo.prikler@student.tugraz.at> <87v985uvz9.fsf@yoctocell.xyz> <040332f67d721597f7885e4605259b8d562d29be.camel@student.tugraz.at> <87fsz8npqe.fsf@yoctocell.xyz> <7b548f6326d2f14eff1077afa37fac7400fbbce7.camel@student.tugraz.at> Date: Tue, 04 May 2021 10:43:38 +0530 Message-ID: <87h7jjm67x.fsf@systemreboot.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47661-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Hi Leo, Thanks for your work on the emacs-build-system! In guix/build/emacs-build-system.scm, is the comment before %install-dir still consistent with your changes? It seems to describe the old system when all files were installed into site-lisp. --8<---------------cut here---------------start------------->8--- ;;; All the packages are installed directly under site-lisp, which means that ;;; having that directory in the EMACSLOADPATH is enough to have them found by ;;; Emacs. (define %install-dir "/share/emacs/site-lisp") --8<---------------cut here---------------end--------------->8--- Could you fix this? Thank you for your time! :-) Arun --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFPBAEBCAA5FiEEf3MDQ/Lwnzx3v3nTLiXui2GAK7MFAmCQ2AIbHGFydW5pc2Fh Y0BzeXN0ZW1yZWJvb3QubmV0AAoJEC4l7othgCuz3+IIAMivC7uTpj5OxjnDd8Xw /iXZA7RX2Kcv5w6YK0mi5MzbbB2itZS0L8d95fMJhQBuebXy4n0yQDqDLTilZAC7 tUGPxWvIh6x0YBmAAbNnjvRUli1pHGEGbZk1NlRkUw4GvPoorvbqywiijzgdwKGR U+nIHuFJHwitFU9pm811ct//ZpPlnmls7dqxUHCnGhQzOA+3RoIqb06lEHFNF4Gy 97ZAe4Xp7Rxc00xMSQy2UV6TJxpT/FBNUvxQXnrjj6x8UEkQMeT2k+CXLhJnbG0U 26TzfO5Wr4Hw6oFE5l3n0pUrYaHqme8t+uA6XjphRRrvURLqfGNTJI5fd8RgWr71 dvg= =oT+T -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue May 04 02:39:12 2021 Received: (at 47661-done) by debbugs.gnu.org; 4 May 2021 06:39:12 +0000 Received: from localhost ([127.0.0.1]:51174 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ldoi1-0005Gt-Ve for submit@debbugs.gnu.org; Tue, 04 May 2021 02:39:12 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:7447) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ldohz-0005Gn-Pd for 47661-done@debbugs.gnu.org; Tue, 04 May 2021 02:39:04 -0400 Received: from nijino.local (91-114-247-246.adsl.highway.telekom.at [91.114.247.246]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FZ9D42YXgz1LXt4; Tue, 4 May 2021 08:39:00 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FZ9D42YXgz1LXt4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1620110340; bh=pXbINmTBEv+bdlxzsh2oZ9EuQIdckpp8kXDbwPfOVYE=; h=Subject:From:To:Date:In-Reply-To:References:From; b=UEDEG8SW7AKsBJaaE/IZO0uV8j6nSkAiG6+Lg4ppp7TIarZRhlEwMG587g+Z23gaq SD0EuuDU1J9TQYn+eguBzTZSB8qo8AIDvAYCY6ljlcN8JqIQLiBwj9U7Rer7zLrIwB 3ruG6GZzVNpOolVGsSWo/OrxKm6LIdjuQQ/bLJ9E= Message-ID: Subject: Re: bug#47661: [PATCH 00/33] Improve Emacs UX. From: Leo Prikler To: Arun Isaac , 47661-done@debbugs.gnu.org Date: Tue, 04 May 2021 08:38:59 +0200 In-Reply-To: <87h7jjm67x.fsf@systemreboot.net> References: <20210408174616.13112-1-leo.prikler@student.tugraz.at> <87v985uvz9.fsf@yoctocell.xyz> <040332f67d721597f7885e4605259b8d562d29be.camel@student.tugraz.at> <87fsz8npqe.fsf@yoctocell.xyz> <7b548f6326d2f14eff1077afa37fac7400fbbce7.camel@student.tugraz.at> <87h7jjm67x.fsf@systemreboot.net> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Arun, Am Dienstag, den 04.05.2021, 10:43 +0530 schrieb Arun Isaac: > In guix/build/emacs-build-system.scm, is the comment before %install- > dir > still consistent with your changes? It seems to describe the old > system > when all files were installed into site-lisp. > > --8<---------------cut here---------------start------------->8--- > ;;; All the packages are installed directly under site-lisp, which > means that > ;;; having that directory in the EMACSLOADPATH is enough to have them > found by > ;;; Emacs. > (define %install-dir "/share/emacs/site-lisp") > --8<---------------cut here---------------end--------------->8--- Thanks for pointing this out. How would --8<---------------cut here---------------start------------->8--- ;;; The location in which Emacs looks for packages. Emacs Lisp code, that is ;;; installed there directly will be found when that directory is added to ;;; EMACSLOADPATH. To avoid clashes between packages (particularly considering ;;; auxiliary files), we install them one directory level below, however. ;;; This indirection is handled by ‘expand-load-path’ during build and a ;;; profile hook otherwise. (define %install-dir "/share/emacs/site-lisp") --8<---------------cut here---------------end--------------->8--- sound? From debbugs-submit-bounces@debbugs.gnu.org Tue May 04 17:03:03 2021 Received: (at 47661-done) by debbugs.gnu.org; 4 May 2021 21:03:03 +0000 Received: from localhost ([127.0.0.1]:55437 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1le2C7-00006z-Bq for submit@debbugs.gnu.org; Tue, 04 May 2021 17:03:03 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:55358) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1le2C4-00006b-5Q for 47661-done@debbugs.gnu.org; Tue, 04 May 2021 17:03:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Type:MIME-Version:Message-ID:Date: References:In-Reply-To:Subject:To:From:Sender:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=FVT74ihDNMTCT0aecqVJTAfQRTAR25usBN3JoaQHcGE=; b=hp/M7nrSN7VuGfoY+3xOd3V3X WMD9kTkDJG9Ub5V4LZqRUNcBx6FUrKMlmqZXCskO5dS8pIhu4qynS6SlJP55w0NKKj77W0V29DDO8 29Gc9M1CFwNylxblsvop53GzmbnQJ58W4kuaIRhnjDUOHunNMtQFtDYTf766zFSDDTAg3cLIJ3hh/ HyX0on13zNAQJe14iRpItmrV1BVc1bAN/3v0JLiDfsnWarm9NPPHqSpFoydRCxTspEsscYVzFTOMt ygfWcweSZURK3ZAUnBvmTDeZsjUahY5+d4wwMZEsV3a0jEEUoZtJPvRGt4T7mVwwHJ1ixZa/WRXd4 TAEjf+k9Q==; Received: from [192.168.2.1] (helo=steel) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1le2C0-0002Lt-Rd; Wed, 05 May 2021 02:32:56 +0530 From: Arun Isaac To: Leo Prikler , 47661-done@debbugs.gnu.org Subject: Re: bug#47661: [PATCH 00/33] Improve Emacs UX. In-Reply-To: References: <20210408174616.13112-1-leo.prikler@student.tugraz.at> <87v985uvz9.fsf@yoctocell.xyz> <040332f67d721597f7885e4605259b8d562d29be.camel@student.tugraz.at> <87fsz8npqe.fsf@yoctocell.xyz> <7b548f6326d2f14eff1077afa37fac7400fbbce7.camel@student.tugraz.at> <87h7jjm67x.fsf@systemreboot.net> Date: Wed, 05 May 2021 02:32:35 +0530 Message-ID: <877dkemcus.fsf@systemreboot.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47661-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Leo, > --8<---------------cut here---------------start------------->8--- > The location in which Emacs looks for packages. Emacs Lisp code, that > is installed there directly will be found when that directory is added > to EMACSLOADPATH. To avoid clashes between packages (particularly > considering auxiliary files), we install them one directory level > below, however. This indirection is handled by =E2=80=98expand-load-path= =E2=80=99 > during build and a profile hook otherwise. > --8<---------------cut here---------------end--------------->8--- Are there still packages that directly install into /share/emacs/site-lisp as mentioned in sentence 2? Apart from that one sentence, this looks good to me. Thanks! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFPBAEBCAA5FiEEf3MDQ/Lwnzx3v3nTLiXui2GAK7MFAmCRtmsbHGFydW5pc2Fh Y0BzeXN0ZW1yZWJvb3QubmV0AAoJEC4l7othgCuzROEIAMS4UfWYl588HzPZzA5M 60AYSXsO6joO9wIj9Z3/y6uIE8RU+O2MrJd/+7MTlpsEFuXsW5gxdmhfH2A4Eq5u ZURTLme0Yjsk1aJsB4wdg8DLThFGLUphRYNKlm6d0Cxt0edASefdK3EVJKLJUiOH qOTgnunaex+7hji6j9L/k7hOgpagjIUYlwAfS4jPcxIyIRVbdB/+vgGfyCE2HyWt e9XSOdqc6JRD5vXY5OVJCcTx54HN8yyheQdHqNhQCPS1HbN7wlO0tHQ6VG00Of7v WN3dFG9rRF+DQ8DU01yM3KqwMsxqLwpWPg2TB1TxAaKtyXPYs6dETtvYXUkGsziW Tao= =24cG -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Tue May 04 17:22:16 2021 Received: (at 47661-done) by debbugs.gnu.org; 4 May 2021 21:22:16 +0000 Received: from localhost ([127.0.0.1]:55530 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1le2Uh-0000NN-Ql for submit@debbugs.gnu.org; Tue, 04 May 2021 17:22:15 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:14107) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1le2Uf-0000NF-PT for 47661-done@debbugs.gnu.org; Tue, 04 May 2021 17:22:14 -0400 Received: from nijino.local (91-114-247-246.adsl.highway.telekom.at [91.114.247.246]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FZXq60kSMz1LLyL; Tue, 4 May 2021 23:22:09 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FZXq60kSMz1LLyL DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1620163330; bh=9KcbSbkeAcVtk6NDkk+o00YcaA+iN7K/prypJtCwlpc=; h=Subject:From:To:Date:In-Reply-To:References:From; b=fK0RRicpdj/+puxVXyJd8O1GTBcUfKktTUbWuWRs5k5HNpRNN/qJvFy4opMpKWmJG YdSqN4Aiq34NEVV+1rLcpLiAQ9ExqnMcsk2+np96HajHaGeRmMenkpsY2BFzimC/nT vkNjWY7bJ7la835TtWAMG4Vvv9tpsQ6jmJaseu50= Message-ID: <6d659b20b49b1660db85586ec27d89fb03f67957.camel@student.tugraz.at> Subject: Re: bug#47661: [PATCH 00/33] Improve Emacs UX. From: Leo Prikler To: Arun Isaac , 47661-done@debbugs.gnu.org Date: Tue, 04 May 2021 23:22:09 +0200 In-Reply-To: <877dkemcus.fsf@systemreboot.net> References: <20210408174616.13112-1-leo.prikler@student.tugraz.at> <87v985uvz9.fsf@yoctocell.xyz> <040332f67d721597f7885e4605259b8d562d29be.camel@student.tugraz.at> <87fsz8npqe.fsf@yoctocell.xyz> <7b548f6326d2f14eff1077afa37fac7400fbbce7.camel@student.tugraz.at> <87h7jjm67x.fsf@systemreboot.net> <877dkemcus.fsf@systemreboot.net> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 47661-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Am Mittwoch, den 05.05.2021, 02:32 +0530 schrieb Arun Isaac: > Hi Leo, > > > --8<---------------cut here---------------start------------->8--- > > The location in which Emacs looks for packages. Emacs Lisp code, > > that > > is installed there directly will be found when that directory is > > added > > to EMACSLOADPATH. To avoid clashes between packages (particularly > > considering auxiliary files), we install them one directory level > > below, however. This indirection is handled by ‘expand-load-path’ > > during build and a profile hook otherwise. > > --8<---------------cut here---------------end--------------->8--- > > Are there still packages that directly install into > /share/emacs/site-lisp as mentioned in sentence 2? Apart from that > one > sentence, this looks good to me. I haven't done an exhaustive check, so there might be some odd packages, that don't fit into sentence 3. The profile hook counts as "Emacs lisp code installed there directly" imo as well. Regards, Leo From debbugs-submit-bounces@debbugs.gnu.org Wed May 05 03:47:46 2021 Received: (at 47661-done) by debbugs.gnu.org; 5 May 2021 07:47:46 +0000 Received: from localhost ([127.0.0.1]:58351 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1leCG1-0004oI-Ql for submit@debbugs.gnu.org; Wed, 05 May 2021 03:47:45 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:56412) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1leCFw-0004oA-8J for 47661-done@debbugs.gnu.org; Wed, 05 May 2021 03:47:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Type:MIME-Version:Message-ID:Date: References:In-Reply-To:Subject:To:From:Sender:Reply-To:Cc: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Mo/hPChnjIX//bnJK50p0+JAcpmFqTc0f8/b4P9MGdg=; b=afCv1C3arbLjOWlo3dEUQnpcy TeOPSTAa/D+EHom5znAE18g3m7uSkZScXY94Ti78TTWzDb6F3KfZmEtG4hDNXcQGYI2DPZgzobFBD m9Sil/yfjnFIv0MuaK5IJ3gJuKaFZtGfbyilaG92V+ltIOyQfaTOF5W+ykfaJ6K7Chvcv2S8tOyDC Cc9qLK47BpgcN0oKiVkQEYUbTUL13W86WonYovyWYTjrFUBfbbf7b3siOzV1EHDP/xDXxtm9Lrh3s uRuIzzI8K0Xsc5jHwm2Q2Jsa3b1yi6hX8fkaTwuLpxDCaH/2XzfZQjffMPa1mLSs8Id9QwSSnzDxM igoO+NwFg==; Received: from [192.168.2.1] (helo=steel) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1leCFs-0003PL-MV; Wed, 05 May 2021 13:17:36 +0530 From: Arun Isaac To: Leo Prikler , 47661-done@debbugs.gnu.org Subject: Re: bug#47661: [PATCH 00/33] Improve Emacs UX. In-Reply-To: <6d659b20b49b1660db85586ec27d89fb03f67957.camel@student.tugraz.at> References: <20210408174616.13112-1-leo.prikler@student.tugraz.at> <87v985uvz9.fsf@yoctocell.xyz> <040332f67d721597f7885e4605259b8d562d29be.camel@student.tugraz.at> <87fsz8npqe.fsf@yoctocell.xyz> <7b548f6326d2f14eff1077afa37fac7400fbbce7.camel@student.tugraz.at> <87h7jjm67x.fsf@systemreboot.net> <877dkemcus.fsf@systemreboot.net> <6d659b20b49b1660db85586ec27d89fb03f67957.camel@student.tugraz.at> Date: Wed, 05 May 2021 13:17:35 +0530 Message-ID: <874kfhmxk8.fsf@systemreboot.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 47661-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Ok, that makes sense. Do proceed with the fix. Thanks! Arun --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFPBAEBCAA5FiEEf3MDQ/Lwnzx3v3nTLiXui2GAK7MFAmCSTZcbHGFydW5pc2Fh Y0BzeXN0ZW1yZWJvb3QubmV0AAoJEC4l7othgCuzWCUH/RTNsvqkgUiMadQHaHAh UUxhbh/urnqE7jBDacvlbVvptr6cUb96dWQmrh8eQg2j05ElREplWfYj1OoXxzP3 7n3f+j9mblzYR/I58qNzUa+Gxsq1cv3dwZ7141EqoXsASKmaubYtGiTnLXFLd+27 pI3+c6qPZx8KDARY4QAu+wdyrE4E67IVU63FOHvSGjl3iulfu7nBvIShdM8Ehc32 14dl+Ah0hE8xmiXRmz7eKHsBjeCCTJqXx2wYekbOT8GQsM5b1GB7js5yiKKIlW3v flOlX89TzpPBwAK+Cq4caDRV+yaKaIE777ql1D+1zvC7FIVKJfpw+Hmo1OFY7SvZ /MQ= =e5q2 -----END PGP SIGNATURE----- --=-=-=-- From unknown Wed Sep 10 09:28:50 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 02 Jun 2021 11:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator