[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#26352: [PATCH 1/3] gnu: Update networkmanager to version 1.6.2.
From: |
Hartmut Goebel |
Subject: |
bug#26352: [PATCH 1/3] gnu: Update networkmanager to version 1.6.2. |
Date: |
Mon, 3 Apr 2017 20:56:40 +0200 |
* gnu/packages/gnome.scm (networkmanager): [source] Update to 1.6.2
[pre-configure]: Adopt to now used single Makefile.in.
[fix-docbook]: New phase, required for docbook-xsl catalogs.
[install]: Also pass "nmstatedir".
[native-inputs]: Add docbook-xsl, libxslt.
[inputs]: Add jansson.
---
gnu/packages/gnome.scm | 32 +++++++++++++++++++++++---------
1 file changed, 23 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b94c366..51d84a4 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -23,6 +23,7 @@
;;; Copyright © 2016 David Craven <address@hidden>
;;; Copyright © 2016 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2017 Thomas Danckaert <address@hidden>
+;;; Copyright © 2017 Hartmut Goebel <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -4549,7 +4550,7 @@ users.")
(define-public network-manager
(package
(name "network-manager")
- (version "1.4.4")
+ (version "1.6.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/NetworkManager/"
@@ -4557,7 +4558,7 @@ users.")
"NetworkManager-" version ".tar.xz"))
(sha256
(base32
- "029k2f1arx1m5hppmr778i9yg34jj68nmji3i89qs06c33rpi4w2"))
+ "1y96k82rav8if334jl500zc024d210c4pgprh94yqyz3rmanyaxj"))
(snippet
'(begin
(use-modules (guix build utils))
@@ -4574,7 +4575,7 @@ users.")
(outputs '("out"
"doc")) ; 8 MiB of gtk-doc HTML
(arguments
- '(#:configure-flags
+ `(#:configure-flags
(let ((out (assoc-ref %outputs "out"))
(doc (assoc-ref %outputs "doc"))
(dhclient (string-append (assoc-ref %build-inputs "isc-dhcp")
@@ -4601,13 +4602,22 @@ users.")
;; cope with being already in the Guix build jail as that jail
;; lacks some features that they would like to proxy over (like
;; a /sys mount).
- (substitute* '("src/platform/Makefile.in"
- "src/devices/Makefile.in")
- (("SUBDIRS = tests") ""))
- (substitute* '("src/tests/Makefile.in")
- (("\ttest-route-manager-linux") "\t")
- (("\ttest-route-manager-fake") "\t"))
+ (substitute* '("Makefile.in")
+ (("src/platform/tests/test-address-linux") " ")
+ (("src/platform/tests/test-cleanup-linux") " ")
+ (("src/platform/tests/test-link-linux") " ")
+ (("src/platform/tests/test-route-linux") " ")
+ (("src/devices/tests/test-arping") " ")
+ (("src/devices/tests/test-lldp") " ")
+ (("src/tests/test-route-manager-linux") " "))
#t))
+ (add-before 'configure 'fix-docbook
+ (lambda* (#:key inputs #:allow-other-keys)
+ (setenv "XML_CATALOG_FILES"
+ (string-append
+ (assoc-ref %build-inputs "docbook-xsl")
+ "/xml/xsl/docbook-xsl-" ,(package-version docbook-xsl)
+ "/catalog.xml"))))
(add-before 'check 'pre-check
(lambda _
;; For the missing /etc/machine-id.
@@ -4619,13 +4629,16 @@ users.")
"sysconfdir=/tmp"
"rundir=/tmp"
"statedir=/tmp"
+ "nmstatedir=/tmp/nm"
"install")))))))
(propagated-inputs
`(("glib" ,glib)))
(native-inputs
`(("glib:bin" ,glib "bin") ; for gdbus-codegen
("gobject-introspection" ,gobject-introspection)
+ ("docbook-xsl" ,docbook-xsl)
("intltool" ,intltool)
+ ("libxslt" ,libxslt)
("pkg-config" ,pkg-config)
;; For testing.
("python" ,python-wrapper)
@@ -4637,6 +4650,7 @@ users.")
("gnutls" ,gnutls)
("iptables" ,iptables)
("isc-dhcp" ,isc-dhcp)
+ ("jansson" ,jansson)
("libgcrypt" ,libgcrypt)
("libgudev" ,libgudev)
("libndp" ,libndp)
--
2.7.4
- bug#26352: [PATCH 0/3] Update KDE Frameworks to 5.32, Hartmut Goebel, 2017/04/03
- bug#26352: [PATCH 1/3] gnu: Update networkmanager to version 1.6.2.,
Hartmut Goebel <=
- bug#26352: [PATCH 2/3] gnu: Update phonon to 4.9.1, Hartmut Goebel, 2017/04/03
- bug#26352: [PATCH 3/3] gnu: Update kde-frameworks to 5.32.0, Hartmut Goebel, 2017/04/03
- bug#26352: [PATCH 1/3] gnu: Update networkmanager to version 1.6.2., Ludovic Courtès, 2017/04/10
- bug#26352: [PATCH 1/3] gnu: Update networkmanager to version 1.6.2., Hartmut Goebel, 2017/04/11
- bug#26352: [PATCH 1/3] gnu: Update networkmanager to version 1.6.2., Ludovic Courtès, 2017/04/11
- bug#26352: [PATCH 1/3] gnu: Update networkmanager to version 1.6.2., Hartmut Goebel, 2017/04/12
- bug#26352: close, Hartmut Goebel, 2017/04/12
- bug#26352: close, Clément Lassieur, 2017/04/12
bug#26352: [PATCH 4/4] gnu: kde-frameworks: No longer setenv CTEST_OUTPUT_ON_FAILURE., Hartmut Goebel, 2017/04/03