ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-16 11:55:27 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: criu: Update to 3.16.

Browse source 
* gnu/packages/virtualization.scm (criu): Update to 3.16.
[arguments]: Don't explicitly return #t from phases.
This commit is contained in:
Tobias Geerinckx-Rice 2021-10-03 23:32:03 +02:00
parent 8b5b7478ab
commit b4d02219da
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gnu/packages/virtualization.scm
View file

@ -1551,14 +1551,14 @@ (define-public virt-manager
(define-public criu (define-public criu
(package (package
(name "criu") (name "criu")
(version "3.15") (version "3.16")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.openvz.org/criu/criu-" (uri (string-append "https://download.openvz.org/criu/criu-"
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"09d0j24x0cyc7wkgi7cnxqgfjk7kbdlm79zxpj8d356sa3rw2z24")))) "13x4s7nms3ckb016d03icdsrw4k6f7i33qz9n84fzhmibm0grj70"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:test-target "test" `(#:test-target "test"
@ -1579,8 +1579,7 @@ (define-public criu
(setenv "C_INCLUDE_PATH" (setenv "C_INCLUDE_PATH"
(string-append (assoc-ref inputs "libnl") (string-append (assoc-ref inputs "libnl")
"/include/libnl3:" "/include/libnl3:"
(or (getenv "C_INCLUDE_PATH") ""))) (or (getenv "C_INCLUDE_PATH") "")))))
#t))
(add-after 'configure 'fix-documentation (add-after 'configure 'fix-documentation
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(substitute* "Documentation/Makefile" (substitute* "Documentation/Makefile"
@ -1590,8 +1589,7 @@ (define-public criu
(assoc-ref inputs "docbook-xsl") "/xml/xsl/" (assoc-ref inputs "docbook-xsl") "/xml/xsl/"
,(package-name docbook-xsl) "-" ,(package-name docbook-xsl) "-"
,(package-version docbook-xsl) ,(package-version docbook-xsl)
"/manpages/docbook.xsl"))) "/manpages/docbook.xsl")))))
#t))
(add-after 'unpack 'hardcode-variables (add-after 'unpack 'hardcode-variables
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Hardcode arm version detection ;; Hardcode arm version detection
@ -1603,8 +1601,7 @@ (define-public criu
(substitute* "lib/Makefile" (substitute* "lib/Makefile"
(("\\$\\(PYTHON\\)") (("\\$\\(PYTHON\\)")
(string-append (assoc-ref inputs "python") (string-append (assoc-ref inputs "python")
"/bin/python"))) "/bin/python")))))
#t))
(add-before 'build 'fix-symlink (add-before 'build 'fix-symlink
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; The file 'images/google/protobuf/descriptor.proto' points to ;; The file 'images/google/protobuf/descriptor.proto' points to
@ -1614,8 +1611,7 @@ (define-public criu
(source (string-append (assoc-ref inputs "protobuf") (source (string-append (assoc-ref inputs "protobuf")
"/include/" file))) "/include/" file)))
(delete-file target) (delete-file target)
(symlink source target) (symlink source target))))
#t)))
(add-after 'install 'wrap (add-after 'install 'wrap
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Make sure 'crit' runs with the correct PYTHONPATH. ;; Make sure 'crit' runs with the correct PYTHONPATH.
@ -1627,8 +1623,7 @@ (define-public criu
"/site-packages:" "/site-packages:"
(getenv "PYTHONPATH")))) (getenv "PYTHONPATH"))))
(wrap-program (string-append out "/bin/crit") (wrap-program (string-append out "/bin/crit")
`("PYTHONPATH" ":" prefix (,path)))) `("PYTHONPATH" ":" prefix (,path)))))))))
#t)))))
(inputs (inputs
`(("protobuf" ,protobuf) `(("protobuf" ,protobuf)
("python" ,python-2) ("python" ,python-2)