[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: |
Fri, 6 Sep 2019 20:48:41 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 65542a8852759f35e19959149ac92297c8b54be5
Merge: bc60349 f66aee3
Author: Mark H Weaver <address@hidden>
Date: Fri Sep 6 20:46:00 2019 -0400
Merge branch 'master' into core-updates
Makefile.am | 3 +
README | 36 +-
doc/build.scm | 115 +-
doc/guix.texi | 100 +-
etc/guix-install.sh | 11 +
gnu/bootloader.scm | 36 +-
gnu/local.mk | 2 -
gnu/packages/admin.scm | 4 +-
gnu/packages/agda.scm | 2 +-
gnu/packages/audio.scm | 4 +-
.../aux-files/chromium/master-preferences.json | 3 -
gnu/packages/aux-files/linux-libre/5.2-arm64.conf | 2 +-
gnu/packages/base.scm | 4 +-
gnu/packages/bioconductor.scm | 246 +-
gnu/packages/bioinformatics.scm | 88 +-
gnu/packages/bootloaders.scm | 6 +-
gnu/packages/cdrom.scm | 12 +-
gnu/packages/cedille.scm | 1 +
gnu/packages/commencement.scm | 11 +-
gnu/packages/conky.scm | 6 +-
gnu/packages/cran.scm | 212 +-
gnu/packages/crates-io.scm | 1400 ++-
gnu/packages/cups.scm | 71 +-
gnu/packages/databases.scm | 4 +-
gnu/packages/dictionaries.scm | 4 +-
gnu/packages/docker.scm | 46 +-
gnu/packages/education.scm | 4 +-
gnu/packages/emacs-xyz.scm | 553 +-
gnu/packages/emacs.scm | 8 +-
gnu/packages/emulators.scm | 16 +-
gnu/packages/engineering.scm | 40 +-
gnu/packages/enlightenment.scm | 4 +-
gnu/packages/games.scm | 1 +
gnu/packages/ghostscript.scm | 2 +-
gnu/packages/gnome.scm | 53 +-
gnu/packages/gnucash.scm | 24 +-
gnu/packages/gnuzilla.scm | 4 +-
gnu/packages/golang.scm | 66 +-
gnu/packages/gps.scm | 4 +-
gnu/packages/graphics.scm | 2 +-
gnu/packages/guile-wm.scm | 4 +-
gnu/packages/guile-xyz.scm | 9 +-
gnu/packages/haskell-apps.scm | 313 +-
gnu/packages/haskell-check.scm | 27 +-
gnu/packages/haskell-web.scm | 54 +
gnu/packages/haskell-xyz.scm | 11722 ++++++++++++++++++-
gnu/packages/haskell.scm | 11292 +-----------------
gnu/packages/idris.scm | 2 +-
gnu/packages/image.scm | 85 +-
gnu/packages/julia.scm | 4 +
gnu/packages/libreoffice.scm | 11 +-
gnu/packages/libusb.scm | 16 +-
gnu/packages/linux.scm | 54 +-
gnu/packages/lisp.scm | 161 +-
gnu/packages/mail.scm | 4 +-
gnu/packages/maths.scm | 38 +-
gnu/packages/mp3.scm | 4 +-
gnu/packages/music.scm | 54 +-
gnu/packages/ocaml.scm | 257 +-
gnu/packages/package-management.scm | 11 +-
.../patches/twinkle-include-qregexpvalidator.patch | 123 -
.../patches/xfce4-session-fix-xflock4.patch | 31 -
gnu/packages/photo.scm | 4 +-
gnu/packages/php.scm | 2 +-
gnu/packages/python-xyz.scm | 23 +-
gnu/packages/qt.scm | 6 +
gnu/packages/rust.scm | 19 +-
gnu/packages/samba.scm | 12 +-
gnu/packages/statistics.scm | 22 +-
gnu/packages/sync.scm | 10 +-
gnu/packages/syncthing.scm | 6 +-
gnu/packages/telephony.scm | 80 +-
gnu/packages/terminals.scm | 4 +-
gnu/packages/tex.scm | 394 +-
gnu/packages/textutils.scm | 18 +-
gnu/packages/upnp.scm | 4 +-
gnu/packages/vim.scm | 10 +-
gnu/packages/web-browsers.scm | 12 +-
gnu/packages/web.scm | 8 +-
gnu/packages/wine.scm | 6 +-
gnu/packages/wm.scm | 10 +-
gnu/packages/xfce.scm | 262 +-
gnu/services/cups.scm | 25 +-
gnu/services/web.scm | 3 +-
gnu/system.scm | 15 +
gnu/system/linux-initrd.scm | 2 +-
guix/build-system/cargo.scm | 11 +-
guix/build-system/julia.scm | 130 +
guix/build/cargo-build-system.scm | 14 +-
guix/build/julia-build-system.scm | 135 +
guix/build/lisp-utils.scm | 14 +-
guix/bzr-download.scm | 3 +
guix/ci.scm | 68 +-
guix/cvs-download.scm | 5 +-
guix/git-download.scm | 3 +
guix/hg-download.scm | 5 +-
guix/import/cran.scm | 37 +-
guix/import/crate.scm | 164 +-
guix/import/opam.scm | 6 +-
guix/json.scm | 62 +
guix/lint.scm | 166 +-
guix/scripts/deploy.scm | 12 +-
guix/scripts/system.scm | 6 +-
guix/svn-download.scm | 5 +-
guix/swh.scm | 123 +-
guix/tests/http.scm | 39 +-
nix/libstore/gc.cc | 9 +-
nix/libutil/util.cc | 2 +-
po/doc/guix-manual.es.po | 1505 +--
po/doc/guix-manual.fr.po | 206 +-
tests/crate.scm | 13 +-
tests/derivations.scm | 12 +-
tests/guix-build-branch.sh | 2 +-
tests/lint.scm | 179 +-
tests/swh.scm | 41 +-
115 files changed, 17935 insertions(+), 13485 deletions(-)
diff --cc gnu/packages/maths.scm
index 5735c17,c81e999..16d3af3
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@@ -682,11 -682,10 +683,11 @@@ computations."
(uri (string-append "https://support.hdfgroup.org/ftp/HDF/releases/HDF";
version "/src/hdf-" version ".tar.bz2"))
(sha256
- (base32 "1wz0586zh91pqb95wvr0pbh71a8rz358fdj6n2ksp85x2cis9lsm"))
+ (base32 "0n29klrrbwan9307np0d9hr128dlpc4nnlf57a140080ll3jmp8l"))
(patches (search-patches "hdf4-architectures.patch"
"hdf4-reproducibility.patch"
- "hdf4-shared-fortran.patch"))))
+ "hdf4-shared-fortran.patch"
+ "hdf4-tirpc.patch"))))
(build-system gnu-build-system)
(native-inputs
`(("gfortran" ,gfortran)