[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into core-updates
|
From: |
Mark H. Weaver |
|
Subject: |
01/02: Merge branch 'master' into core-updates |
|
Date: |
Sun, 14 Jun 2015 12:49:59 +0000 |
mhw pushed a commit to branch core-updates
in repository guix.
commit bcf2971f6ebc965aa94391b2a8d39e5005885806
Merge: ec29907 7871724
Author: Mark H Weaver <address@hidden>
Date: Sun Jun 14 08:49:42 2015 -0400
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/commencement.scm
gnu/packages/xml.scm
HACKING | 133 +---------
README | 4 +-
configure.ac | 2 +-
doc.am | 1 +
doc/contributing.texi | 216 ++++++++++++++++
doc/guix.texi | 80 ++----
gnu-system.am | 6 +
gnu/packages/admin.scm | 4 +-
gnu/packages/audio.scm | 51 ++++
gnu/packages/autotools.scm | 1 -
gnu/packages/bioinformatics.scm | 110 +++++++--
gnu/packages/check.scm | 9 +-
gnu/packages/ci.scm | 182 +++++++++++++
gnu/packages/code.scm | 64 +++++
gnu/packages/commencement.scm | 3 -
gnu/packages/cross-base.scm | 1 -
gnu/packages/emacs.scm | 2 -
gnu/packages/gnome.scm | 34 +++
gnu/packages/gnupg.scm | 4 +-
gnu/packages/haskell.scm | 6 +-
gnu/packages/java.scm | 71 +++---
gnu/packages/machine-learning.scm | 146 +++++++++++
gnu/packages/make-bootstrap.scm | 1 -
gnu/packages/maths.scm | 1 -
gnu/packages/music.scm | 98 +++++++
gnu/packages/openssl.scm | 9 +-
gnu/packages/package-management.scm | 68 +++--
gnu/packages/patches/hydra-automake-1.15.patch | 63 +++++
.../patches/hydra-disable-darcs-test.patch | 25 ++
.../patches/perl-net-ssleay-disable-ede-test.patch | 23 ++
gnu/packages/patches/python-disable-ssl-test.patch | 12 +
gnu/packages/perl.scm | 22 ++
gnu/packages/python.scm | 4 +-
gnu/packages/web.scm | 85 ++++++
gnu/packages/xml.scm | 37 +++
gnu/system/install.scm | 3 +-
guix/build-system/gnu.scm | 4 +-
guix/build/haskell-build-system.scm | 8 +-
guix/download.scm | 9 +-
guix/packages.scm | 3 +-
guix/profiles.scm | 8 +-
guix/records.scm | 273 ++++++++++----------
guix/scripts/build.scm | 13 +-
guix/scripts/environment.scm | 28 +-
guix/tests.scm | 10 +-
tests/records.scm | 32 +++-
46 files changed, 1518 insertions(+), 451 deletions(-)
diff --cc gnu/packages/commencement.scm
index 14af093,a5402f0..db91bec
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@@ -552,13 -529,6 +550,12 @@@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic
;; The final GCC.
(package (inherit gcc-boot0)
(name "gcc")
- (location (source-properties->location (current-source-location)))
+
+ ;; XXX: Currently #:allowed-references applies to all the outputs but the
+ ;; "debug" output contains disallowed references, notably
+ ;; linux-libre-headers. Disable the debugging output to work around that.
+ (outputs (delete "debug" (package-outputs gcc-boot0)))
+
(arguments
`(#:guile ,%bootstrap-guile
#:implicit-inputs? #f
diff --cc gnu/packages/xml.scm
index 59b73d2,a7925d9..c4ec33e
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@@ -2,7 -2,7 +2,8 @@@
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <address@hidden>
;;; Copyright © 2013, 2015 Andreas Enge <address@hidden>
;;; Copyright © 2015 Eric Bavier <address@hidden>
+;;; Copyright © 2015 Sou Bunnbu <address@hidden>
+ ;;; Copyright © 2015 Ricardo Wurmus <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@@ -31,9 -31,9 +32,10 @@@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system perl)
+ #:use-module (guix build-system python)
#:use-module (gnu packages linux))
(define-public expat