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-05 11:09:56.066229482 +0100 @@ -12535,10 +12535,15 @@ (find-preferred-file (system-config-pathnames *output-translations-file*) :direction direction)) (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*) + (find-preferred-file (list (xdg-config-home *output-translations-directory*)) :direction direction)) + (defun system-output-translations-directory-pathname (&key (direction :input)) + `(: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")) @@ -12921,10 +12926,15 @@ (find-preferred-file (system-config-pathnames *source-registry-file*) :direction direction)) (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*) + (find-preferred-file (list (xdg-config-home *source-registry-directory*)) :direction direction)) + (defun system-source-registry-directory (&key (direction :input)) + `(: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")) p;showmsg=1'>tests/minetest.scm
AgeCommit message (Collapse)Author
2021-09-18import: minetest: Strip "v" prefixes from the version number.Maxime Devos
This fixes one of the issues noted at <https://issues.guix.gnu.org/50425#4>. * guix/import/minetest.scm (release-version): New procedure. (%minetest->guix-package): Call new procedure instead of release-title. * tests/minetest.scm (make-package-sexp): Allow overriding the version number. (make-releases-json): Allow overriding the release title. ("conventional version number") ("v-prefixed version number") ("dates as version number"): New tests. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2021-09-18import: minetest: Delete duplicate dependencies.Maxime Devos
This fixes one of the issues noted in <https://issues.guix.gnu.org/50425#4>. * guix/import/minetest.scm (import-dependencies): Call 'delete-duplicates' on the resulting list. * tests/minetest.scm ("minetest->guix-package, multiple dependencies implemented by one mod"): New test. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2021-09-18tests/minetest: Fix 'test-package*' indenting.Maxime Devos
* tests/minetest.scm (Local Variables)[test-package*]: Set scheme-indent-function property to 1. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2021-08-20guix: Add ContentDB importer.Maxime Devos
* guix/import/contentdb.scm: New file. * guix/scripts/import/contentdb.scm: New file. * tests/contentdb.scm: New file. * Makefile.am (MODULES, SCM_TESTS): Register them. * po/guix/POTFILES.in: Likewise. * doc/guix.texi (Invoking guix import): Document it. Signed-off-by: Leo Prikler <leo.prikler@student.tugraz.at>