unofficial mirror of bug-guix@gnu.org 
 help / color / mirror / code / Atom feed
blob 04ec67c9a0a0e763a2cebc6d9532399e6de05d0f 1705 bytes (raw)
name: gnu/packages/patches/cl-asdf-config-directories.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
 
Search for ASDF configuration files first in user directories, and then in
Guix profiles.

diff -ru a/asdf-3.3.4.lisp b/asdf-3.3.4.lisp
--- a/asdf-3.3.4.lisp	2020-02-14 20:16:22.000000000 +0100
+++ b/asdf-3.3.4.lisp	2020-12-03 13:57:54.843428936 +0100
@@ -12537,8 +12537,12 @@
   (defun user-output-translations-directory-pathname (&key (direction :input))
     (xdg-config-pathname *output-translations-directory* direction))
   (defun system-output-translations-directory-pathname (&key (direction :input))
-    (find-preferred-file (system-config-pathnames *output-translations-directory*)
-                         :direction direction))
+    `(:output-translations
+      ,@(loop :for dir :in (filter-pathname-set
+                            (xdg-config-dirs
+                             "common-lisp/asdf-output-translations.conf.d/"))
+              :collect `(:include ,dir))
+      :inherit-configuration))
   (defun environment-output-translations ()
     (getenv "ASDF_OUTPUT_TRANSLATIONS"))
 
@@ -12923,8 +12927,12 @@
   (defun user-source-registry-directory (&key (direction :input))
     (xdg-config-pathname *source-registry-directory* direction))
   (defun system-source-registry-directory (&key (direction :input))
-    (find-preferred-file (system-config-pathnames *source-registry-directory*)
-                         :direction direction))
+    `(:source-registry
+      ,@(loop :for dir :in (filter-pathname-set
+                            (xdg-config-dirs
+                             "common-lisp/source-registry.conf.d/"))
+              :collect `(:include ,dir))
+      :inherit-configuration))
   (defun environment-source-registry ()
     (getenv "CL_SOURCE_REGISTRY"))
 

debug log:

solving 04ec67c9a0 ...
found 04ec67c9a0 in https://yhetil.org/guix-bugs/87ft4n2cax.fsf@yamatai/

applying [1/1] https://yhetil.org/guix-bugs/87ft4n2cax.fsf@yamatai/
diff --git a/gnu/packages/patches/cl-asdf-config-directories.patch b/gnu/packages/patches/cl-asdf-config-directories.patch
new file mode 100644
index 0000000000..04ec67c9a0

1:27: trailing whitespace.
 
1:42: trailing whitespace.
 
Checking patch gnu/packages/patches/cl-asdf-config-directories.patch...
1:42: new blank line at EOF.
+
Applied patch gnu/packages/patches/cl-asdf-config-directories.patch cleanly.
warning: 3 lines add whitespace errors.

index at:
100644 04ec67c9a0a0e763a2cebc6d9532399e6de05d0f	gnu/packages/patches/cl-asdf-config-directories.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).