From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:49657) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifV55-0004fY-N0 for guix-patches@gnu.org; Thu, 12 Dec 2019 15:29:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifV54-0008KF-6b for guix-patches@gnu.org; Thu, 12 Dec 2019 15:29:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54980) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifV54-0008Jh-0g for guix-patches@gnu.org; Thu, 12 Dec 2019 15:29:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ifV53-000352-TZ for guix-patches@gnu.org; Thu, 12 Dec 2019 15:29:01 -0500 Subject: [bug#38582] [PATCH] gnu: criu: Update to 3.13. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:39512) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifV42-0003H4-Ob for guix-patches@gnu.org; Thu, 12 Dec 2019 15:28:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifV41-0006bA-9j for guix-patches@gnu.org; Thu, 12 Dec 2019 15:27:58 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:55648) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifV40-0006Yd-Uk for guix-patches@gnu.org; Thu, 12 Dec 2019 15:27:57 -0500 Received: by mail-wm1-x343.google.com with SMTP id q9so3811326wmj.5 for ; Thu, 12 Dec 2019 12:27:56 -0800 (PST) Received: from guixSD (host1-200-dynamic.5-87-r.retail.telecomitalia.it. [87.5.200.1]) by smtp.gmail.com with ESMTPSA id d8sm7226517wre.13.2019.12.12.12.27.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Dec 2019 12:27:54 -0800 (PST) From: =?UTF-8?Q?Nicol=C3=B2?= Balzarotti In-Reply-To: <875zilthr2.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> References: <875zilthr2.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> Date: Thu, 12 Dec 2019 21:27:52 +0100 Message-ID: <871rt9thkn.fsf@guixSD.i-did-not-set--mail-host-address--so-tickle-me> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 38582@debbugs.gnu.org --=-=-= Content-Type: text/plain nixo writes: Attaching the patch that notmuch lost --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-criu-Update-to-3.13.patch >From 74ace32fa4f071494a234399dce707a0f06b6ada Mon Sep 17 00:00:00 2001 From: nixo 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 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable > 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=C3=B2 > > !!! Bodypart handler `notmuch-show-insert-part-*/*' threw an error: > !!! Couldn=E2=80=99t find access type --=-=-=--