From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id IKiPOdDSS2R5+wAASxT56A (envelope-from ) for ; Fri, 28 Apr 2023 16:06:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:c151::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id WB9KOdDSS2TbWQAAauVa8A (envelope-from ) for ; Fri, 28 Apr 2023 16:06:08 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C969A36AA4 for ; Fri, 28 Apr 2023 16:06:08 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=spork.org header.s=dkim header.b=o+IExSQq; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1682690768; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=8oTbGXqpJNTgGRD3QWiZR4nSUMQ7FVslYEtfw7MeWso=; b=LtcTaNT2usanD0oquQHN9iDOgene5DF1mbZpATlXOETRk1uDZuRjpce6uF1PQgXfp5Dx3z 9SEK1l+KNN1DDUOstsbXAMP0BfVdjWFk71yHX1vQeGVsHeMuT1YJmQMge4FQWjvOeF8JQL 9Yc+mRgv1i6/eTo84uzkZTIY7uuvoEuzn+mr/wknpUoOM4DILzSz3gjv5jCjxi9KOF8Ctk dN89JhlqAiI34v00coTognse8ctdHQRR74MYFdataVeKkm1/M90NXi7GX1Z+22Pg85q1bd ZUMIxIRspioHg3epUJJIafsHFSPrpBzjeexDcp/SAJlIZwFrPkat40R+fM7XLg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=spork.org header.s=dkim header.b=o+IExSQq; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1682690768; a=rsa-sha256; cv=none; b=fEQXIxNp0B7WVl41mxf4F6pvrtmgO2xPyEDaYZQi58qrOpYCiQtaetKqfAuVwoEJ/DC95W wPqrdCoQuoIj1djTqm0ktdKLUKxpWPYID0zXGnFsSRbmNeFfDuDynVO2ApxzWHoOF8nCtC XGFVD5AmFwSZ5BWYXPYr9XMqlURQVIRG9lJL5aEYnIpxWFJupalXKQ5rj9f0ZxV/KWDlVL jfkCLk/NIH0/ZvqSFLNnDN7AvFppCX45+Rvuy02BgPEEppUZFStoWQcZ0WTq1ILx66Kf8l GghUuFMbv+rDbooMQq+kqrFX7bezC++9vXLEOuB71OPZ0jv4L/2mgHMO0e9T4g== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psOjd-0002CF-Ez; Fri, 28 Apr 2023 10:06:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psOjb-0002C2-CV for guix-patches@gnu.org; Fri, 28 Apr 2023 10:06:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1psOja-0002ES-JY for guix-patches@gnu.org; Fri, 28 Apr 2023 10:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1psOja-00020B-BF for guix-patches@gnu.org; Fri, 28 Apr 2023 10:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63149] [PATCH] gnu: criu: Fix build Resent-From: Brian Cully Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 28 Apr 2023 14:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63149 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63149@debbugs.gnu.org Cc: Brian Cully X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16826907117608 (code B ref -1); Fri, 28 Apr 2023 14:06:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Apr 2023 14:05:11 +0000 Received: from localhost ([127.0.0.1]:34083 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psOik-0001ye-KT for submit@debbugs.gnu.org; Fri, 28 Apr 2023 10:05:10 -0400 Received: from lists.gnu.org ([209.51.188.17]:60386) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psOii-0001yV-5C for submit@debbugs.gnu.org; Fri, 28 Apr 2023 10:05:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psOih-0001oe-OE for guix-patches@gnu.org; Fri, 28 Apr 2023 10:05:07 -0400 Received: from coleridge.kublai.com ([166.84.7.167] helo=mail.spork.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psOig-0001lP-8k for guix-patches@gnu.org; Fri, 28 Apr 2023 10:05:07 -0400 Received: from psyduck.jhoto.kublai.com (ool-18b8e9e7.dyn.optonline.net [24.184.233.231]) by mail.spork.org (Postfix) with ESMTPSA id 627C290CD; Fri, 28 Apr 2023 10:04:28 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=spork.org; s=dkim; t=1682690668; bh=BsJzBi1xhkLnzJkXy46CBYdOzj4FjgM4bP/DkTyvFY8=; h=From:To:Cc:Subject:Date; b=o+IExSQqdaWTiekAGqBSkVdKmUtjwItHecU1RpugqLq4w0PjbImmBEQtZmz75RAam Z0phvvlbR+E+sIpvH4/l1BUHzn6l5DoMAQEs8qlA0ERftKyYTYdaS0RNcRdu9XHXps qrcPKtpeZgHtmUCTtGTdCJtvt5gaauF+E+1YRibg= Date: Fri, 28 Apr 2023 10:04:25 -0400 Message-Id: X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=166.84.7.167; envelope-from=bjc@spork.org; helo=mail.spork.org X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Brian Cully X-ACL-Warn: , Brian Cully via Guix-patches From: Brian Cully via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: UNKNOWN X-Migadu-Spam-Score: -5.05 X-Spam-Score: -5.05 X-Migadu-Queue-Id: C969A36AA4 X-Migadu-Scanner: in3.migadu.com X-TUID: YQn8pN933O0G Use python-toolchain explicitly in order to pull in our patched ZipFile creation which ignores timestamp. * gnu/packages/virtualization.scm (criu) [native-inputs]: Add python-toolchain. --- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 4a0d6b0096..d9fc8108dc 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1748,7 +1748,6 @@ (define-public criu (for-each delete-file (find-files out "\\.a$")))))))) (inputs `(("protobuf" ,protobuf) - ("python" ,python) ("python-protobuf" ,python-protobuf) ("iproute" ,iproute) ("libaio" ,libaio) @@ -1763,7 +1762,8 @@ (define-public criu asciidoc xmlto docbook-xml - docbook-xsl)) + docbook-xsl + python-toolchain)) (propagated-inputs ;; included by 'rpc.pb-c.h' (list protobuf-c)) -- 2.39.2