From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id UAAzMXX2yF9wCwAA0tVLHw (envelope-from ) for ; Thu, 03 Dec 2020 14:30:13 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id zIz7LHX2yF8aGQAA1q6Kng (envelope-from ) for ; Thu, 03 Dec 2020 14:30:13 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 0CFF9940858 for ; Thu, 3 Dec 2020 14:30:12 +0000 (UTC) Received: from localhost ([::1]:45688 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kkpcY-0001QZ-IY for larch@yhetil.org; Thu, 03 Dec 2020 09:30:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39074) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kkpcR-0001QP-Ci for bug-guix@gnu.org; Thu, 03 Dec 2020 09:30:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55692) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kkpcR-0007dA-5G for bug-guix@gnu.org; Thu, 03 Dec 2020 09:30:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kkpcQ-0000SN-W5 for bug-guix@gnu.org; Thu, 03 Dec 2020 09:30:03 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#45017: asdf-build-system packages have priority over user ones Resent-From: Guillaume Le Vaillant Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 03 Dec 2020 14:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45017 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Pierre Neidhardt Received: via spool by 45017-submit@debbugs.gnu.org id=B45017.16070057701693 (code B ref 45017); Thu, 03 Dec 2020 14:30:02 +0000 Received: (at 45017) by debbugs.gnu.org; 3 Dec 2020 14:29:30 +0000 Received: from localhost ([127.0.0.1]:39005 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kkpbq-0000RC-50 for submit@debbugs.gnu.org; Thu, 03 Dec 2020 09:29:29 -0500 Received: from mout01.posteo.de ([185.67.36.65]:35812) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kkpbk-0000Qt-Be for 45017@debbugs.gnu.org; Thu, 03 Dec 2020 09:29:24 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id BA21416005F for <45017@debbugs.gnu.org>; Thu, 3 Dec 2020 15:29:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1607005753; bh=9RACgeLpqB5D4i3Oh5fzb3sN9B8VPbzB42+jlF8jFuw=; h=From:To:Cc:Subject:Date:From; b=oVtsIB2snfOvCGJbokWQybuzJ4PteCUFSnKCAkkx4iZHhNww69DeLA90c28cMDkwN CiQ2wdLIpg6+BqwhdDP9t0ApM4pc6SMNtnoRM+ZV1SweaWASCbX9EfOFYOxHqUGYVW 3P1czwgJB+/yGhkm6WmPWiDqfJtCy4WV/lmEDToto2ghb8A7rQLuru7oRw47ekjkaC OIlsDWoQDi5+Vvx4Mgiv3DLNahGNPH3sdfMVcCGaaDgxHHNxrywFlgB6/2QLWQPMW0 MvAQskwJ7vyCvNZvsHDRydFns7dD+ThjW0uD57XU5qVrrQ9ZINdqUbboG7ZKF8y1AH n7f3lMJAk7V+A== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Cmyrm3XpBz9rxK; Thu, 3 Dec 2020 15:29:12 +0100 (CET) References: <87wnxzmdiy.fsf@ambrevar.xyz> <87im9j2j06.fsf@yamatai> <87360nm5b1.fsf@ambrevar.xyz> User-agent: mu4e 1.4.13; emacs 27.1 From: Guillaume Le Vaillant In-reply-to: <87360nm5b1.fsf@ambrevar.xyz> Date: Thu, 03 Dec 2020 15:29:10 +0100 Message-ID: <87ft4n2cax.fsf@yamatai> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 45017@debbugs.gnu.org Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -2.78 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=posteo.net header.s=2017 header.b=oVtsIB2s; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: 0CFF9940858 X-Spam-Score: -2.78 X-Migadu-Scanner: ns3122888.ip-94-23-21.eu X-TUID: HSJiXkCBWVnJ --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Pierre Neidhardt skribis: > Alternately, we could simply move the patch from > user-source-registry-directory to system-source-registry-directory; same > for the output translation. What do you think of the attached patch? Does it work for you? --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-cl-asdf-Improve-priorities-of-configuration-file.patch Content-Transfer-Encoding: quoted-printable From=20cb8d52ec606bb8984622f6b117346b4772bf0d16 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 3 Dec 2020 14:52:02 +0100 Subject: [PATCH] gnu: cl-asdf: Improve priorities of configuration file search. * gnu/packages/patches/cl-asdf-config-directories.patch: New file. * gnu/local.mk (dist_PATCH_DATA): Add it. * gnu/packages/lisp.scm (cl-asdf)[native-inputs]: Add it. [arguments]: Apply the new patch. =2D-- gnu/local.mk | 1 + gnu/packages/lisp.scm | 28 +++++---------- .../patches/cl-asdf-config-directories.patch | 36 +++++++++++++++++++ 3 files changed, 45 insertions(+), 20 deletions(-) create mode 100644 gnu/packages/patches/cl-asdf-config-directories.patch diff --git a/gnu/local.mk b/gnu/local.mk index 28ad119846..f838ebe1fa 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -868,6 +868,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/cdrtools-3.01-mkisofs-isoinfo.patch \ %D%/packages/patches/ceph-disable-cpu-optimizations.patch \ %D%/packages/patches/chmlib-inttypes.patch \ + %D%/packages/patches/cl-asdf-config-directories.patch \ %D%/packages/patches/clamav-config-llvm-libs.patch \ %D%/packages/patches/clamav-system-tomsfastmath.patch \ %D%/packages/patches/clang-3.5-libc-search-path.patch \ diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index e4c963070e..0038cb0dca 100644 =2D-- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -90,6 +90,9 @@ (sha256 (base32 "1hpx30f6yrak15nw992k7x3pn75ahvjs04n4f134k68mhgs62km2")))) (build-system trivial-build-system) + (native-inputs + `(("config-patch" ,@(search-patches "cl-asdf-config-directories.patch= ")) + ("patch" ,patch))) (arguments `(#:modules ((guix build utils) (guix build lisp-utils)) @@ -101,28 +104,13 @@ (asdf-install (string-append out %source-install-prefix "/source/asdf/")) (src-asdf (string-append (assoc-ref %build-inputs "source"= ))) =2D (dst-asdf (string-append asdf-install "asdf.lisp"))) + (dst-asdf (string-append asdf-install "asdf.lisp")) + (patch (string-append (assoc-ref %build-inputs "patch") + "/bin/patch")) + (config-patch (assoc-ref %build-inputs "config-patch"))) (mkdir-p asdf-install) (copy-file src-asdf dst-asdf) =2D ;; Patch ASDF to make it read the configuration files in all =2D ;; the direcories listed in '$XDG_CONFIG_DIRS' instead of just =2D ;; the first. =2D (substitute* dst-asdf =2D (("\\(xdg-config-pathname \\*source-registry-directory\\* d= irection\\)") =2D "`(:source-registry =2D ,@(loop =2D for dir in (xdg-config-dirs =2D \"common-lisp/source-registry.conf.d/\= ") =2D collect `(:include ,dir)) =2D :inherit-configuration)") =2D (("\\(xdg-config-pathname \\*output-translations-directory\= \* direction\\)") =2D "`(:output-translations =2D ,@(loop =2D for dir in (xdg-config-dirs =2D \"common-lisp/asdf-output-translations= .conf.d/\") =2D collect `(:include ,dir)) =2D :inherit-configuration)"))) =2D #t))) + (invoke patch "-p1" "-i" config-patch dst-asdf))))) (home-page "https://common-lisp.net/project/asdf/") (synopsis "Another System Definition Facility") (description diff --git a/gnu/packages/patches/cl-asdf-config-directories.patch b/gnu/pa= ckages/patches/cl-asdf-config-directories.patch new file mode 100644 index 0000000000..04ec67c9a0 =2D-- /dev/null +++ b/gnu/packages/patches/cl-asdf-config-directories.patch @@ -0,0 +1,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 :in= put)) + (xdg-config-pathname *output-translations-directory* direction)) + (defun system-output-translations-directory-pathname (&key (direction := input)) +- (find-preferred-file (system-config-pathnames *output-translations-di= rectory*) +- :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")) +=20 +@@ -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-direct= ory*) +- :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")) +=20 =2D-=20 2.29.2 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIUEAREKAC0WIQTLxZxm7Ce5cXlAaz5r6CCK3yH+PwUCX8j2Ng8cZ2x2QHBvc3Rl by5uZXQACgkQa+ggit8h/j8+7AD/THNUo+OfK4z7fkW4cWucZ47kjoqjxPjLCKbY oVy9nlIA/il1BZr2Y1VQ7q42nbM9ktVjFNdXxiTzb+A4g7puqSj4 =rxih -----END PGP SIGNATURE----- --==-=-=--