From 21357224bc1f450931fb3a64fe6d06f9d1137b67 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 17 Nov 2021 15:39:06 +0100 Subject: import: texlive: Load (gnu packages tex) dynamically. Fixes a bug whereby 'guix pull' would fail with this guix-extra.drv build failure: ice-9/eval.scm:163:9: ERROR: 1. &formatted-message: format: "~a: patch not found\n" arguments: ("nettle-3.5-check-_pkcs1_sec_decrypt-msg-len.patch") Reported by ekaitz on #guix. Regression introduced in 3b1a12c5bff5a0c108284d19a6982bdf663bbceb. * guix/import/texlive.scm: Autoload (gnu packages tex). fixlet --- guix/import/texlive.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm index 8677caee59..d0307ae944 100644 --- a/guix/import/texlive.scm +++ b/guix/import/texlive.scm @@ -38,7 +38,6 @@ (define-module (guix import texlive) #:use-module (guix upstream) #:use-module (guix packages) #:use-module (guix build-system texlive) - #:use-module (gnu packages tex) #:export (texlive->guix-package texlive-recursive-import)) @@ -111,6 +110,12 @@ (define (guix-name name) name))) (define (tlpdb-file) + (define texlive-bin + ;; Resolve this variable lazily so that (gnu packages ...) does not end up + ;; in the closure of this module. + (module-ref (resolve-interface '(gnu packages tex)) + 'texlive-bin)) + (with-store store (run-with-store store (mlet* %store-monad -- cgit v1.2.3