ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-06 03:17:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: cl-asdf: Update to 3.3.4.

Browse source 
* 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'.
This commit is contained in:
Guillaume Le Vaillant 2020-09-12 00:02:06 +02:00
parent 2ff8b5bafc
commit 4136736b52
No known key found for this signature in database
GPG key ID: 6BE8208ADF21FE3F
1 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
gnu/packages/lisp.scm
View file

@ -78,21 +78,10 @@ (define-module (gnu packages lisp)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (ice-9 match)) #: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 (define-public cl-asdf
(package (package
(name "cl-asdf") (name "cl-asdf")
(version "3.3.3") (version "3.3.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -100,7 +89,7 @@ (define-public cl-asdf
(string-append "https://common-lisp.net/project/asdf/archives/asdf-" (string-append "https://common-lisp.net/project/asdf/archives/asdf-"
version ".lisp")) version ".lisp"))
(sha256 (sha256
(base32 "18lr6kxvzhr79c9rx3sdricz30aby866fj0m24w27zxsqlyvn3rd")))) (base32 "1hpx30f6yrak15nw992k7x3pn75ahvjs04n4f134k68mhgs62km2"))))
(build-system trivial-build-system) (build-system trivial-build-system)
(arguments (arguments
`(#:modules ((guix build utils) `(#:modules ((guix build utils)
@ -112,9 +101,29 @@ (define-public cl-asdf
(let* ((out (string-append (assoc-ref %outputs "out"))) (let* ((out (string-append (assoc-ref %outputs "out")))
(asdf-install (string-append out %source-install-prefix (asdf-install (string-append out %source-install-prefix
"/source/asdf/")) "/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) (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/") (home-page "https://common-lisp.net/project/asdf/")
(synopsis "Another System Definition Facility") (synopsis "Another System Definition Facility")
(description (description
@ -261,10 +270,7 @@ (define-public ecl
"/share/common-lisp/source/asdf/asdf.lisp")) "/share/common-lisp/source/asdf/asdf.lisp"))
(out (string-append (assoc-ref outputs "out"))) (out (string-append (assoc-ref outputs "out")))
(contrib-asdf "contrib/asdf/asdf.lisp")) (contrib-asdf "contrib/asdf/asdf.lisp"))
(copy-file guix-asdf contrib-asdf) (copy-file guix-asdf contrib-asdf))
;; Add ecl-bundle-systems to 'default-system-source-registry'.
(substitute* contrib-asdf
,@(asdf-substitutions name)))
#t)) #t))
(add-after 'install 'wrap (add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
@ -440,9 +446,7 @@ (define-public sbcl
"/share/common-lisp/source/asdf/asdf.lisp")) "/share/common-lisp/source/asdf/asdf.lisp"))
(out (string-append (assoc-ref outputs "out"))) (out (string-append (assoc-ref outputs "out")))
(contrib-asdf "contrib/asdf/asdf.lisp")) (contrib-asdf "contrib/asdf/asdf.lisp"))
(copy-file guix-asdf contrib-asdf) (copy-file guix-asdf contrib-asdf))
(substitute* contrib-asdf
,@(asdf-substitutions name)))
#t)) #t))
(add-before 'build 'patch-unix-tool-paths (add-before 'build 'patch-unix-tool-paths
(lambda* (#:key outputs inputs #:allow-other-keys) (lambda* (#:key outputs inputs #:allow-other-keys)