[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into core-updates
From: |
Marius Bakke |
Subject: |
01/02: Merge branch 'master' into core-updates |
Date: |
Sat, 10 Jun 2017 20:08:53 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 5bace4c8ad981b66b5c0769b885d0bb0db91a029
Merge: 653569e 20d87df
Author: Marius Bakke <address@hidden>
Date: Sun Jun 11 02:07:06 2017 +0200
Merge branch 'master' into core-updates
Conflicts:
* gnu/packages/tls.scm (gnutls): Incorporated 3.5.13 graft (88e2511e217f2).
gnu/build/file-systems.scm | 9 ++++++
gnu/local.mk | 2 ++
gnu/packages/gnome.scm | 37 ++++++++++++++++++++--
gnu/packages/linux.scm | 8 ++---
.../patches/gnutls-skip-pkgconfig-test.patch | 24 ++++++++++++++
.../patches/gnutls-skip-trust-store-test.patch | 15 +++++++++
gnu/packages/python.scm | 25 +++++++++++++++
gnu/packages/tls.scm | 8 +++--
gnu/packages/tor.scm | 4 +--
gnu/packages/video.scm | 1 +
gnu/packages/wine.scm | 4 +--
gnu/packages/xdisorg.scm | 6 ++--
gnu/system.scm | 16 +++++-----
guix/scripts/system.scm | 6 ++--
14 files changed, 140 insertions(+), 25 deletions(-)
diff --cc gnu/packages/tls.scm
index 17cb2ac,bba95eb..e36a02a
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@@ -8,7 -8,7 +8,8 @@@
;;; Copyright © 2016, 2017 Efraim Flashner <address@hidden>
;;; Copyright © 2016, 2017 ng0 <address@hidden>
;;; Copyright © 2016 Hartmut Goebel <address@hidden>
+;;; Copyright © 2017 Ricardo Wurmus <address@hidden>
+ ;;; Copyright © 2017 Marius Bakke <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@@ -133,7 -143,8 +134,7 @@@ living in the same process."
(define-public gnutls
(package
(name "gnutls")
- (version "3.5.10")
- (replacement gnutls-3.5.13)
- (version "3.5.9")
++ (version "3.5.13")
(source (origin
(method url-fetch)
(uri
@@@ -142,9 -153,9 +143,12 @@@
(string-append "mirror://gnupg/gnutls/v"
(version-major+minor version)
"/gnutls-" version ".tar.xz"))
++ (patches
++ (search-patches "gnutls-skip-trust-store-test.patch"
++ "gnutls-skip-pkgconfig-test.patch"))
(sha256
(base32
- "17apwvdkkazh5w8z8mbanpj2yj8s2002qwy46wz4v3akpa33wi5g"))))
- "0l9971841jsfdcvcyhas17sk5rsby6x5vvwcmmj4x3zi9q60zcc2"))))
++ "15ihq6p0hnnhs8cnjrkj40dmlcaa1jjg8xg0g2ydbnlqs454ixbr"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags