From e84d9dcd5b80fbacc2853bde53cf0e2da572beb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20K=C4=85dzio=C5=82ka?= Date: Thu, 23 Apr 2020 14:21:00 +0200 Subject: git-version: Raise a condition instead of an error. * guix/git-download.scm (git-version): Replace ERROR with RAISE and CONDITION. This is a follow-up to commit bbf6bc1acc9bbdebf7ee7b68c0fa091733a5f6e1. --- guix/git-download.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'guix') diff --git a/guix/git-download.scm b/guix/git-download.scm index ef0bb2e281..a1c1adf760 100644 --- a/guix/git-download.scm +++ b/guix/git-download.scm @@ -179,7 +179,9 @@ HASH-ALGO (a symbol). Use NAME as the file name, or a generic name if #f." ;; can happen, for example, when the user swapped the revision and commit ;; arguments by mistake. (when (< (string-length commit) 7) - (error "git-version: commit ID unexpectedly short")) + (raise + (condition + (&message (message "git-version: commit ID unexpectedly short"))))) (string-append version "-" revision "." (string-take commit 7))) (define (git-file-name name version) -- cgit v1.2.3 From f0779922ff260df2404c90504986aa59553154fb Mon Sep 17 00:00:00 2001 From: zimoun Date: Thu, 23 Apr 2020 16:09:00 +0200 Subject: licenses: Export license record. * guix/licenses.scm (): Export it. Signed-off-by: Mathieu Othacehe --- guix/licenses.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'guix') diff --git a/guix/licenses.scm b/guix/licenses.scm index ab2ad3f169..f9bcd96df6 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -32,7 +32,7 @@ (define-module (guix licenses) #:use-module (srfi srfi-9) - #:export (license? license-name license-uri license-comment + #:export (license license? license-name license-uri license-comment agpl1 agpl3 agpl3+ asl1.1 asl2.0 boost1.0 -- cgit v1.2.3 From 12da5162e49ea3b0f2e5e46f7aa5e410ebf30845 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 23 Apr 2020 23:10:19 +0200 Subject: compile: Pre-load the compiler outside 'with-target'. * guix/build/compile.scm (compile-files): Move call to 'compile' before 'with-target'. Failing to do that, if the target has a different word size than the host, the first call to 'compile-file' fails with: ice-9/eval.scm:293:34: In procedure load-thunk-from-memory: ELF file does not have native word size while attempting loading 'language/spec.go'. --- guix/build/compile.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'guix') diff --git a/guix/build/compile.scm b/guix/build/compile.scm index 3ce0ecede5..c4dbb6e34c 100644 --- a/guix/build/compile.scm +++ b/guix/build/compile.scm @@ -194,6 +194,11 @@ files are for HOST, a GNU triplet such as \"x86_64-linux-gnu\"." (with-augmented-search-path %load-path source-directory (with-augmented-search-path %load-compiled-path build-directory (with-fluids ((*current-warning-prefix* "")) + ;; Make sure the compiler's modules are loaded before 'with-target' + ;; (since 'with-target' influences the .go loader), and before + ;; starting to compile files in parallel. + (compile #f) + (with-target host (lambda () ;; FIXME: To work around , we first @@ -202,10 +207,6 @@ files are for HOST, a GNU triplet such as \"x86_64-linux-gnu\"." #:report-load report-load #:debug-port debug-port) - ;; Make sure compilation related modules are loaded before - ;; starting to compile files in parallel. - (compile #f) - ;; XXX: Don't use too many workers to work around the insane ;; memory requirements of the compiler in Guile 2.2.2: ;; . -- cgit v1.2.3 From 1597613488d328c7987a18c088cf6e47467223b9 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 24 Apr 2020 09:10:35 +0200 Subject: Revert "licenses: Export license record." This reverts commit f0779922ff260df2404c90504986aa59553154fb. We do not want to export the license record, see: https://lists.gnu.org/archive/html/guix-commits/2020-04/msg01923.html. --- guix/licenses.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'guix') diff --git a/guix/licenses.scm b/guix/licenses.scm index f9bcd96df6..ab2ad3f169 100644 --- a/guix/licenses.scm +++ b/guix/licenses.scm @@ -32,7 +32,7 @@ (define-module (guix licenses) #:use-module (srfi srfi-9) - #:export (license license? license-name license-uri license-comment + #:export (license? license-name license-uri license-comment agpl1 agpl3 agpl3+ asl1.1 asl2.0 boost1.0 -- cgit v1.2.3 From 962554ddcf86675362486a683acd94863ba68d8a Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 24 Apr 2020 15:15:50 +0200 Subject: guix package: Export 'search-path-environment-variables'. ...because Emacs-Guix uses it. * guix/scripts/package.scm (search-path-environment-variables): Export. --- guix/scripts/package.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'guix') diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index 40445832aa..2eb18919cc 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -63,6 +63,8 @@ delete-matching-generations guix-package + search-path-environment-variables + transaction-upgrade-entry ;mostly for testing (%options . %package-options) -- cgit v1.2.3