ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 13:58:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: criu: Update to 3.13.

Browse source 
* gnu/packages/virtualization.scm (criu): Update to 3.13.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
nixo 2019-12-11 13:31:09 +01:00 committed by Ludovic Courtès
parent 4dbd704d5d
commit 5d1601eab5
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
gnu/packages/virtualization.scm
View file

@ -57,6 +57,7 @@ (define-module (gnu packages virtualization)
#:use-module (gnu packages golang) #:use-module (gnu packages golang)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages image) #:use-module (gnu packages image)
#:use-module (gnu packages libbsd)
#:use-module (gnu packages libusb) #:use-module (gnu packages libusb)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
@ -690,14 +691,14 @@ (define-public virt-manager
(define-public criu (define-public criu
(package (package
(name "criu") (name "criu")
(version "3.11") (version "3.13")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://download.openvz.org/criu/criu-" (uri (string-append "http://download.openvz.org/criu/criu-"
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"03nimyn3wy5mlw30gq7bvlzvvprqjv8f25240yj5arzlld8mhsw8")))) "1yn9ix9lqvqvjrs3a3g6g1wqfniyf9n7giy0mr3jvijmrcm7y0pa"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
@ -705,7 +706,11 @@ (define-public criu
#:make-flags #:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out")) (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
(string-append "LIBDIR=" (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 #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(replace 'configure (replace 'configure
@ -721,21 +726,17 @@ (define-public criu
;; which define some of the same constants. ;; which define some of the same constants.
(assoc-ref inputs "kernel-headers") (assoc-ref inputs "kernel-headers")
"/include")) "/include"))
;; Prevent xmlto from failing the install phase. #t))
(add-after 'configure 'fix-documentation
(lambda* (#:key inputs outputs #:allow-other-keys)
(substitute* "Documentation/Makefile" (substitute* "Documentation/Makefile"
(("XMLTO.*:=.*") (("-m custom.xsl")
(string-append "XMLTO:=" (string-append
(assoc-ref inputs "xmlto") "-m custom.xsl --skip-validation -x "
"/bin/xmlto" (assoc-ref inputs "docbook-xsl") "/xml/xsl/"
" --skip-validation " ,(package-name docbook-xsl) "-"
" -x "
(assoc-ref inputs "docbook-xsl")
"/xml/xsl/docbook-xsl-"
,(package-version docbook-xsl) ,(package-version docbook-xsl)
"/manpages/docbook.xsl")) "/manpages/docbook.xsl")))
(("\\$\\(XMLTO\\);")
(string-append (assoc-ref inputs "xmlto")
"/bin/xmlto;")))
#t)) #t))
(add-after 'unpack 'hardcode-variables (add-after 'unpack 'hardcode-variables
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
@ -783,7 +784,8 @@ (define-public criu
("libaio" ,libaio) ("libaio" ,libaio)
("libcap" ,libcap) ("libcap" ,libcap)
("libnet" ,libnet) ("libnet" ,libnet)
("libnl" ,libnl))) ("libnl" ,libnl)
("libbsd" ,libbsd)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("perl" ,perl) ("perl" ,perl)