diff mbox series

[bug#38582] gnu: criu: Update to 3.13.

Message ID 871rt9thkn.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me
State Accepted
Headers show
Series [bug#38582] gnu: criu: Update to 3.13. | expand

Commit Message

Nicolò Balzarotti Dec. 12, 2019, 8:27 p.m. UTC 
nixo <anothersms@gmail.com> writes:

Attaching the patch that notmuch lost
> Hello Guix!
> Here's an updated version of criu!
>
> It's still one of those packages needing python2 :( Guix lint complains
> about the homepage (redirecting to https://criu.org/Main_Page) but I'd
> keep the current one (they might change the wiki software, who knows)
>
> Thanks! Nicolò
>
> !!! Bodypart handler `notmuch-show-insert-part-*/*' threw an error:
> !!! Couldn’t find access type

Comments

Ludovic Courtès Dec. 15, 2019, 9:48 p.m. UTC | #1 
Nicolò Balzarotti <anothersms@gmail.com> skribis:

>>From 74ace32fa4f071494a234399dce707a0f06b6ada Mon Sep 17 00:00:00 2001
> From: nixo <nicolo@nixo.xyz>
> Date: Wed, 11 Dec 2019 13:31:09 +0100
> Subject: [PATCH] gnu: criu: Update to 3.13.
>
> * gnu/packages/virtualization.scm (criu): Update to 3.13.

Applied, thanks!

Ludo’.
diff mbox series

Patch

From 74ace32fa4f071494a234399dce707a0f06b6ada Mon Sep 17 00:00:00 2001
From: nixo <nicolo@nixo.xyz>
Date: Wed, 11 Dec 2019 13:31:09 +0100
Subject: [PATCH] gnu: criu: Update to 3.13.

* gnu/packages/virtualization.scm (criu): Update to 3.13.
---
 gnu/packages/virtualization.scm | 38 +++++++++++++++++----------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index dd0222730f..2cd1c9cf02 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)
-- 
2.24.0