[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: |
Tue, 19 Jan 2016 05:19:06 +0000 |
mhw pushed a commit to branch core-updates
in repository guix.
commit afe9f409491a055e5d058c8f747e80d1506391e5
Merge: bb8afbf 1348185
Author: Mark H Weaver <address@hidden>
Date: Tue Jan 19 00:18:37 2016 -0500
Merge branch 'master' into core-updates
Makefile.am | 32 +-
NEWS | 1 +
build-aux/compile-all.scm | 82 +++
doc/emacs.texi | 15 +-
doc/guix.texi | 64 ++
emacs.am | 1 +
emacs/guix-base.el | 25 +-
emacs/guix-main.scm | 77 ++-
emacs/guix-messages.el | 42 +-
emacs/guix-profiles.el | 7 +-
emacs/guix-ui-generation.el | 62 ++-
emacs/guix-ui-package.el | 24 +-
emacs/guix-ui-system-generation.el | 105 ++++
gnu-system.am | 3 +-
gnu/build/linux-modules.scm | 78 ++-
gnu/packages/admin.scm | 61 ++-
gnu/packages/bioinformatics.scm | 77 ++--
gnu/packages/calendar.scm | 77 +++-
gnu/packages/databases.scm | 6 +-
gnu/packages/datamash.scm | 5 +-
gnu/packages/dav.scm | 108 ++++
gnu/packages/docker.scm | 107 ++++
gnu/packages/emacs.scm | 6 +-
gnu/packages/games.scm | 6 +-
gnu/packages/gnome.scm | 27 +-
gnu/packages/gnupg.scm | 6 +-
gnu/packages/linux.scm | 17 +
gnu/packages/music.scm | 29 +-
gnu/packages/ocaml.scm | 105 +++-
gnu/packages/openstack.scm | 155 +++++-
gnu/packages/patches/bowtie-fix-makefile.patch | 31 -
gnu/packages/python.scm | 756 ++++++++++++++++++++++--
gnu/packages/rsync.scm | 5 +-
gnu/packages/ruby.scm | 64 ++
gnu/packages/ssh.scm | 6 +-
gnu/packages/statistics.scm | 4 +-
gnu/packages/sxiv.scm | 6 +-
gnu/packages/version-control.scm | 31 +
gnu/packages/video.scm | 60 ++-
gnu/system.scm | 41 ++
gnu/system/linux-initrd.scm | 4 +-
guix/import/cran.scm | 11 -
guix/import/gem.scm | 3 +-
guix/import/utils.scm | 14 +-
guix/scripts/system.scm | 85 +--
test-env.in | 11 +-
tests/derivations.scm | 18 +-
47 files changed, 2158 insertions(+), 402 deletions(-)
diff --cc gnu/packages/databases.scm
index 4bb3b4d,9945273..b36f5d8
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@@ -3,11 -3,9 +3,11 @@@
;;; Copyright © 2012, 2014, 2015 Andreas Enge <address@hidden>
;;; Copyright © 2013 Cyril Roelandt <address@hidden>
;;; Copyright © 2014 David Thompson <address@hidden>
- ;;; Copyright © 2014, 2015 Mark H Weaver <address@hidden>
+ ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <address@hidden>
;;; Copyright © 2015 Eric Bavier <address@hidden>
;;; Copyright © 2015 Sou Bunnbu <address@hidden>
+;;; Copyright © 2015 Leo Famulari <address@hidden>
+;;; Copyright © 2016 Efraim Flashner <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/video.scm
index b3ee980,9e41835..12f10b9
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@@ -1,9 -1,9 +1,9 @@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015 Andreas Enge <address@hidden>
;;; Copyright © 2014, 2015 David Thompson <address@hidden>
-;;; Copyright © 2014, 2015 Mark H Weaver <address@hidden>
+;;; Copyright © 2014, 2015, 2016 Mark H Weaver <address@hidden>
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <address@hidden>
- ;;; Copyright © 2015 Efraim Flashner <address@hidden>
+ ;;; Copyright © 2015, 2016 Efraim Flashner <address@hidden>
;;; Copyright © 2015 Andy Patterson <address@hidden>
;;; Copyright © 2015 Ricardo Wurmus <address@hidden>
;;; Copyright © 2015 Alex Vong <address@hidden>