[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'staging'
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'staging' |
|
Date: |
Mon, 19 Oct 2020 13:12:45 -0400 (EDT) |
apteryx pushed a commit to branch core-updates
in repository guix.
commit 5e2140511c1ad9ccd731438b74d61b62111da1e6
Merge: 9e3a5ee 353bdae
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Mon Oct 19 12:51:57 2020 -0400
Merge branch 'staging'
Conflicts:
gnu/packages/admin.scm
gnu/packages/commencement.scm
gnu/packages/gdb.scm
gnu/packages/llvm.scm
gnu/packages/package-management.scm
gnu/packages/tls.scm
.gitignore | 1 +
.guix-authorizations | 6 +-
Makefile.am | 19 +-
build-aux/cuirass/hurd-manifest.scm | 74 +
build-aux/hydra/guix-modular.scm | 30 +-
configure.ac | 3 +
doc/build.scm | 457 +-
doc/contributing.texi | 28 +-
doc/guix-cookbook.texi | 130 +-
doc/guix.texi | 2878 +-
etc/committer.scm.in | 4 +-
etc/completion/bash/guix | 7 +-
etc/guix-install.sh | 57 +-
etc/news.scm | 373 +
etc/openrc/guix-daemon.in | 28 +
etc/release-manifest.scm | 2 +
gnu/bootloader/grub.scm | 132 +-
gnu/bootloader/u-boot.scm | 69 +-
gnu/build/bootloader.scm | 15 +-
gnu/build/hurd-boot.scm | 5 +-
gnu/build/image.scm | 16 +-
gnu/build/linux-container.scm | 3 +-
gnu/build/secret-service.scm | 121 +-
gnu/build/shepherd.scm | 16 +-
gnu/ci.scm | 102 +-
gnu/image.scm | 29 +-
gnu/installer.scm | 5 +-
gnu/installer/connman.scm | 2 +-
gnu/installer/newt.scm | 2 +-
gnu/installer/newt/locale.scm | 2 +-
gnu/installer/newt/partition.scm | 4 +-
gnu/installer/newt/services.scm | 3 +-
gnu/installer/parted.scm | 4 +-
gnu/installer/services.scm | 6 +
gnu/installer/steps.scm | 2 +-
gnu/local.mk | 40 +-
gnu/machine/ssh.scm | 3 +
gnu/packages/abduco.scm | 3 +-
gnu/packages/accessibility.scm | 5 +-
gnu/packages/acl.scm | 3 +
gnu/packages/admin.scm | 140 +-
gnu/packages/algebra.scm | 35 +-
gnu/packages/antivirus.scm | 4 +-
gnu/packages/aspell.scm | 51 +
gnu/packages/astronomy.scm | 6 +-
gnu/packages/audio.scm | 129 +-
gnu/packages/aux-files/guile-launcher.c | 46 +
gnu/packages/aux-files/linux-libre/4.19-arm.conf | 3 +-
gnu/packages/aux-files/linux-libre/4.19-arm64.conf | 3 +-
gnu/packages/aux-files/linux-libre/4.19-i686.conf | 3 +-
.../aux-files/linux-libre/4.19-x86_64.conf | 3 +-
gnu/packages/aux-files/linux-libre/5.4-arm.conf | 3 +-
gnu/packages/aux-files/linux-libre/5.4-arm64.conf | 3 +-
gnu/packages/aux-files/linux-libre/5.4-i686.conf | 3 +-
gnu/packages/aux-files/linux-libre/5.4-x86_64.conf | 3 +-
gnu/packages/aux-files/linux-libre/5.8-arm.conf | 3 +-
gnu/packages/aux-files/linux-libre/5.8-arm64.conf | 3 +-
gnu/packages/aux-files/linux-libre/5.8-i686.conf | 3 +-
gnu/packages/aux-files/linux-libre/5.8-x86_64.conf | 3 +-
gnu/packages/avahi.scm | 2 +-
gnu/packages/axoloti.scm | 4 +-
gnu/packages/backup.scm | 10 +-
gnu/packages/base.scm | 8 +-
gnu/packages/benchmark.scm | 4 +-
gnu/packages/bioconductor.scm | 532 +-
gnu/packages/bioinformatics.scm | 369 +-
gnu/packages/boost.scm | 12 +-
gnu/packages/bootloaders.scm | 4 +-
gnu/packages/build-tools.scm | 6 +-
gnu/packages/c.scm | 61 +-
gnu/packages/calendar.scm | 55 +-
gnu/packages/ccache.scm | 4 +-
gnu/packages/cdrom.scm | 19 +-
gnu/packages/certs.scm | 4 +-
gnu/packages/check.scm | 34 +-
gnu/packages/chicken.scm | 2 +-
gnu/packages/chromium.scm | 192 +-
gnu/packages/ci.scm | 31 +-
gnu/packages/cluster.scm | 4 +-
gnu/packages/code.scm | 95 +-
gnu/packages/commencement.scm | 12 +-
gnu/packages/compression.scm | 36 +-
gnu/packages/conky.scm | 2 +-
gnu/packages/cpp.scm | 85 +-
gnu/packages/cran.scm | 507 +-
gnu/packages/crates-graphics.scm | 2374 ++
gnu/packages/crates-gtk.scm | 667 +
gnu/packages/crates-io.scm | 12850 ++++----
gnu/packages/crypto.scm | 8 +-
gnu/packages/cryptsetup.scm | 6 +-
gnu/packages/cups.scm | 56 +-
gnu/packages/databases.scm | 317 +-
gnu/packages/datastructures.scm | 12 +-
gnu/packages/debug.scm | 74 +
gnu/packages/dico.scm | 6 +-
gnu/packages/dictionaries.scm | 4 +-
gnu/packages/diffoscope.scm | 2 +-
gnu/packages/disk.scm | 50 +-
gnu/packages/django.scm | 840 +-
gnu/packages/dns.scm | 147 +-
gnu/packages/docker.scm | 87 +-
gnu/packages/documentation.scm | 2 +-
gnu/packages/easyrpg.scm | 4 +-
gnu/packages/ebook.scm | 154 +-
gnu/packages/education.scm | 44 +-
gnu/packages/electronics.scm | 2 +-
gnu/packages/elf.scm | 5 +-
gnu/packages/elixir.scm | 6 +-
gnu/packages/emacs-xyz.scm | 743 +-
gnu/packages/emacs.scm | 42 +-
gnu/packages/emulators.scm | 34 +-
gnu/packages/engineering.scm | 32 +-
gnu/packages/enlightenment.scm | 35 +-
gnu/packages/entr.scm | 35 +-
gnu/packages/fcitx.scm | 5 +-
gnu/packages/file-systems.scm | 66 +-
gnu/packages/finance.scm | 189 +-
gnu/packages/fonts.scm | 39 +-
gnu/packages/fontutils.scm | 16 +-
gnu/packages/fpga.scm | 4 +-
gnu/packages/freedesktop.scm | 98 +-
gnu/packages/ftp.scm | 18 +-
gnu/packages/game-development.scm | 42 +-
gnu/packages/games.scm | 202 +-
gnu/packages/gdb.scm | 67 +-
gnu/packages/geo.scm | 20 +-
gnu/packages/gettext.scm | 8 +-
gnu/packages/glib.scm | 21 +-
gnu/packages/gnome-xyz.scm | 2 +-
gnu/packages/gnome.scm | 647 +-
gnu/packages/gnu-pw-mgr.scm | 12 +-
gnu/packages/gnucash.scm | 2 +-
gnu/packages/gnuzilla.scm | 366 +-
gnu/packages/golang.scm | 195 +-
gnu/packages/gps.scm | 8 +-
gnu/packages/graph.scm | 28 -
gnu/packages/graphics.scm | 34 +
gnu/packages/groff.scm | 20 +-
gnu/packages/groovy.scm | 1404 +-
gnu/packages/gstreamer.scm | 201 +-
gnu/packages/gtk.scm | 12 +-
gnu/packages/guile-xyz.scm | 38 +-
gnu/packages/guile.scm | 10 +-
gnu/packages/hardware.scm | 4 +-
gnu/packages/haskell-apps.scm | 8 +-
gnu/packages/haskell-check.scm | 7 +-
gnu/packages/haskell-web.scm | 2 +-
gnu/packages/haskell-xyz.scm | 4 +-
gnu/packages/hurd.scm | 15 +-
gnu/packages/hyperledger.scm | 2 +-
gnu/packages/ibus.scm | 6 +-
gnu/packages/idutils.scm | 2 +-
gnu/packages/image-processing.scm | 51 +-
gnu/packages/image.scm | 75 +-
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/inkscape.scm | 5 +-
gnu/packages/ipfs.scm | 4 +-
gnu/packages/java.scm | 630 +-
gnu/packages/julia.scm | 113 +-
gnu/packages/kde-frameworks.scm | 2 +-
gnu/packages/kde-internet.scm | 10 +-
gnu/packages/kde-utils.scm | 10 +-
gnu/packages/kde.scm | 37 +-
gnu/packages/kodi.scm | 2 +-
gnu/packages/language.scm | 42 +-
gnu/packages/libcanberra.scm | 3 +-
gnu/packages/libreoffice.scm | 48 +-
gnu/packages/libusb.scm | 6 +-
gnu/packages/linphone.scm | 2 +-
gnu/packages/linux.scm | 292 +-
gnu/packages/lisp-xyz.scm | 5926 +---
gnu/packages/lisp.scm | 67 +-
gnu/packages/llvm.scm | 187 +-
gnu/packages/logging.scm | 15 +-
gnu/packages/lua.scm | 186 +-
gnu/packages/machine-learning.scm | 18 +-
gnu/packages/mail.scm | 270 +-
gnu/packages/markup.scm | 22 +-
gnu/packages/maths.scm | 28 +-
gnu/packages/matrix.scm | 5 +-
gnu/packages/maven.scm | 33 +-
gnu/packages/mercury.scm | 2 +-
gnu/packages/mes.scm | 28 +-
gnu/packages/messaging.scm | 96 +-
gnu/packages/monitoring.scm | 39 +-
gnu/packages/mpd.scm | 25 +-
gnu/packages/mpi.scm | 10 +-
gnu/packages/music.scm | 283 +-
gnu/packages/nano.scm | 4 +-
gnu/packages/networking.scm | 66 +-
gnu/packages/nfs.scm | 3 +-
gnu/packages/nss.scm | 66 +-
gnu/packages/ntp.scm | 9 +-
gnu/packages/ocaml.scm | 383 +-
gnu/packages/onc-rpc.scm | 13 +-
gnu/packages/openldap.scm | 4 +-
gnu/packages/package-management.scm | 108 +-
gnu/packages/parallel.scm | 16 +-
gnu/packages/password-utils.scm | 14 +-
.../patches/clamav-system-tomsfastmath.patch | 53 +-
.../patches/clang-11.0-libc-search-path.patch | 89 +
gnu/packages/patches/dconf-meson-0.52.patch | 19 -
gnu/packages/patches/fplll-std-fenv.patch | 18 +
.../patches/gnome-settings-daemon-gc.patch | 43 +
.../patches/grim-revert-output-rotation.patch | 27 +
gnu/packages/patches/hplip-fix-bug-1898438.patch | 19 +
gnu/packages/patches/icecat-makeicecat.patch | 14 +-
.../patches/jamvm-1.5.1-aarch64-support.patch | 572 +
...m-arm.patch => jamvm-1.5.1-armv7-support.patch} | 0
.../patches/jamvm-2.0.0-aarch64-support.patch | 645 +
.../patches/jamvm-2.0.0-opcode-guard.patch | 35 +
.../java-antlr4-Add-standalone-generator.patch | 52 +
.../patches/java-antlr4-fix-code-too-large.java | 90 +
...ava-tunnelvisionlabs-antlr-code-too-large.patch | 87 +
.../konversation-Fix-build-with-Qt-5.11.patch | 24 -
.../patches/libcanberra-wayland-crash.patch | 55 +
gnu/packages/patches/libcyaml-libyaml-compat.patch | 51 +
gnu/packages/patches/libdrm-realpath-virtio.patch | 42 -
gnu/packages/patches/liblouisutdml-fix-tests.patch | 33 -
.../patches/libsndfile-CVE-2017-12562.patch | 97 -
.../libsndfile-CVE-2017-8361-8363-8365.patch | 77 -
.../patches/libsndfile-CVE-2017-8362.patch | 61 -
.../patches/libsndfile-armhf-type-checks.patch | 42 -
gnu/packages/patches/lsh-fix-x11-forwarding.patch | 20 +
.../mailutils-fix-uninitialized-variable.patch | 26 +
.../patches/mariadb-client-test-32bit.patch | 37 -
gnu/packages/patches/nginx-socket-cloexec.patch | 185 +
...ss-pkgconfig.patch => nss-3.56-pkgconfig.patch} | 11 +-
.../patches/picard-fix-id3-rename-test.patch | 11 +
.../python-gst-fix-build-with-python-3.8.patch | 36 -
gnu/packages/patches/qemu-build-info-manual.patch | 139 +
.../patches/samba-fix-fcntl-hint-detection.patch | 55 +
.../patches/sbcl-graph-asdf-definitions.patch | 70 -
.../patches/sunxi-tools-remove-sys-io.patch | 52 +
gnu/packages/patches/unison-fix-ocaml-4.08.patch | 81 +
gnu/packages/patches/xpra-4.0.4-norequests.patch | 39 +
gnu/packages/patchutils.scm | 19 +-
gnu/packages/pciutils.scm | 4 +-
gnu/packages/pdf.scm | 5 +-
gnu/packages/perl-check.scm | 5 +-
gnu/packages/perl.scm | 94 +-
gnu/packages/photo.scm | 10 +-
gnu/packages/php.scm | 10 +-
gnu/packages/popt.scm | 16 +-
gnu/packages/pretty-print.scm | 29 +-
gnu/packages/prolog.scm | 6 +-
gnu/packages/protobuf.scm | 11 +-
gnu/packages/pulseaudio.scm | 37 +-
gnu/packages/python-check.scm | 47 +-
gnu/packages/python-crypto.scm | 127 +-
gnu/packages/python-web.scm | 214 +-
gnu/packages/python-xyz.scm | 749 +-
gnu/packages/python.scm | 5 +-
gnu/packages/qt.scm | 34 +-
gnu/packages/radio.scm | 11 +-
gnu/packages/rdesktop.scm | 24 +-
gnu/packages/rdf.scm | 10 +-
gnu/packages/ruby.scm | 13 +-
gnu/packages/rust-apps.scm | 3 +-
gnu/packages/rust.scm | 33 +-
gnu/packages/sagemath.scm | 2 +-
gnu/packages/samba.scm | 7 +-
gnu/packages/security-token.scm | 4 +-
gnu/packages/sequoia.scm | 8 +-
gnu/packages/shells.scm | 18 +-
gnu/packages/skarnet.scm | 30 +-
gnu/packages/sphinx.scm | 51 +-
gnu/packages/spice.scm | 7 +-
gnu/packages/ssh.scm | 76 +-
gnu/packages/sssd.scm | 2 +-
gnu/packages/statistics.scm | 257 +-
gnu/packages/suckless.scm | 4 +-
gnu/packages/syndication.scm | 33 +-
gnu/packages/task-management.scm | 68 +-
gnu/packages/tbb.scm | 4 +-
gnu/packages/terminals.scm | 44 +-
gnu/packages/tex.scm | 155 +
gnu/packages/text-editors.scm | 8 +-
gnu/packages/textutils.scm | 23 +-
gnu/packages/tls.scm | 8 +-
gnu/packages/tor.scm | 4 +-
gnu/packages/toys.scm | 110 +-
gnu/packages/tv.scm | 2 +-
gnu/packages/uml.scm | 6 +-
gnu/packages/valgrind.scm | 23 +-
gnu/packages/version-control.scm | 43 +-
gnu/packages/video.scm | 102 +-
gnu/packages/vim.scm | 17 +-
gnu/packages/virtualization.scm | 135 +-
gnu/packages/vlang.scm | 89 +-
gnu/packages/vpn.scm | 9 +-
gnu/packages/vulkan.scm | 12 +-
gnu/packages/web-browsers.scm | 85 +-
gnu/packages/web.scm | 382 +-
gnu/packages/webkit.scm | 5 +-
gnu/packages/wget.scm | 7 +-
gnu/packages/wm.scm | 97 +-
gnu/packages/wv.scm | 20 +-
gnu/packages/xdisorg.scm | 51 +-
gnu/packages/xfce.scm | 4 +-
gnu/packages/xiph.scm | 8 +-
gnu/packages/xml.scm | 5 +-
gnu/packages/xorg.scm | 73 +-
gnu/services.scm | 7 +-
gnu/services/base.scm | 18 +-
gnu/services/cuirass.scm | 48 +-
gnu/services/desktop.scm | 129 +-
gnu/services/dict.scm | 2 +-
gnu/services/dns.scm | 70 +-
gnu/services/docker.scm | 20 +-
gnu/services/ganeti.scm | 2 +-
gnu/services/guix.scm | 437 +-
gnu/services/messaging.scm | 12 +-
gnu/services/networking.scm | 6 +-
gnu/services/ssh.scm | 131 +-
gnu/services/version-control.scm | 9 +-
gnu/services/virtualization.scm | 154 +-
gnu/services/web.scm | 27 +-
gnu/services/xorg.scm | 3 +-
gnu/system.scm | 55 +-
gnu/system/examples/bare-hurd.tmpl | 9 +-
gnu/system/examples/lightweight-desktop.tmpl | 4 +-
gnu/system/file-systems.scm | 8 +-
gnu/system/hurd.scm | 25 +-
gnu/system/image.scm | 155 +-
gnu/system/images/hurd.scm | 32 +-
gnu/system/images/pine64.scm | 66 +
gnu/system/install.scm | 43 +-
gnu/system/linux-container.scm | 59 +-
gnu/tests/guix.scm | 75 +-
gnu/tests/install.scm | 51 +-
gnu/tests/virtualization.scm | 160 +-
guix/build-system.scm | 35 +-
guix/build-system/asdf.scm | 31 +-
guix/build-system/haskell.scm | 5 +-
guix/build/asdf-build-system.scm | 177 +-
guix/build/cargo-build-system.scm | 8 +-
guix/build/cargo-utils.scm | 5 +-
guix/build/go-build-system.scm | 13 +
guix/build/hg.scm | 44 +-
guix/build/lisp-utils.scm | 245 +-
guix/build/svn.scm | 38 +-
guix/channels.scm | 3 +-
guix/cve.scm | 12 +-
guix/describe.scm | 10 +-
guix/gexp.scm | 33 +-
guix/http-client.scm | 18 +-
guix/import/cabal.scm | 2 +-
guix/import/cpan.scm | 2 +-
guix/import/opam.scm | 25 +-
guix/import/stackage.scm | 4 +-
guix/import/utils.scm | 14 +-
guix/licenses.scm | 27 +-
guix/lint.scm | 2 +-
guix/openpgp.scm | 8 +-
guix/packages.scm | 168 +-
guix/scripts/authenticate.scm | 8 +-
guix/scripts/build.scm | 222 +-
guix/scripts/environment.scm | 17 +-
guix/scripts/import/hackage.scm | 2 +-
guix/scripts/offload.scm | 54 +-
guix/scripts/pack.scm | 39 +-
guix/scripts/package.scm | 43 +-
guix/scripts/repl.scm | 13 +-
guix/scripts/substitute.scm | 2 +-
guix/scripts/system.scm | 118 +-
guix/scripts/system/reconfigure.scm | 34 +-
guix/scripts/upgrade.scm | 2 +
guix/self.scm | 50 +-
guix/ui.scm | 9 +-
nix/libstore/build.cc | 33 +-
nix/local.mk | 17 +-
po/doc/guix-manual.de.po | 27010 ++++++++++-------
po/doc/guix-manual.es.po | 27052 ++++++++++-------
po/doc/guix-manual.fr.po | 23550 ++++++++------
po/doc/local.mk | 6 +-
po/guix/Makevars | 4 +-
po/guix/POTFILES.in | 1 +
po/guix/de.po | 1898 +-
po/guix/eo.po | 6905 ++++-
po/guix/es.po | 1906 +-
po/guix/fr.po | 1875 +-
po/guix/pt_BR.po | 1952 +-
po/packages/Makevars | 4 +-
po/packages/de.po | 11127 ++++---
po/packages/eo.po | 30346 ++++++++++++++++++-
po/packages/fr.po | 11160 ++++---
tests/boot-parameters.scm | 256 +
tests/channels.scm | 1 +
tests/containers.scm | 8 +
tests/guix-archive.sh | 9 +-
tests/guix-authenticate.sh | 9 +
tests/guix-build-branch.sh | 3 +-
tests/guix-build.sh | 60 +-
tests/guix-daemon.sh | 2 +-
tests/guix-download.sh | 12 +-
tests/guix-environment-container.sh | 25 +-
tests/guix-environment.sh | 8 +-
tests/guix-gc.sh | 13 +-
tests/guix-git-authenticate.sh | 5 +-
tests/guix-graph.sh | 7 +-
tests/guix-hash.sh | 12 +-
tests/guix-lint.sh | 18 +-
tests/guix-pack-relocatable.sh | 3 +-
tests/guix-pack.sh | 3 +-
tests/guix-package-aliases.sh | 20 +-
tests/guix-package-net.sh | 9 +-
tests/guix-package.sh | 66 +-
tests/guix-repl.sh | 4 +
tests/guix-system.sh | 23 +-
tests/opam.scm | 139 +-
tests/openpgp.scm | 12 +
tests/packages.scm | 192 +-
tests/scripts-build.scm | 108 +-
414 files changed, 131169 insertions(+), 63638 deletions(-)
diff --cc gnu/packages/gdb.scm
index 11e0bb3,828e495..9b96fd1
--- a/gnu/packages/gdb.scm
+++ b/gnu/packages/gdb.scm
@@@ -117,13 -111,13 +112,19 @@@
`(("texinfo" ,texinfo)
("dejagnu" ,dejagnu)
("pkg-config" ,pkg-config)
- ,@(if (hurd-target?) `(("mig" ,mig)) '())))
- ;; TODO: Add support for the GDB_DEBUG_FILE_DIRECTORY environment variable
- ;; in GDB itself instead of relying on some glue code in the Guix-provided
- ;; .gdbinit file.
+ ,@(if (hurd-target?)
+ ;; When cross-compiling from x86_64-linux, make sure to use a
+ ;; 32-bit MiG because we assume target i586-pc-gnu.
+ `(("mig" ,(if (%current-target-system)
+ mig/32-bit
+ mig)))
+ '())))
++ ;; TODO: Add support for the GDB_DEBUG_FILE_DIRECTORY environment
++ ;; variable in GDB itself instead of relying on some glue code in
++ ;; the Guix-provided .gdbinit file.
+ (native-search-paths (list (search-path-specification
+ (variable "GDB_DEBUG_FILE_DIRECTORY")
+ (files '("lib/debug")))))
(home-page "https://www.gnu.org/software/gdb/";)
(synopsis "The GNU debugger")
(description
diff --cc gnu/packages/llvm.scm
index ef7d652,c500430..127a8f5
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@@ -87,68 -87,6 +87,68 @@@ as \"x86_64-linux\".
(string-append "https://releases.llvm.org/"; version "/" component "-"
version ".src.tar.xz")))
+(define-public llvm-10
+ (package
+ (name "llvm")
+ (version "10.0.1")
+ (source
+ (origin
+ (method url-fetch)
- (uri (llvm-download-uri "llvm" version))
++ (uri (llvm-uri "llvm" version))
+ (sha256
+ (base32
+ "1wydhbp9kyjp5y0rc627imxgkgqiv3dfirbqil9dgpnbaw5y7n65"))))
+ (build-system cmake-build-system)
+ (outputs '("out" "opt-viewer"))
+ (native-inputs
+ `(("python" ,python-2) ;bytes->str conversion in clang>=3.7 needs
python-2
+ ("perl" ,perl)))
+ (inputs
+ `(("libffi" ,libffi)))
+ (propagated-inputs
+ `(("zlib" ,zlib))) ;to use output from llvm-config
+ (arguments
+ `(#:configure-flags '("-DCMAKE_SKIP_BUILD_RPATH=FALSE"
+ "-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE"
+ "-DBUILD_SHARED_LIBS:BOOL=TRUE"
+ "-DLLVM_ENABLE_FFI:BOOL=TRUE"
+ "-DLLVM_REQUIRES_RTTI=1" ; For some third-party
utilities
+ "-DLLVM_INSTALL_UTILS=ON") ; Needed for rustc.
+
+ ;; Don't use '-g' during the build, to save space.
+ #:build-type "Release"
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'shared-lib-workaround
+ ;; Even with CMAKE_SKIP_BUILD_RPATH=FALSE, llvm-tblgen
+ ;; doesn't seem to get the correct rpath to be able to run
+ ;; from the build directory. Set LD_LIBRARY_PATH as a
+ ;; workaround.
+ (lambda _
+ (setenv "LD_LIBRARY_PATH"
+ (string-append (getcwd) "/lib"))
+ #t))
+ (add-after 'install 'install-opt-viewer
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (opt-viewer-out (assoc-ref outputs "opt-viewer"))
+ (opt-viewer-share-dir (string-append opt-viewer-out
"/share"))
+ (opt-viewer-dir (string-append opt-viewer-share-dir
"/opt-viewer")))
+ (mkdir-p opt-viewer-share-dir)
+ (rename-file (string-append out "/share/opt-viewer")
+ opt-viewer-dir))
+ #t)))))
+ (home-page "https://www.llvm.org";)
+ (synopsis "Optimizing compiler infrastructure")
+ (description
+ "LLVM is a compiler infrastructure designed for compile-time, link-time,
+runtime, and idle-time optimization of programs from arbitrary programming
+languages. It currently supports compilation of C and C++ programs, using
+front-ends derived from GCC 4.0.1. A new front-end for the C family of
+languages is in development. The compiler infrastructure includes mirror sets
+of programming tools as well as libraries with equivalent functionality.")
+ (license license:asl2.0))) ;with LLVM exceptions, see LICENSE.txt
+
(define* (clang-runtime-from-llvm llvm hash
#:optional (patches '()))
(package
@@@ -554,39 -597,9 +659,39 @@@ of programming tools as well as librari
(define-public clang-toolchain-9
(make-clang-toolchain clang-9))
+;; Default LLVM and Clang version.
+(define-public llvm llvm-9)
+(define-public clang-runtime clang-runtime-9)
+(define-public clang clang-9)
+(define-public clang-toolchain clang-toolchain-9)
+
+(define-public lld
+ (package
+ (name "lld")
+ (version (package-version llvm-10))
+ (source (origin
+ (method url-fetch)
- (uri (llvm-download-uri "lld" version))
++ (uri (llvm-uri "lld" version))
+ (sha256
+ (base32
+ "0ynzi35r4fckvp6842alpd43qr810j3728yfslc66fk2mbh4j52r"))))
+ (build-system cmake-build-system)
+ (inputs
+ `(("llvm" ,llvm-10)))
+ (arguments
+ `(#:build-type "Release"
+ ;; TODO: Tests require the lit tool, which isn't installed by the LLVM
+ ;; package.
+ #:tests? #f))
+ (home-page "https://lld.llvm.org/";)
+ (synopsis "Linker from the LLVM project")
+ (description "LLD is a high-performance linker, built as a set of reusable
+components which highly leverage existing libraries in the larger LLVM
Project.")
+ (license license:asl2.0))) ; With LLVM exception
+
(define-public llvm-8
(package
- (inherit llvm)
+ (inherit llvm-9)
(version "8.0.0")
(source (origin
(method url-fetch)
diff --cc gnu/packages/tls.scm
index 517bf1d,82e6321..0f38d93
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@@ -178,15 -178,13 +178,15 @@@ living in the same process."
(patches (search-patches "gnutls-skip-trust-store-test.patch"))
(sha256
(base32
- "0jvca1qahn9lrwv6f5kfs95icirc15b2a8x9fzczyj996ipg3b5z"))))
+ "0n0m93ymzd0q9hbknxc2ycanz49sqlkyyf73g9fk7n787llc7a0f"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? ,(not (hurd-target?))
-
+ `(#:tests? ,(not (or (%current-target-system)
+ (hurd-target?)))
- ;; Ensure we don't keep a reference to net-tools.
- #:disallowed-references ,(if (hurd-target?) '() (list net-tools))
+ ;; Ensure we don't keep a reference to the tools used for testing.
+ #:disallowed-references ,(if (hurd-target?)
+ '()
+ (list net-tools iproute socat))
#:configure-flags
(list
;; GnuTLS doesn't consult any environment variables to specify