[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/08: gnu: cl-asdf: Update to 3.3.4.
From: |
guix-commits |
Subject: |
03/08: gnu: cl-asdf: Update to 3.3.4. |
Date: |
Sat, 12 Sep 2020 05:25:24 -0400 (EDT) |
glv pushed a commit to branch wip-lisp
in repository guix.
commit 4136736b52f757ef8ee9e40cd138c7cf7f619bba
Author: Guillaume Le Vaillant <glv@posteo.net>
AuthorDate: Sat Sep 12 00:02:06 2020 +0200
gnu: cl-asdf: Update to 3.3.4.
* gnu/packages/lisp.scm (cl-asdf): Update to 3.3.4.
[arguments]: Add small patch for default ASDF configuration.
(asdf-substitutions): Remove variable.
(sbcl, ecl)[arguments]: Remove call to 'asdf-substitutions'.
---
gnu/packages/lisp.scm | 48 ++++++++++++++++++++++++++----------------------
1 file changed, 26 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index d2730f3..c2a3fa4 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -78,21 +78,10 @@
#:use-module (gnu packages xorg)
#:use-module (ice-9 match))
-(define (asdf-substitutions lisp)
- ;; Prepend XDG_DATA_DIRS/LISP-bundle-systems to ASDF's
- ;; 'default-system-source-registry'.
- `((("\\(,dir \"systems/\"\\)\\)")
- (format #f
- "(,dir \"~a-bundle-systems\")))
-
- ,@(loop :for dir :in (xdg-data-dirs \"common-lisp/\")
- :collect `(:directory (,dir \"systems\"))"
- ,lisp))))
-
(define-public cl-asdf
(package
(name "cl-asdf")
- (version "3.3.3")
+ (version "3.3.4")
(source
(origin
(method url-fetch)
@@ -100,7 +89,7 @@
(string-append "https://common-lisp.net/project/asdf/archives/asdf-"
version ".lisp"))
(sha256
- (base32 "18lr6kxvzhr79c9rx3sdricz30aby866fj0m24w27zxsqlyvn3rd"))))
+ (base32 "1hpx30f6yrak15nw992k7x3pn75ahvjs04n4f134k68mhgs62km2"))))
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils)
@@ -112,9 +101,29 @@
(let* ((out (string-append (assoc-ref %outputs "out")))
(asdf-install (string-append out %source-install-prefix
"/source/asdf/"))
- (asdf (string-append (assoc-ref %build-inputs "source"))))
+ (src-asdf (string-append (assoc-ref %build-inputs "source")))
+ (dst-asdf (string-append asdf-install "asdf.lisp")))
(mkdir-p asdf-install)
- (copy-file asdf (string-append asdf-install "asdf.lisp"))))))
+ (copy-file src-asdf dst-asdf)
+ ;; Patch ASDF to make it read the configuration files in all
+ ;; the direcories listed in '$XDG_CONFIG_DIRS' instead of just
+ ;; the first.
+ (substitute* dst-asdf
+ (("\\(xdg-config-pathname \\*source-registry-directory\\*
direction\\)")
+ "`(:source-registry
+ ,@(loop
+ for dir in (xdg-config-dirs
+ \"common-lisp/source-registry.conf.d/\")
+ collect `(:include ,dir))
+ :inherit-configuration)")
+ (("\\(xdg-config-pathname \\*output-translations-directory\\*
direction\\)")
+ "`(:output-translations
+ ,@(loop
+ for dir in (xdg-config-dirs
+
\"common-lisp/asdf-output-translations.conf.d/\")
+ collect `(:include ,dir))
+ :inherit-configuration)")))
+ #t)))
(home-page "https://common-lisp.net/project/asdf/")
(synopsis "Another System Definition Facility")
(description
@@ -261,10 +270,7 @@ interface to the Tk widget system.")
"/share/common-lisp/source/asdf/asdf.lisp"))
(out (string-append (assoc-ref outputs "out")))
(contrib-asdf "contrib/asdf/asdf.lisp"))
- (copy-file guix-asdf contrib-asdf)
- ;; Add ecl-bundle-systems to 'default-system-source-registry'.
- (substitute* contrib-asdf
- ,@(asdf-substitutions name)))
+ (copy-file guix-asdf contrib-asdf))
#t))
(add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys)
@@ -440,9 +446,7 @@ an interpreter, a compiler, a debugger, and much more.")
"/share/common-lisp/source/asdf/asdf.lisp"))
(out (string-append (assoc-ref outputs "out")))
(contrib-asdf "contrib/asdf/asdf.lisp"))
- (copy-file guix-asdf contrib-asdf)
- (substitute* contrib-asdf
- ,@(asdf-substitutions name)))
+ (copy-file guix-asdf contrib-asdf))
#t))
(add-before 'build 'patch-unix-tool-paths
(lambda* (#:key outputs inputs #:allow-other-keys)
- branch wip-lisp created (now 3b39207), guix-commits, 2020/09/12
- 02/08: gnu: Adapt Lisp packages to changes in asdf-build-system., guix-commits, 2020/09/12
- 05/08: gnu: sbcl-osicat: Fix build., guix-commits, 2020/09/12
- 01/08: build-system: asdf: Switch from bundles to regular compilation., guix-commits, 2020/09/12
- 03/08: gnu: cl-asdf: Update to 3.3.4.,
guix-commits <=
- 04/08: gnu: sbcl-moptilities: Fix tests., guix-commits, 2020/09/12
- 06/08: gnu: sbcl-cl-rdkafka: Fix build., guix-commits, 2020/09/12
- 07/08: gnu: sbcl-portable-threads: Update to 2.3-2.aa26bf3., guix-commits, 2020/09/12
- 08/08: gnu: cl-uffi: Fix build., guix-commits, 2020/09/12