Re: A new wip-emacs branch

[Xinglu Chen]

On Sat, Apr 03 2021, Leo Prikler wrote:

> Your patch LGTM in a vaccum (except that package-version this-package
> could be abbreviated to just "version" IIUC), but I went for a
> different fix, since emacsql tried to avoid redundancies by putting in
> other redundancies.
>
> I ran a small test with emacs-emacsql-sqlite on
> 2be3daa19d2fd47933c622995d2f2dde714075e6, but please try it for
> yourself and check whether everything works as you expect it to.

Thanks for fixing the problem, but now I noticed that 'emacs-pdf-tools'
doesn't build.

--8<---------------cut here---------------start------------->8---
starting phase `emacs-add-source-to-load-path'
Backtrace:
           7 (primitive-load "/gnu/store/g7vcnpqrs3p76qm9xrnm1sz65ss…")
In ice-9/eval.scm:
   191:35  6 (_ _)
In guix/build/gnu-build-system.scm:
    838:2  5 (gnu-build #:source _ #:outputs _ #:inputs _ #:phases . #)
In ice-9/boot-9.scm:
  1736:10  4 (with-exception-handler _ _ #:unwind? _ # _)
In srfi/srfi-1.scm:
   857:16  3 (every1 #<procedure 7ffff2b447c0 at guix/build/gnu-bui…> …)
In guix/build/gnu-build-system.scm:
   847:30  2 (_ _)
   847:30  1 (_ _)
In ice-9/boot-9.scm:
  1669:16  0 (raise-exception _ #:continuable? _)

ice-9/boot-9.scm:1669:16: In procedure raise-exception:
Wrong type to apply: #f
note: keeping build directory 
`/tmp/guix-build-emacs-pdf-tools-0.90-1.c510442.drv-0'
builder for 
`/gnu/store/d992q7cfb1wlfffg15g7bgsa32qjanrm-emacs-pdf-tools-0.90-1.c510442.drv'
 failed with exit code 1
build of 
/gnu/store/d992q7cfb1wlfffg15g7bgsa32qjanrm-emacs-pdf-tools-0.90-1.c510442.drv 
failed
View build log at 
'/var/log/guix/drvs/d9/92q7cfb1wlfffg15g7bgsa32qjanrm-emacs-pdf-tools-0.90-1.c510442.drv.bz2'.
guix build: error: build of 
`/gnu/store/d992q7cfb1wlfffg15g7bgsa32qjanrm-emacs-pdf-tools-0.90-1.c510442.drv'
 failed
--8<---------------cut here---------------end--------------->8---

The attached patch fixed the problem for me.

>From b49dd5be93bb5ba9630dca8d5bb142f258cb0781 Mon Sep 17 00:00:00 2001
Message-Id: 
<b49dd5be93bb5ba9630dca8d5bb142f258cb0781.1617528618.git.public@yoctocell.xyz>
From: Xinglu Chen <public@yoctocell.xyz>
Date: Sun, 4 Apr 2021 11:28:04 +0200
Subject: [PATCH wip-emacs] gnu: emacs-pdf-tools: Adjust to changes in
 emacs-build-system.

* gnu/packages/emacs-xyz.scm (emacs-pdf-tools)[#:phases]: Rename
'add-source-to-load-path' to '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 0382cfdd17..9dbfce6f37 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -2920,7 +2920,7 @@ during idle time, while Emacs is doing nothing else.")
                (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))
+             (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

base-commit: 2be3daa19d2fd47933c622995d2f2dde714075e6
-- 
2.31.1