gnu: Update udisks to 2.7.7.

* gnu/package/freedesktop.scm (udisks): Update to 2.7.7.
[inputs]: Replace parted with libblockdev.
This commit is contained in:
Pierre Neidhardt 2018-05-25 20:19:55 +02:00
parent fac91b39f5
commit 92eb7aff41
No known key found for this signature in database
GPG key ID: 9BDCF497A4BBCC7F

View file

@ -12,6 +12,7 @@
;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2017 Brendan Tildesley <brendan.tildesley@openmailbox.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Pierre Neidhardt <ambrevar@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -77,6 +78,9 @@ (define-module (gnu packages freedesktop)
#:use-module (gnu packages xml)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages xorg)
#:use-module (gnu packages base)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages swig)
#:use-module (srfi srfi-1))
(define-public xdg-utils
@ -623,20 +627,23 @@ (define-public libatasmart
(define-public udisks
(package
(name "udisks")
(version "2.1.8")
(version "2.7.7")
(source (origin
(method url-fetch)
(uri (string-append "https://udisks.freedesktop.org/releases/"
name "-" version ".tar.bz2"))
(uri (string-append
"https://github.com/storaged-project/udisks/releases/download/udisks-"
version "/udisks-" version ".tar.bz2"))
(sha256
(base32
"1nkxhnqh39c9pzvm4zfj50rgv6apqawdx09bv3sfaxrah4a6jhfs"))))
"1dnlxqgy9v0mjdknv3b1s64szdykyk3hk0rxj3chwhpd415lrwgs"))))
(build-system gnu-build-system)
(native-inputs
`(("docbook-xml" ,docbook-xml-4.3) ; to build the manpages
("docbook-xsl" ,docbook-xsl)
("glib:bin" ,glib "bin") ; for glib-mkenums
("glib:bin" ,glib "bin") ; for glib-mkenums
("gnome-common" ,gnome-common) ; TODO: Why is this needed?
("gobject-introspection" ,gobject-introspection)
("gtk-doc" ,gtk-doc)
("intltool" ,intltool)
("pkg-config" ,pkg-config)
("xsltproc" ,libxslt)))
@ -644,12 +651,12 @@ (define-public udisks
`(("glib" ,glib))) ; required by udisks2.pc
(inputs
`(("acl" ,acl)
("cryptsetup" ,cryptsetup)
("libatasmart" ,libatasmart)
("libblockdev" ,libblockdev)
("libgudev" ,libgudev)
("polkit" ,polkit)
("util-linux" ,util-linux)
("cryptsetup" ,cryptsetup)
("parted" ,parted)))
("util-linux" ,util-linux)))
(outputs '("out"
"doc")) ;5 MiB of gtk-doc HTML
(arguments
@ -657,6 +664,8 @@ (define-public udisks
#:disallowed-references ("doc") ;enforce separation of "doc"
#:configure-flags
(list "--enable-man"
"--enable-gtk-doc" ; Without this the HTML doc does not seem to build automatically.
"--enable-available-modules" ; Such as lvm2, btrfs, etc.
"--localstatedir=/var"
"--enable-fhs-media" ;mount devices in /media, not /run/media
(string-append "--with-html-dir="
@ -702,9 +711,6 @@ (define-public udisks
;; cryptsetup is required for setting encrypted
;; partitions, e.g. in gnome-disks
,(string-append cryptsetup "/sbin")
;; parted is required for managing partitions, e.g. in
;; gnome-disks
,(string-append parted "/sbin")
"/run/current-system/profile/bin"
"/run/current-system/profile/sbin")))
#t))))))