[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: |
Sat, 3 Feb 2018 22:48:59 -0500 (EST) |
mhw pushed a commit to branch core-updates
in repository guix.
commit e7ca634912db59596f67dc805d7b3604c5312eeb
Merge: b0881e0 0903a51
Author: Mark H Weaver <address@hidden>
Date: Sat Feb 3 22:46:07 2018 -0500
Merge branch 'master' into core-updates
gnu/packages/algebra.scm | 4 +-
gnu/packages/astronomy.scm | 2 +-
gnu/packages/base.scm | 1 +
gnu/packages/bioinformatics.scm | 6 +-
gnu/packages/bootloaders.scm | 2 +-
gnu/packages/cdrom.scm | 56 ++++++++++++-
gnu/packages/check.scm | 82 ++++++++++++++++++
gnu/packages/databases.scm | 80 +++++++++++-------
gnu/packages/emacs.scm | 28 ++++++-
gnu/packages/fonts.scm | 68 +++++++++++++++
gnu/packages/golang.scm | 23 +++++
gnu/packages/gps.scm | 1 +
gnu/packages/haskell.scm | 23 +++++
gnu/packages/linux.scm | 2 +-
gnu/packages/machine-learning.scm | 35 ++++++++
gnu/packages/man.scm | 6 +-
gnu/packages/maths.scm | 57 ++++++++++++-
gnu/packages/multiprecision.scm | 40 +++++++++
gnu/packages/music.scm | 30 ++-----
gnu/packages/ncdu.scm | 7 +-
gnu/packages/networking.scm | 15 ++--
gnu/packages/ocaml.scm | 171 ++++++++++++++++++++++++++++++++------
gnu/packages/python-web.scm | 4 +-
gnu/packages/python.scm | 4 +-
gnu/packages/wm.scm | 22 +++--
gnu/packages/xfce.scm | 38 +++++++++
26 files changed, 687 insertions(+), 120 deletions(-)
diff --cc gnu/packages/check.scm
index dd54bca,1276c0f..1e2eabe
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@@ -49,7 -49,7 +49,8 @@@
#:use-module (gnu packages autotools)
#:use-module (gnu packages bash)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages llvm)
+ #:use-module (gnu packages golang)
#:use-module (gnu packages python)
#:use-module (gnu packages python-web)
#:use-module (gnu packages time)
diff --cc gnu/packages/emacs.scm
index faf4b13,9523f14..62cc916
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@@ -1,7 -1,7 +1,7 @@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <address@hidden>
- ;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <address@hidden>
+ ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès
<address@hidden>
-;;; Copyright © 2014, 2015, 2016 Mark H Weaver <address@hidden>
+;;; Copyright © 2014, 2015, 2016, 2017 Mark H Weaver <address@hidden>
;;; Copyright © 2014, 2015, 2016, 2017 Alex Kost <address@hidden>
;;; Copyright © 2015 Federico Beffa <address@hidden>
;;; Copyright © 2015, 2016, 2017, 2018 Ricardo Wurmus <address@hidden>