diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-12-18 23:07:40 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-12-18 23:07:40 +0100 |
| commit | 7ba6d70e4528201151195e1ed2175ee4828bdb2f (patch) | |
| tree | 3a95b7f107763f959c31187d394d3fabbf1501c5 /gnu/packages/virtualization.scm | |
| parent | 94c7f70faa0ba0409099b423df6534718d7518cc (diff) | |
| parent | 6afea7489b76c8db58d4f389fdbedc7c2b8992bd (diff) | |
| download | guix-7ba6d70e4528201151195e1ed2175ee4828bdb2f.tar guix-7ba6d70e4528201151195e1ed2175ee4828bdb2f.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/virtualization.scm')
| -rw-r--r-- | gnu/packages/virtualization.scm | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index e83ae43da2..f5ccfcb593 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -57,6 +57,7 @@ #:use-module (gnu packages golang) #:use-module (gnu packages gtk) #:use-module (gnu packages image) + #:use-module (gnu packages libbsd) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages ncurses) @@ -690,14 +691,14 @@ domains, their live performance and resource utilization statistics.") (define-public criu (package (name "criu") - (version "3.11") + (version "3.13") (source (origin (method url-fetch) (uri (string-append "http://download.openvz.org/criu/criu-" version ".tar.bz2")) (sha256 (base32 - "03nimyn3wy5mlw30gq7bvlzvvprqjv8f25240yj5arzlld8mhsw8")))) + "1yn9ix9lqvqvjrs3a3g6g1wqfniyf9n7giy0mr3jvijmrcm7y0pa")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -705,7 +706,11 @@ domains, their live performance and resource utilization statistics.") #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) (string-append "LIBDIR=" (assoc-ref %outputs "out") - "/lib")) + "/lib") + (string-append "ASCIIDOC=" (assoc-ref %build-inputs "asciidoc") + "/bin/asciidoc") + (string-append "XMLTO=" (assoc-ref %build-inputs "xmlto") + "/bin/xmlto")) #:phases (modify-phases %standard-phases (replace 'configure @@ -721,21 +726,17 @@ domains, their live performance and resource utilization statistics.") ;; which define some of the same constants. (assoc-ref inputs "kernel-headers") "/include")) - ;; Prevent xmlto from failing the install phase. + #t)) + (add-after 'configure 'fix-documentation + (lambda* (#:key inputs outputs #:allow-other-keys) (substitute* "Documentation/Makefile" - (("XMLTO.*:=.*") - (string-append "XMLTO:=" - (assoc-ref inputs "xmlto") - "/bin/xmlto" - " --skip-validation " - " -x " - (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) - "/manpages/docbook.xsl")) - (("\\$\\(XMLTO\\);") - (string-append (assoc-ref inputs "xmlto") - "/bin/xmlto;"))) + (("-m custom.xsl") + (string-append + "-m custom.xsl --skip-validation -x " + (assoc-ref inputs "docbook-xsl") "/xml/xsl/" + ,(package-name docbook-xsl) "-" + ,(package-version docbook-xsl) + "/manpages/docbook.xsl"))) #t)) (add-after 'unpack 'hardcode-variables (lambda* (#:key inputs #:allow-other-keys) @@ -783,7 +784,8 @@ domains, their live performance and resource utilization statistics.") ("libaio" ,libaio) ("libcap" ,libcap) ("libnet" ,libnet) - ("libnl" ,libnl))) + ("libnl" ,libnl) + ("libbsd" ,libbsd))) (native-inputs `(("pkg-config" ,pkg-config) ("perl" ,perl) |