[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Mark H. Weaver |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Sun, 27 May 2018 01:29:03 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 1640f16e7888291227d11647dbb5f83ad5d138a1
Merge: 0ff4e49 a4e45ac
Author: Mark H Weaver <address@hidden>
Date: Sun May 27 01:26:09 2018 -0400
Merge branch 'master' into core-updates
gnu/build/vm.scm | 13 ++-
gnu/packages/accessibility.scm | 6 +-
gnu/packages/algebra.scm | 8 +-
gnu/packages/audio.scm | 8 +-
gnu/packages/bioinformatics.scm | 36 ++++++
gnu/packages/compression.scm | 73 ++++++++++++
gnu/packages/cpp.scm | 27 +++++
gnu/packages/cran.scm | 34 ++++++
gnu/packages/emacs.scm | 25 +++++
gnu/packages/emulators.scm | 60 +++++++++-
gnu/packages/freedesktop.scm | 7 +-
gnu/packages/games.scm | 242 ++++++++++++++++++++++++++++++++++++++++
gnu/packages/geo.scm | 2 +-
gnu/packages/gnome.scm | 4 +-
gnu/packages/gnunet.scm | 9 +-
gnu/packages/image-viewers.scm | 4 +-
gnu/packages/image.scm | 48 ++++++++
gnu/packages/linux.scm | 30 +++--
gnu/packages/maths.scm | 87 ++++++++++++---
gnu/packages/mpi.scm | 20 ++--
gnu/packages/networking.scm | 7 +-
gnu/packages/python-web.scm | 31 +++++
gnu/packages/python.scm | 132 +++++++++++++++++++++-
gnu/packages/rust.scm | 8 +-
gnu/packages/samba.scm | 4 +-
gnu/packages/search.scm | 39 ++++++-
gnu/packages/statistics.scm | 12 +-
gnu/packages/tls.scm | 18 ++-
gnu/packages/video.scm | 8 +-
gnu/packages/wine.scm | 6 +-
gnu/services/desktop.scm | 7 +-
guix/http-client.scm | 2 +-
32 files changed, 924 insertions(+), 93 deletions(-)
diff --cc gnu/packages/freedesktop.scm
index ad1725f,57af63c..9a01c78
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@@ -7,9 -7,9 +7,9 @@@
;;; Copyright © 2015 David Hashe <address@hidden>
;;; Copyright © 2016, 2017 Efraim Flashner <address@hidden>
;;; Copyright © 2016 Kei Kebreau <address@hidden>
-;;; Copyright © 2017 Mark H Weaver <address@hidden>
+;;; Copyright © 2017, 2018 Mark H Weaver <address@hidden>
;;; Copyright © 2017, 2018 Marius Bakke <address@hidden>
- ;;; Copyright © 2017 Rutger Helling <address@hidden>
+ ;;; Copyright © 2017, 2018 Rutger Helling <address@hidden>
;;; Copyright © 2017 Brendan Tildesley <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
;;;
diff --cc gnu/packages/maths.scm
index aac0420,a36d233..09d2780
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@@ -2145,11 -2165,9 +2173,10 @@@ void mc64ad_dist (int *a, int *b, int *
fprintf (stderr, \"SuperLU_DIST: non-free MC64 not available.
Aborting.\\n\");
abort ();
}\n" port)))
- (delete-file "SRC/mc64ad.f.bak")
(substitute* "SRC/util.c" ;adjust default algorithm
(("RowPerm[[:blank:]]*=[[:blank:]]*LargeDiag")
- "RowPerm = NOROWPERM"))))
+ "RowPerm = NOROWPERM"))
+ #t))
(patches (search-patches "superlu-dist-scotchmetis.patch"))))
(build-system gnu-build-system)
(native-inputs
diff --cc gnu/packages/video.scm
index 52003ce,9ed0f4b..32b3257
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@@ -387,11 -388,12 +387,11 @@@ and creating Matroska files from other
"x265_" version ".tar.gz"))
(sha256
(base32
- "18llni1m8kfvdwy5bp950z6gyd0nijmvi3hzd6gd8vpy5yk5zrym"))
+ "0qx8mavwdzdpkkby7n29i9av7zsnklavacwfz537mf62q2pzjnbf"))
(modules '((guix build utils)))
- (snippet
- '(begin
- (delete-file-recursively "source/compat/getopt")
- #t))))
+ (snippet '(begin
+ (delete-file-recursively "source/compat/getopt")
+ #t))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; tests are skipped if cpu-optimized code isn't built