[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/04: gnu: Update networkmanager to version 1.6.2.
From: |
Hartmut Goebel |
Subject: |
01/04: gnu: Update networkmanager to version 1.6.2. |
Date: |
Wed, 12 Apr 2017 04:09:13 -0400 (EDT) |
htgoebel pushed a commit to branch master
in repository guix.
commit d04687dc83bdb3f1d8d77ade2a4ae1cf437f9b1c
Author: Hartmut Goebel <address@hidden>
Date: Sun Mar 26 21:24:31 2017 +0200
gnu: Update networkmanager to version 1.6.2.
* gnu/packages/gnome.scm (networkmanager): [source] Update to 1.6.2
[arguments] <pre-configure>: Adopt to now used single Makefile.in.
<install>: Also pass "nmstatedir".
[native-inputs]: Add docbook-xsl, libxslt, libxml2.
[inputs]: Add jansson.
---
gnu/packages/gnome.scm | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 535b8ae..105348c 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.
;;;
@@ -4573,7 +4574,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/"
@@ -4581,7 +4582,7 @@ users.")
"NetworkManager-" version ".tar.xz"))
(sha256
(base32
- "029k2f1arx1m5hppmr778i9yg34jj68nmji3i89qs06c33rpi4w2"))
+ "1y96k82rav8if334jl500zc024d210c4pgprh94yqyz3rmanyaxj"))
(snippet
'(begin
(use-modules (guix build utils))
@@ -4625,12 +4626,14 @@ 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 'check 'pre-check
(lambda _
@@ -4643,13 +4646,17 @@ 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)
+ ("libxml2" ,libxml2)
("pkg-config" ,pkg-config)
;; For testing.
("python" ,python-wrapper)
@@ -4661,6 +4668,7 @@ users.")
("gnutls" ,gnutls)
("iptables" ,iptables)
("isc-dhcp" ,isc-dhcp)
+ ("jansson" ,jansson)
("libgcrypt" ,libgcrypt)
("libgudev" ,libgudev)
("libndp" ,libndp)