diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-11-17 18:00:28 -0500 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-11-17 18:00:28 -0500 |
commit | 129b9b16d9b588316cc997cf8f4fefe30961a417 (patch) | |
tree | bc1dc50e83af6e9afb2ee24cd32f5e42e039642e /guix/self.scm | |
parent | 5f9c92dd6285a1ef326cf5aa99781f1f3acbd245 (diff) | |
parent | 9113de2ca2db195908e3262b3752f8392ada8630 (diff) | |
download | guix-patches-129b9b16d9b588316cc997cf8f4fefe30961a417.tar guix-patches-129b9b16d9b588316cc997cf8f4fefe30961a417.tar.gz |
Merge remote-tracking branch 'origin/version-1.2.0' into master
Conflicts:
gnu/packages/bioinformatics.scm
The python-pysam package fixed in master was kept instead of the update done
in the version-1.2.0 branch.
Diffstat (limited to 'guix/self.scm')
-rw-r--r-- | guix/self.scm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/guix/self.scm b/guix/self.scm index bbfd2f1b95..026dcd9c1a 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -400,6 +400,12 @@ a list of extra files, such as '(\"contributing\")." (find-files directory "\\.[a-z]{2}(_[A-Z]{2})?\\.po$"))) + (define parallel-jobs + ;; Limit thread creation by 'n-par-for-each'. Going beyond can + ;; lead libgc 8.0.4 to abort with: + ;; mmap(PROT_NONE) failed + (min (parallel-job-count) 4)) + (mkdir #$output) (copy-recursively #$documentation "." #:log (%make-void-port "w")) @@ -415,14 +421,14 @@ a list of extra files, such as '(\"contributing\")." (setenv "LC_ALL" "en_US.UTF-8") (setlocale LC_ALL "en_US.UTF-8") - (n-par-for-each (parallel-job-count) + (n-par-for-each parallel-jobs (match-lambda ((language . po) (translate-texi "guix" po language #:extras '("contributing")))) (available-translations "." "guix-manual")) - (n-par-for-each (parallel-job-count) + (n-par-for-each parallel-jobs (match-lambda ((language . po) (translate-texi "guix-cookbook" po language))) |