diff options
| -rw-r--r-- | guix/emacs-guix/emacs-guix-0.5.2-emacs-27.patch | 29 | ||||
| -rw-r--r-- | guix/emacs-guix/emacs-guix-0.5.2-geiser-0.12.patch | 25 | ||||
| -rw-r--r-- | guix/emacs-guix/emacs-guix-0.5.2-guix-api-change.patch | 89 | ||||
| -rw-r--r-- | guix/emacs-guix/emacs-guix.spec | 31 |
4 files changed, 15 insertions, 159 deletions
diff --git a/guix/emacs-guix/emacs-guix-0.5.2-emacs-27.patch b/guix/emacs-guix/emacs-guix-0.5.2-emacs-27.patch deleted file mode 100644 index b29e3d7..0000000 --- a/guix/emacs-guix/emacs-guix-0.5.2-emacs-27.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 58a840d0671091e3064e36244790ef8839da87d6 Mon Sep 17 00:00:00 2001 -From: Oleg Pykhalov <go.wigust@gmail.com> -Date: Wed, 12 Aug 2020 17:44:17 +0300 -Subject: [PATCH] build: Fix build for Emacs 27 - -<https://gitlab.com/emacs-guix/emacs-guix/-/merge_requests/5>. - -* elisp/local.mk (AUTOLOADS): Add '-l autoload' option to make it -compatible with Emacs 27. ---- - elisp/local.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/elisp/local.mk b/elisp/local.mk -index a871aa9..3bc0a27 100644 ---- a/elisp/local.mk -+++ b/elisp/local.mk -@@ -109,7 +109,7 @@ nodist_lisp_DATA = \ - $(AUTOLOADS) - - $(AUTOLOADS): $(EL_FILES) -- $(AM_V_GEN) $(EMACS) -Q --batch --eval \ -+ $(AM_V_GEN) $(EMACS) -Q --batch -l autoload --eval \ - "(let ((backup-inhibited t) \ - (generated-autoload-file \"$(abs_builddir)/$(AUTOLOADS)\")) \ - (update-directory-autoloads \"$(abs_srcdir)/%D%\"))" --- -GitLab - diff --git a/guix/emacs-guix/emacs-guix-0.5.2-geiser-0.12.patch b/guix/emacs-guix/emacs-guix-0.5.2-geiser-0.12.patch deleted file mode 100644 index adff29c..0000000 --- a/guix/emacs-guix/emacs-guix-0.5.2-geiser-0.12.patch +++ /dev/null @@ -1,25 +0,0 @@ -From bb2a0539f8d68b2292b3d0f3174c139b4c304028 Mon Sep 17 00:00:00 2001 -From: John Soo <jsoo1@asu.edu> -Date: Fri, 13 Nov 2020 06:02:01 -0800 -Subject: [PATCH] elisp/repl: Support geiser 0.12.x - -* elisp/guix-repl.el (guix-start-repl): Set 'geiser-repl-buffer-project'. ---- - elisp/guix-repl.el | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/elisp/guix-repl.el b/elisp/guix-repl.el -index c0bb3e2..5dd446f 100644 ---- a/elisp/guix-repl.el -+++ b/elisp/guix-repl.el -@@ -309,6 +309,7 @@ this address (it should be defined by - (with-current-buffer buffer - (geiser-repl-mode) - (geiser-impl--set-buffer-implementation impl) -+ (geiser-repl--set-this-buffer-project 'guix) - (geiser-repl--autodoc-mode -1) - (goto-char (point-max)) - (let ((prompt (geiser-con--combined-prompt --- -GitLab - diff --git a/guix/emacs-guix/emacs-guix-0.5.2-guix-api-change.patch b/guix/emacs-guix/emacs-guix-0.5.2-guix-api-change.patch deleted file mode 100644 index 047737c..0000000 --- a/guix/emacs-guix/emacs-guix-0.5.2-guix-api-change.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 5b65938f778907c672bfb2f47d4971cf515341d3 Mon Sep 17 00:00:00 2001 -From: Alex Kost <alezost@gmail.com> -Date: Mon, 18 May 2020 18:44:21 +0300 -Subject: [PATCH] scheme/actions: Updates for a recent API change - -That was introduced by -<https://git.savannah.gnu.org/cgit/guix.git/commit/?id=65ffb9388c1c3d870cb07e4cb3ef12c9ac06a161> - -This should fix <https://gitlab.com/emacs-guix/emacs-guix/-/issues/18>. - -* scheme/emacs-guix/actions.scm (process-package-actions): Use the new -'with-build-handler' macro instead of calling 'build-and-use-profile' -with '#:dry-run?' and '#:use-substitutes?' keywords. -(package-source-build-derivation): Likewise. ---- - scheme/emacs-guix/actions.scm | 44 +++++++++++++++++++---------------- - 1 file changed, 24 insertions(+), 20 deletions(-) - -diff --git a/scheme/emacs-guix/actions.scm b/scheme/emacs-guix/actions.scm -index 9e75318..472a7b3 100644 ---- a/scheme/emacs-guix/actions.scm -+++ b/scheme/emacs-guix/actions.scm -@@ -1,6 +1,6 @@ - ;;; actions.scm --- Various store actions on packages and generations - --;; Copyright © 2014-2016 Alex Kost <alezost@gmail.com> -+;; Copyright © 2014–2016, 2020 Alex Kost <alezost@gmail.com> - - ;; This file is part of Emacs-Guix. - -@@ -116,14 +116,15 @@ OUTPUTS is a list of package outputs (may be an empty list)." - (unless (and (null? install) (null? remove)) - (parameterize ((%graft? (not dry-run?))) - (with-store store -- (set-build-options store -- #:print-build-trace #f -- #:use-substitutes? use-substitutes?) -- (show-manifest-transaction store manifest transaction -- #:dry-run? dry-run?) -- (build-and-use-profile store profile new-manifest -- #:use-substitutes? use-substitutes? -- #:dry-run? dry-run?)))))) -+ (with-build-handler (build-notifier -+ #:use-substitutes? use-substitutes? -+ #:dry-run? dry-run?) -+ (set-build-options store -+ #:print-build-trace #f -+ #:use-substitutes? use-substitutes?) -+ (show-manifest-transaction store manifest transaction -+ #:dry-run? dry-run?) -+ (build-and-use-profile store profile new-manifest))))))) - - (define (build-package* package . build-options) - "Build PACKAGE using BUILD-OPTIONS acceptable by 'set-build-options'. -@@ -173,17 +174,20 @@ GENERATIONS is a list of generation numbers." - (with-store store - (let* ((derivation (package-source-derivation store source)) - (derivations (list derivation))) -- (set-build-options store -- #:print-build-trace #f -- #:use-substitutes? use-substitutes?) -- (show-what-to-build store derivations -- #:use-substitutes? use-substitutes? -- #:dry-run? dry-run?) -- (unless dry-run? -- (build-derivations store derivations)) -- (format #t "The source store file name: ~a~%" -- (package-source-derivation->store-file-name -- derivation)))))) -+ (with-build-handler (build-notifier -+ #:use-substitutes? use-substitutes? -+ #:dry-run? dry-run?) -+ (set-build-options store -+ #:print-build-trace #f -+ #:use-substitutes? use-substitutes?) -+ (show-what-to-build store derivations -+ #:use-substitutes? use-substitutes? -+ #:dry-run? dry-run?) -+ (unless dry-run? -+ (build-derivations store derivations)) -+ (format #t "The source store file name: ~a~%" -+ (package-source-derivation->store-file-name -+ derivation))))))) - - (define (package-build-log-file package-id) - "Return the build log file of a package PACKAGE-ID. --- -2.27.0 - diff --git a/guix/emacs-guix/emacs-guix.spec b/guix/emacs-guix/emacs-guix.spec index 0acd005..28fd9e9 100644 --- a/guix/emacs-guix/emacs-guix.spec +++ b/guix/emacs-guix/emacs-guix.spec @@ -1,3 +1,5 @@ +%global commit cf5b7a402ea503c3dcda85a86b9a6c6dd01896e0 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) %global debug_package %{nil} # Workaround brp-strip failures on Fedora 35. @@ -11,26 +13,20 @@ Name: emacs-%{pkg} Version: 0.5.2 -Release: 9%{?dist} +Release: 10.20221011git%{shortcommit}%{?dist} Summary: Emacs-Guix is an Emacs interface for GNU Guix package manager License: GPLv3+ -URL: https://emacs-guix.gitlab.io/website -Source0: https://emacs-guix.gitlab.io/website/releases/%{name}-%{version}.tar.gz +URL: https://guix.gnu.org +Source0: https://git.savannah.gnu.org/cgit/guix/%{name}.git/snapshot/%{name}-%{commit}.tar.gz -# Fix crash when installing a package -# https://gitlab.com/emacs-guix/emacs-guix/-/issues/18 -Patch0: emacs-guix-0.5.2-guix-api-change.patch -Patch1: emacs-guix-0.5.2-emacs-27.patch -Patch2: emacs-guix-0.5.2-geiser-0.12.patch - -%global guile_source_dir %{_datadir}/guile/site/2.2 -%global guile_ccache_dir %{_libdir}/guile/2.2/site-ccache +%global guile_source_dir %{_datadir}/guile/site/3.0 +%global guile_ccache_dir %{_libdir}/guile/3.0/site-ccache BuildRequires: emacs, make, texinfo BuildRequires: guix >= 0.13.0 BuildRequires: autoconf, automake -BuildRequires: pkgconfig(guile-2.2), guile-gcrypt +BuildRequires: pkgconfig(guile-3.0), guile-gcrypt BuildRequires: emacs-dash, emacs-bui, emacs-edit-indirect, emacs-magit-popup BuildRequires: (emacs-geiser-guile >= 0.13 or emacs-geiser < 0.13) @@ -54,7 +50,7 @@ available info about packages and to do many other things. %prep -%autosetup -p1 +%autosetup -p1 -n %{name}-%{commit} %build @@ -66,8 +62,8 @@ autoreconf -fiv --with-bui-lispdir=%{_emacs_sitelispdir}/bui \ --with-editindirect-lispdir=%{_emacs_sitelispdir}/edit-indirect \ --with-popup-lispdir=%{_emacs_sitelispdir}/magit-popup \ - GUILE=%{_bindir}/guile2.2 \ - GUILD=%{_bindir}/guild2.2 + GUILE=%{_bindir}/guile3.0 \ + GUILD=%{_bindir}/guild3.0 %make_build ELCFLAGS='-L %{_emacs_sitelispdir}/transient' @@ -108,12 +104,15 @@ fi %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/images %{_datadir}/%{name}/images/guix-logo.svg -%{_datadir}/%{name}/images/guixsd-logo.svg %{_infodir}/%{name}.info.gz %exclude %{_infodir}/dir %changelog +* Sun Feb 12 2023 Ting-Wei Lan <lantw44@gmail.com> - 0.5.2-10.20221011gitcf5b7a4 +- Update to the latest git snapshot +- Switch to Guile 3.0 + * Sat Oct 29 2022 Ting-Wei Lan <lantw44@gmail.com> - 0.5.2-9 - Rebuilt for Fedora 37 and 38 |