[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Wed, 31 Jul 2019 08:32:39 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 6a2e54236e1b2c428c8fd478ee0f3bd8130703fa
Merge: 2cf1e37 3d88855
Author: Marius Bakke <address@hidden>
Date: Wed Jul 31 14:28:56 2019 +0200
Merge branch 'master' into core-updates
Makefile.am | 109 ++--
configure.ac | 4 +-
doc/guix.texi | 32 +-
gnu/installer.scm | 4 +-
gnu/installer/locale.scm | 21 +-
gnu/local.mk | 3 +
gnu/machine/ssh.scm | 189 +------
gnu/packages/admin.scm | 54 +-
gnu/packages/bioconductor.scm | 359 ++++++++++++
gnu/packages/bioinformatics.scm | 2 +-
gnu/packages/ci.scm | 2 +-
gnu/packages/compression.scm | 4 +-
gnu/packages/cran.scm | 362 ++++++++++++
gnu/packages/crypto.scm | 11 +-
gnu/packages/dictionaries.scm | 4 +-
gnu/packages/dns.scm | 5 +-
gnu/packages/ebook.scm | 27 +-
gnu/packages/emacs-xyz.scm | 237 +++++++-
gnu/packages/enlightenment.scm | 4 +-
gnu/packages/games.scm | 35 +-
gnu/packages/gnome.scm | 3 +
gnu/packages/golang.scm | 605 +++++++++++++++++----
gnu/packages/graphics.scm | 12 +-
gnu/packages/guile-xyz.scm | 6 +-
gnu/packages/guile.scm | 4 +
gnu/packages/image-viewers.scm | 4 +-
gnu/packages/image.scm | 4 +-
gnu/packages/julia.scm | 262 ++++++---
gnu/packages/kodi.scm | 4 +-
gnu/packages/linux.scm | 32 +-
gnu/packages/lisp.scm | 31 ++
gnu/packages/llvm.scm | 25 +-
gnu/packages/mail.scm | 145 ++++-
gnu/packages/networking.scm | 24 +
gnu/packages/package-management.scm | 4 +-
.../patches/dkimproxy-add-ipv6-support.patch | 75 +++
.../patches/libvirt-remove-ATTRIBUTE_UNUSED.patch | 34 ++
gnu/packages/python-xyz.scm | 33 +-
gnu/packages/sdl.scm | 4 +-
gnu/packages/spice.scm | 21 +-
gnu/packages/syncthing.scm | 155 +++---
gnu/packages/telephony.scm | 7 +-
gnu/packages/terminals.scm | 30 +
gnu/packages/text-editors.scm | 131 +++++
gnu/packages/textutils.scm | 47 +-
gnu/packages/tls.scm | 28 +-
gnu/packages/video.scm | 86 ++-
gnu/packages/virtualization.scm | 42 +-
gnu/packages/web.scm | 87 ++-
gnu/packages/xorg.scm | 4 +-
gnu/services/herd.scm | 6 +
gnu/system/vm.scm | 2 +-
gnu/tests/reconfigure.scm | 262 +++++++++
guix/build/go-build-system.scm | 3 +
guix/discovery.scm | 8 +-
guix/docker.scm | 19 +-
guix/gexp.scm | 49 +-
guix/git-download.scm | 4 +-
guix/git.scm | 69 ++-
guix/import/cpan.scm | 14 +-
guix/import/crate.scm | 6 +-
guix/import/gem.scm | 10 +-
guix/import/github.scm | 13 +-
guix/import/json.scm | 11 +-
guix/import/launchpad.scm | 13 +-
guix/import/pypi.scm | 8 +-
guix/import/stackage.scm | 4 +-
guix/import/utils.scm | 25 +-
guix/scripts/build.scm | 13 +-
guix/scripts/deploy.scm | 14 +-
guix/scripts/import/json.scm | 2 +-
guix/scripts/pack.scm | 2 +-
guix/scripts/system.scm | 181 ++----
guix/scripts/system/reconfigure.scm | 237 ++++++++
guix/self.scm | 2 +-
guix/swh.scm | 35 +-
m4/guix.m4 | 21 +
tests/gexp.scm | 19 +
tests/guix-build-branch.sh | 8 +-
tests/import-utils.scm | 22 +
tests/services.scm | 4 -
81 files changed, 3483 insertions(+), 1020 deletions(-)
diff --cc gnu/local.mk
index 5be252c,bd50964..0517578
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -753,6 -756,8 +754,7 @@@ dist_patch_DATA =
%D%/packages/patches/deja-dup-use-ref-keyword-for-iter.patch \
%D%/packages/patches/dfu-programmer-fix-libusb.patch \
%D%/packages/patches/diffutils-gets-undeclared.patch \
- %D%/packages/patches/diffutils-getopt.patch \
+ %D%/packages/patches/dkimproxy-add-ipv6-support.patch \
%D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch \
%D%/packages/patches/doc++-include-directives.patch \
%D%/packages/patches/doc++-segfault-fix.patch \
diff --cc guix/gexp.scm
index 586aaa4,45cd586..d9bdde2
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@@ -1337,10 -1351,15 +1340,11 @@@ last one is created from the given <sch
(guile (%guile-for-build))
(module-path %load-path)
(extensions '())
- (deprecation-warnings #f)
-
- ;; TODO: This flag is here to prevent a full
- ;; rebuild. Remove it on the next rebuild cycle.
- (pre-load-modules? #t))
+ (deprecation-warnings #f))
"Return a derivation that builds a tree containing the `.go' files
corresponding to MODULES. All the MODULES are built in a context where
- they can refer to each other."
+ they can refer to each other. When TARGET is true, cross-compile MODULES for
+ TARGET, a GNU triplet."
(define total (length modules))
(mlet %store-monad ((modules (imported-modules modules
@@@ -1370,12 -1395,25 +1380,22 @@@
(let* ((base (basename entry ".scm"))
(output (string-append output "/" base ".go")))
(format #t "[~2@a/~2@a] Compiling '~a'...~%"
- (+ 1 processed
- (ungexp-splicing (if pre-load-modules?
- (gexp ((ungexp total)))
- (gexp ()))))
- (ungexp (* total (if pre-load-modules? 2 1)))
+ (+ 1 processed (ungexp total))
+ (ungexp (* total 2))
entry)
- (compile-file entry
- #:output-file output
- #:opts %auto-compilation-options)
+
+ (ungexp-splicing
+ (if target
+ (gexp ((with-target (ungexp target)
+ (lambda ()
+ (compile-file entry
+ #:output-file output
+ #:opts
+ %auto-compilation-options)))))
+ (gexp ((compile-file entry
+ #:output-file output
+ #:opts
%auto-compilation-options)))))
+
(+ 1 processed))))
(define (process-directory directory output processed)