summaryrefslogtreecommitdiff
path: root/gnu/packages/virtualization.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-07-22 18:58:48 +0200
committerMarius Bakke <mbakke@fastmail.com>2019-07-22 18:58:48 +0200
commitccad0e4d6973da7af8badfb7125f35f7e51eb2d7 (patch)
tree15ff9da1c1c03b088d0ad9240f2c1878f5da5802 /gnu/packages/virtualization.scm
parentd478cc043557ca3fcd5fced87d2e2c8e246eff03 (diff)
parent26986544469ef290885f5f8d71006751e9e8daf8 (diff)
downloadpatches-ccad0e4d6973da7af8badfb7125f35f7e51eb2d7.tar
patches-ccad0e4d6973da7af8badfb7125f35f7e51eb2d7.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/virtualization.scm')
-rw-r--r--gnu/packages/virtualization.scm17
1 files changed, 4 insertions, 13 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index da971a8805..b695e2dc4f 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -287,7 +287,7 @@ server and embedded PowerPC, and S390 guests.")
(define-public libosinfo
(package
(name "libosinfo")
- (version "1.0.0")
+ (version "1.5.0")
(source
(origin
(method url-fetch)
@@ -295,30 +295,21 @@ server and embedded PowerPC, and S390 guests.")
version ".tar.gz"))
(sha256
(base32
- "0srrs2m6irqd4f867g8ls6jp2dq3ql0l9d0fh80d55sivvn2bd7p"))))
+ "12b0xj9fz9q91d1pz9xm6aqap5k1ip0m9m3qvqmwjy1lk1kjasdz"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
(list (string-append "--with-usb-ids-path="
(assoc-ref %build-inputs "usb.ids"))
(string-append "--with-pci-ids-path="
- (assoc-ref %build-inputs "pci.ids")))
- #:phases
- (modify-phases %standard-phases
- ;; This odd test fails for unknown reasons.
- (add-after 'unpack 'disable-broken-test
- (lambda _
- (substitute* "test/Makefile.in"
- (("test-isodetect\\$\\(EXEEXT\\)") ""))
- #t)))))
+ (assoc-ref %build-inputs "pci.ids")))))
(inputs
`(("libsoup" ,libsoup)
("libxml2" ,libxml2)
("libxslt" ,libxslt)
("gobject-introspection" ,gobject-introspection)))
(native-inputs
- `(("check" ,check)
- ("glib" ,glib "bin") ; glib-mkenums, etc.
+ `(("glib" ,glib "bin") ; glib-mkenums, etc.
("gtk-doc" ,gtk-doc)
("vala" ,vala)
("intltool" ,intltool)