amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into core-updates

Browse source
This commit is contained in:
Marius Bakke 2019-07-22 18:58:48 +02:00
commit ccad0e4d69
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
42 changed files with 1493 additions and 287 deletions
Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/virtualization.scm
View file

@ -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)