From patchwork Thu Dec 12 20:27:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Nicol=C3=B2_Balzarotti?= X-Patchwork-Id: 16498 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 73A0317894; Thu, 12 Dec 2019 20:29:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 2919417892 for ; Thu, 12 Dec 2019 20:29:16 +0000 (GMT) Received: from localhost ([::1]:37040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifV5H-0004hZ-83 for patchwork@mira.cbaines.net; Thu, 12 Dec 2019 15:29:15 -0500 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 X-Loop: help-debbugs@gnu.org Subject: [bug#38582] [PATCH] gnu: criu: Update to 3.13. Resent-From: =?utf-8?q?Nicol=C3=B2?= Balzarotti Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 12 Dec 2019 20:29:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38582 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38582@debbugs.gnu.org X-Debbugs-Original-To: Guix-patches Received: via spool by submit@debbugs.gnu.org id=B.157618248311757 (code B ref -1); Thu, 12 Dec 2019 20:29:01 +0000 Received: (at submit) by debbugs.gnu.org; 12 Dec 2019 20:28:03 +0000 Received: from localhost ([127.0.0.1]:60953 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ifV46-00033X-ES for submit@debbugs.gnu.org; Thu, 12 Dec 2019 15:28:03 -0500 Received: from lists.gnu.org ([209.51.188.17]:44350) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ifV44-000338-FR for submit@debbugs.gnu.org; Thu, 12 Dec 2019 15:28:00 -0500 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:in-reply-to:references:date:message-id:mime-version; bh=vxHZbMfB8G1TKvCihH1g5/IDExKh8O2wK7pX+RhgePM=; b=RmTV1By6pOSiSZ90T01Um0/DEjx6gXRr8zQH+H5p9VvXIUIwMV8uKhcR9rhf7uohpM G4DebSxtCJQhhH0wlBSivGpCfErzHiwL8L+VkD0E6c18hRYA/7kHi1B1gHmipVe7cD9w r5CPhI13oulzUgCyPT43rn7B9ny2mwfFplhj1KbDqUVCv09GCp1uKDo4mav/5i7fj8AU RR1JaukFXimd9YMaIKH7M4gDH1vPYkOEfE/fePnYcdfV3XzQc9jjJNbRDG27onYB+2IE g2xzOksDM5bFr8psMEMGT93DfUz+IgDJ17Y7ijPNT0SGpc1Zs/l/t6BTpfQ+4fRmkuLr vqqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:in-reply-to:references:date :message-id:mime-version; bh=vxHZbMfB8G1TKvCihH1g5/IDExKh8O2wK7pX+RhgePM=; b=s8uqIaGHRbslaQrJsb3d4wM6KGhbaLL25toRYI20twt0NsJ66LGxQOZ8x8amB9ojk9 5823o/t0c+ey3DP7WRlYzDHCpegyfARoimwb1xYTlzHzxRrxvqi48ueXjtIzPdRYHwQ5 RCgNOut2jY451Ks1g+4MySUi3Z5gB0Vr23B9rf5MFzz9p339EThkjzNyE61hl3F03ISb MtbcdN2ji5nXfIVp6cpslZ8ssun4WC9MtfWTUTzxUTvUzB50qtX1d8WP4GIrMPfO6zhh SoAKsYK+W0jR/LEaqbo1TdGJ4WWHP2g9V2tctswBf8x04HT1GOE1Az8S9kgT997TrloJ ivDQ== X-Gm-Message-State: APjAAAUlDyomrnByedfXilelmTxa2L/1Ay3ILAoDqCe5MV8jlIFmJVAz 6ztxIncpJ3n0wAn4MESTjes9YFlIBlU= X-Google-Smtp-Source: APXvYqzI38hv2PvdsTY0MA+Prk7e145QzBOpkFgnqcqX5+kM0ZbNQNGczs3j5PrUXi21tmru9nGH4g== X-Received: by 2002:a05:600c:1009:: with SMTP id c9mr9124611wmc.162.1576182475226; Thu, 12 Dec 2019 12:27:55 -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 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches nixo 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 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