nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Hartmut Goebel 2017-03-26 21:24:31 +02:00
parent 0eb0fe2d30
commit d04687dc83
No known key found for this signature in database
GPG Key ID: 634A8DFFD3F631DF
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gnu/packages/gnome.scm
View File

@ -23,6 +23,7 @@
;;; Copyright © 2016 David Craven <david@craven.ch> ;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be> ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -4573,7 +4574,7 @@ users.")
(define-public network-manager (define-public network-manager
(package (package
(name "network-manager") (name "network-manager")
(version "1.4.4") (version "1.6.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnome/sources/NetworkManager/" (uri (string-append "mirror://gnome/sources/NetworkManager/"
@ -4581,7 +4582,7 @@ users.")
"NetworkManager-" version ".tar.xz")) "NetworkManager-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"029k2f1arx1m5hppmr778i9yg34jj68nmji3i89qs06c33rpi4w2")) "1y96k82rav8if334jl500zc024d210c4pgprh94yqyz3rmanyaxj"))
(snippet (snippet
'(begin '(begin
(use-modules (guix build utils)) (use-modules (guix build utils))
@ -4625,12 +4626,14 @@ users.")
;; cope with being already in the Guix build jail as that jail ;; cope with being already in the Guix build jail as that jail
;; lacks some features that they would like to proxy over (like ;; lacks some features that they would like to proxy over (like
;; a /sys mount). ;; a /sys mount).
(substitute* '("src/platform/Makefile.in" (substitute* '("Makefile.in")
"src/devices/Makefile.in") (("src/platform/tests/test-address-linux") " ")
(("SUBDIRS = tests") "")) (("src/platform/tests/test-cleanup-linux") " ")
(substitute* '("src/tests/Makefile.in") (("src/platform/tests/test-link-linux") " ")
(("\ttest-route-manager-linux") "\t") (("src/platform/tests/test-route-linux") " ")
(("\ttest-route-manager-fake") "\t")) (("src/devices/tests/test-arping") " ")
(("src/devices/tests/test-lldp") " ")
(("src/tests/test-route-manager-linux") " "))
#t)) #t))
(add-before 'check 'pre-check (add-before 'check 'pre-check
(lambda _ (lambda _
@ -4643,13 +4646,17 @@ users.")
"sysconfdir=/tmp" "sysconfdir=/tmp"
"rundir=/tmp" "rundir=/tmp"
"statedir=/tmp" "statedir=/tmp"
"nmstatedir=/tmp/nm"
"install"))))))) "install")))))))
(propagated-inputs (propagated-inputs
`(("glib" ,glib))) `(("glib" ,glib)))
(native-inputs (native-inputs
`(("glib:bin" ,glib "bin") ; for gdbus-codegen `(("glib:bin" ,glib "bin") ; for gdbus-codegen
("gobject-introspection" ,gobject-introspection) ("gobject-introspection" ,gobject-introspection)
("docbook-xsl" ,docbook-xsl)
("intltool" ,intltool) ("intltool" ,intltool)
("libxslt" ,libxslt)
("libxml2" ,libxml2)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
;; For testing. ;; For testing.
("python" ,python-wrapper) ("python" ,python-wrapper)
@ -4661,6 +4668,7 @@ users.")
("gnutls" ,gnutls) ("gnutls" ,gnutls)
("iptables" ,iptables) ("iptables" ,iptables)
("isc-dhcp" ,isc-dhcp) ("isc-dhcp" ,isc-dhcp)
("jansson" ,jansson)
("libgcrypt" ,libgcrypt) ("libgcrypt" ,libgcrypt)
("libgudev" ,libgudev) ("libgudev" ,libgudev)
("libndp" ,libndp) ("libndp" ,libndp)