From patchwork Fri Apr 1 00:46:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 38255 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 7A52A27BBEA; Fri, 1 Apr 2022 01:49:41 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 495AE27BBE9 for ; Fri, 1 Apr 2022 01:49:41 +0100 (BST) Received: from localhost ([::1]:57188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1na5Tw-0006Uy-9o for patchwork@mira.cbaines.net; Thu, 31 Mar 2022 20:49:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37394) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1na5TK-0006Sl-P4 for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46410) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1na5TK-0004PF-Eo for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1na5TK-0003O7-Dk for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#52790] [PATCH v2 1/7] gnu: runc: Update to 1.1.0. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Apr 2022 00:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52790@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 52790-submit@debbugs.gnu.org id=B52790.164877408712891 (code B ref 52790); Fri, 01 Apr 2022 00:49:02 +0000 Received: (at 52790) by debbugs.gnu.org; 1 Apr 2022 00:48:07 +0000 Received: from localhost ([127.0.0.1]:40291 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SR-0003Lo-1y for submit@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:07 -0400 Received: from mout.gmx.net ([212.227.17.22]:56989) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SP-0003Ka-D0 for 52790@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1648774079; bh=5JW0WGmuVh0+zm+mF5jJ6VpT1xP3tJOxirayPYpgSWo=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=d4sc3LKJlUGZJuoS0szjYbHBHnhti9Z2nZZP15gzUd9zWfJsXReSSZ7Xog9Qmx0Gw mqcFk0VelSS6lntRoVSdjcxsaaoHvptQvC5D8IS63reigvrKwbaDZDkvdKAzXY7HBm xsWQzIqanCGdI6WjYOnfXcl5tgz9i9FQtrGCgpIw= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MxUrx-1nydVu1pfd-00xvkE; Fri, 01 Apr 2022 02:47:59 +0200 From: Pierre Langlois Date: Fri, 1 Apr 2022 01:46:36 +0100 Message-Id: <20220401004642.14949-2-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220401004642.14949-1-pierre.langlois@gmx.com> References: <20220401004642.14949-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:Non7UZ1Nd9SgmgPN/jD25evZGWeu0vq0YPHa8QaDswxLgT/ihFO olNBHMb0uF7p5aAMhqLasLDgd4xk4X3y53Vj4BOh7vLmd+7NW83C5oTGwMPEqYzygtAVQWI Yzejv+NLi1eBfZCho6jQh6w1JQzFJPVMq3AtYn5q12lny7kvRiiD5nXjSYTF5khSHcs07Ph JgWM3r458lCh1yxrOh7Dg== X-UI-Out-Filterresults: notjunk:1;V03:K0:CCAWkb+3ZOA=:7HPmyc7Yu24p1vXVgfF3rT 2pYzrw4gKmgVGbMfvSVJC9mk1tQuj2OQ+8SNiyRItvUn4UpRjtsY82rvAWWSrFs6SbMWagCqd Pbn2puFzFV6KkBN5WYJt8iTE1uJX+D2DJB8Yk+UZ8r7CY4Trj2CoEH2hHoIMSjX9jBllVwATE tgpsOj6UUFKDkZr4b1FbqHBOO8fAGuw2lIz+iPsfCIz2MORySu+yzilfHX3frYPGMfFiiFtHm xZ/G2hOpKnKSrYXA8nLdwHFUvX5b8PqeGpD/EpKSes0U46ZTj90zMYLI45Kh2Gd7wZnT/RrZK 7mUUzMcKyj+0GZ+f5c81AKKUQwbexmNgOiPeV9xInwb9OO0Y/RfiUsdM6DxkxHnIdIAtsicoS LWzxo0PxmuE8d/cOhtBz/3UFFlL2rfAwuj/PZxUpYcbNNeJyJGxb7CqZtGdWJnipNHy/YhEJ0 e3UrHbgvFSrEBWs/Y5w+1mbNR88ibhfBJRDZ7n3nln0smoRz63imiiB1lSnAreFnU6KEYAhsN 2pUWvarN/Cx1w/iooZhv8qinW3cdhSbb2HObfuyEtqkETwun45x6kgg1V3/NXmWGKd08MzHp8 JzxmNUHgAiL3ZRcykqs4huwtWEXT21oVVaXpEyZhhgxAyGwcl92XrK4udr6jvsqBk2KOVmO2m dBWWwWaGJUvdL8fw2GU2sgAQkxo4hUa9YIFydQi+XE0C/z/jae2lLAWXfksOCShHmABU5hvXr xm2dhNSbb5Yg6Y+A8dxTzA5C77sO4J/uTu4WCDMT3uMsOz7qtmBbLtFEZm0nNALSIwrqc9RdJ lzvp7lYfbhT5xinOTRK3Yrxauh7E3WNSKdoiwc/epUN0n3qg+pmKH4eSR3sD2v1iWKtQBUiQj p/1O1uiOw4JVjTURMqiIIjzscbszL+nwregjrpzaRSKhQSB0tWiqouScIqNPpZNQw6BeUpt5K OOlEEocUegUC9WuzDysWd5LYSBO1x0DpuOTtdhsdoihfWXp+CvBZWPPQUwxtGMeiQX+5M6zw8 AKIPc/nh4CoK8Kr/y1N/jN+dFXTU8baKj6xbe1JlRpPkWXq7J+rjvAoE6JqwFdDdGAJEKNShm c5NxVqfP1vtpoQ= 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/virtualization.scm (runc): Update to 1.1.0. --- gnu/packages/virtualization.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.34.0 diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index a058e59f6b..d0a37fcb0c 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -18,7 +18,7 @@ ;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2021 Leo Famulari -;;; Copyright © 2021 Pierre Langlois +;;; Copyright © 2021, 2022 Pierre Langlois ;;; Copyright © 2021 Dion Mendel ;;; Copyright © 2021 Andrew Whatson ;;; Copyright © 2021 Vincent Legoll @@ -1776,7 +1776,7 @@ (define-public looking-glass-client (define-public runc (package (name "runc") - (version "1.0.0-rc93") + (version "1.1.0") (source (origin (method url-fetch) (uri (string-append @@ -1785,7 +1785,7 @@ (define-public runc (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "0b90r1bkvlqli53ca1yc1l488dba0isd3i6l7nlhszxi8p7hzvkh")))) + "08y6vp94y37ps8wx7njss8l7f57qa8bbsrz32xkmm91sg5sqjbhm")))) (build-system go-build-system) (arguments '(#:import-path "github.com/opencontainers/runc" From patchwork Fri Apr 1 00:46:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 38257 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 724F527BBEA; Fri, 1 Apr 2022 01:50:03 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 14FD327BBE9 for ; Fri, 1 Apr 2022 01:50:03 +0100 (BST) Received: from localhost ([::1]:57254 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1na5UH-0006XX-KE for patchwork@mira.cbaines.net; Thu, 31 Mar 2022 20:50:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1na5TM-0006St-RG for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46412) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1na5TL-0004PY-7h for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1na5TL-0003ON-6T for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#52790] [PATCH v2 2/7] gnu: containerd: Fix patch-paths build phase. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Apr 2022 00:49:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52790@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 52790-submit@debbugs.gnu.org id=B52790.164877409412933 (code B ref 52790); Fri, 01 Apr 2022 00:49:03 +0000 Received: (at 52790) by debbugs.gnu.org; 1 Apr 2022 00:48:14 +0000 Received: from localhost ([127.0.0.1]:40297 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SY-0003MW-AP for submit@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:14 -0400 Received: from mout.gmx.net ([212.227.17.20]:34063) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SP-0003Kc-L3 for 52790@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1648774080; bh=MvcC6U6hN7fxQUIhROriuHBQpgsuvj2vFKRUdFYkRFc=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=hmyvNz33WuwbV9v0fQFLPFM3mVKkBTU5OrNoDwAO53zz/pIiX+wz1FrTXh7VW7Gwz 6NboqUd2Z5h5AdJ0htHVABrgVrYYjID5MCSdt7ldjxvFheZejjyVIk1+uFlFpjF/Ju bAsIZ+JX1ohAinOt6BrmB2u7Ywf5j3Ujpsnq/7pM= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MY6Cb-1nX2WI3BE5-00YSsc; Fri, 01 Apr 2022 02:47:59 +0200 From: Pierre Langlois Date: Fri, 1 Apr 2022 01:46:37 +0100 Message-Id: <20220401004642.14949-3-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220401004642.14949-1-pierre.langlois@gmx.com> References: <20220401004642.14949-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:k4yOIkug6PAhy/RISuMtrWxLKw1fdnoZa+u86vA2QUlRQSE49Ox ZdUafBqzgHk1UVmMIX1ItdUfoaALEyAaibesHtPSrD57XlozUcnSHIXLXgiTBIbow1YI/am CgP20iBBHpuxIP6Uvz+mABdMtqv0JRwSBgov2WsDImIPLgc3EkhU4GN2yBW2htDldkrs2DI dDzC6W/5mko3i4tdteroA== X-UI-Out-Filterresults: notjunk:1;V03:K0:y+BoSEDzkXA=:J1PBeKd7F9BEigse44KNsg fMhEK5ts3r9naxKETQJJ/nL7yLizdXI+Qegkh1kAcaRwLcyhnYflcXHhbXZ34U2U2ssOy5B2Q gHzDwwPbgmM5QZ7yMeE7k+DOf2gGJwIoB7RVFEyoD00BxrEGoHNgVt3PDf9aDr8S+lPSNxm8h 56oYT6++XPjUCRAy0USa7XwyL9vArH6y29SfxkArNbKjmvXbJmIIzl50meHU0Bs5dFmmSA3Ox z+tlgh0cUrqW0cT02KVluVSb3Bwbh1iKRtIqEdqG9DS0YySWA9WrDhQ1r47pyJdGg/I0TW8pp kY4/iOJQCaXLkKXBad5XJAoZtSmJCvMuIkYjFaqEf4CnrQhJOYORp3TmODw5b90BgLcZMtAbw sPqnY3db816LEfZB9oPw5riyHEFKZfsQq8GYw6d6qXQL0MRNQfwkPCXCGHljQsY0NsWwzfHaX LVNk1kIz1Spyk2P+ujk/F88CcJqmEDN18/nLYgCSDTAaykLpLL/dJ9UxMoI2FNqwgm7cn6x+C fYrQszV1dIiN2+g0aPGDWaGTOlRRV/nq+I165KRkL3Ws/h+nfAinXifYIsJRAphFnloiccfkd b0sU6prX0xDbMY6IvBj4IdTotAZyeyuGK99JDZrC0vW74sOYKUP1NQCn8IyBViiYyHkx0ICkP sdNIXAHZSjV0nJMSEC1B1zmY4VqtlCZ9fLwMY/RKDLlqEYv1SiYMntxDAXEyYek84RNOeAo8S Dn9bMyRRRjcXWt/THArdn6c8qe2EW6fMtVnb6LTLGRFrKcVUQNflHehovbIPJzoeGo3NXQHlD GYyoINiblh+hP2Wc1ek/LnmYNNTGPetjGbX10HcpJ+2wsC0YFtj5FjTFBcJioBXvuCS5egppi ndKW9aNBnR1HC1VAi2VJ8Bkb0EVmMnTL8TXi2nGZyrer1BldyCuiAM5redxu9EzK3KBanlOpK adu6UUiLEiTLmu/4zUXnNl3Y/VCNC22SCp8fMbGxT1vhQkXz24Ib0IHAwrOgdGxaqVC60VLJ/ /jqOWIlN8zUn4u0s0H+EjrBP+0foH/gVB4W9aeQAJBB2cWcixjOyiZCSeG4L3IiaDFetDI6E3 oOTA2lbUqZ3F/I= 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/docker.scm (containerd)[arguments]: Add 'patch-paths phases after 'unpack because 'chdir doesn't exist. --- gnu/packages/docker.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.34.0 diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 3f52f4f8db..b76db22d58 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2020 Katherine Cox-Buday ;;; Copyright © 2020 Jesse Dowell ;;; Copyright © 2021 Oleg Pykhalov +;;; Copyright © 2022 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -190,7 +191,7 @@ (define-public containerd `(#:import-path "github.com/containerd/containerd" #:phases (modify-phases %standard-phases - (add-after 'chdir 'patch-paths + (add-after 'unpack 'patch-paths (lambda* (#:key inputs import-path outputs #:allow-other-keys) (with-directory-excursion (string-append "src/" import-path) (substitute* "runtime/v1/linux/runtime.go" From patchwork Fri Apr 1 00:46:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 38256 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 36C2127BBEB; Fri, 1 Apr 2022 01:50:03 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8C38327BBEA for ; Fri, 1 Apr 2022 01:50:02 +0100 (BST) Received: from localhost ([::1]:57214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1na5UD-0006WC-Tt for patchwork@mira.cbaines.net; Thu, 31 Mar 2022 20:49:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1na5TM-0006Sv-RZ for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46413) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1na5TL-0004Pa-LV for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1na5TL-0003OU-Ja for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#52790] [PATCH v2 3/7] gnu: containerd: Update to 1.6.2. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Apr 2022 00:49:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52790@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 52790-submit@debbugs.gnu.org id=B52790.164877409512941 (code B ref 52790); Fri, 01 Apr 2022 00:49:03 +0000 Received: (at 52790) by debbugs.gnu.org; 1 Apr 2022 00:48:15 +0000 Received: from localhost ([127.0.0.1]:40299 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SY-0003MY-O0 for submit@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:14 -0400 Received: from mout.gmx.net ([212.227.17.20]:56489) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SQ-0003Ke-34 for 52790@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1648774080; bh=+IvPEElv+cBXbh5a0A65j6GOK6ILdAzJ6HR/YfD+DKI=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=XnzO2wCPf+WPRge9jEplPe8JZNY253p2JSZWaGICtdN2+KOh2keYHk7lB5gxlvTtg +hlRKFTSQkdVq4hJfneMrpEwFMIQ6ttX3poEp4cjJQhQMpvi0NyCeidkOeYDFZ+Obb Q91+eXF0Mn0BEaHg9W81Xwistat+a7gGj1G0hhw4= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MXXyJ-1nWUHv0LTb-00Z0qO; Fri, 01 Apr 2022 02:48:00 +0200 From: Pierre Langlois Date: Fri, 1 Apr 2022 01:46:38 +0100 Message-Id: <20220401004642.14949-4-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220401004642.14949-1-pierre.langlois@gmx.com> References: <20220401004642.14949-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:abrjmIZq+iztjVYRWSQY/B8YSavoSfsuDHSu10PSUlvHj5PToIw Gq9wNpgitZPe2tdAE93YtvoOtE5txsfdwAUHyTXWDy+kpyY8dNhqBtwZ/RZlabQGMTOK+2w f++gkdLw315MSzF2Yql1P6MXjvr8U3UO0y2Z5QpnwG4NTZQAU+4vGD8o5B+xyLnQrUCLeaG oSlWoJeKzBRrjOo9beGSw== X-UI-Out-Filterresults: notjunk:1;V03:K0:zsp6pgBsbjA=:I+0UmHrzc0N+mXrQvcm9hw jf04X64/h2FBMOY+Gy56AiA4tASYIcc/pLctg0T8eyfphqjK0Hbsy6cJ/vY2BzZlRIZ9si0I6 IVA7g0XmotNnu5UtIGCngxJptdvs0eOzg9wtEWP28EG0PHfX+s1cmShn7ADhJ415YN9tDEAko jbgzC+Qknyl3wYkJ61JjEVodFpIVE4uRd7LFqlaDGoHDfxThTIzcih4gKf0aHUpIpYYd1EkUl eUPiGCcNTQjVfhhzAi7Qk9LmtRRqPf8OxCuVm0VySG5xyvAfqUjvgK9Y0Gz7hZw2WhHYNdBRH 9caBO9rEfPVLpw1vUIgFYiHx48vGMvZrXeT1bF4uT9fb0h+VWyzKH3lq/nyIllr532o6/yVF6 o7D4glynrGhxWu79lBz2DQiG4kmLVjg/LqVHz5TIBTOhPLGXQCxRxcWTk1UmgKIYW/QVI/+hx 1VW/MPue02kqWq9S29+qNBMFnb9EGnkKY7iFw3WNFF6q6nhDycPmCBs8EAYUW2NRiXPYwWtFz uKOxDTAovwUJkSnAgm/GzQCUhDWfUgt+sQPwrP2MSkLnooI+pHZs1sHSro8QRYgnEeXUPLYB+ lX+Q1PieT55UrtAcB6NRJpNJcJEvQOOxQ3pGdtmafrV2DveAPh0jkwDkafUAzlg45nTaELdkj eXRifPTwMWEhu1qEChDhILcD9Ph0TRZHjKrkQVOVnIEpLQ9UrV2GSSa7AeDKcAeLjT5LBsfSS 0cOAgnzQqat2E315D6jS2zHTIq1fEhDF9+3F1pp+rfNBgIIzQ7S9U5PBd6u0KrF8IbKZew9Z2 YdJs2XEZD/NZR8VKCBpU2rbuyiwhEQthMmOFUIGbnFRxPIsSRBT+oYKgeR4ek7bRKmuKydALO zgP74uXtdmsNSg9ixP4IHdP4aGGkYHMuZndk1XPJlK8yLFggw/LXBNIZdomEJ5PKaj/RK71z/ hI/4D2sY2D4q6QuUoFZ9x+sQYwEI9X6ZzqPFkHqNIlk/dIOYAtG2rYQOXRCUsiBuSp/5EcSSM VOBJiWwkKjvM46JLaCEGwBIPKFOHNQVzvbcP/LEURoBpRcZNuKsyY36d4S0JMi9Wat/aGYWLc RMSwaUQzQ5DDzk= 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/docker.scm (containerd): Update to 1.6.2. [arguments]: Substitute runc binary for "pkg/cri/config/config_unix.go". Set PREFIX to empty string, as the install directory is $DESTDIR/$PREFIX. --- gnu/packages/docker.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) -- 2.34.0 diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index b76db22d58..7a7594f2b1 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -174,7 +174,7 @@ (define-public python-docker-pycreds (define-public containerd (package (name "containerd") - (version "1.4.4") + (version "1.6.2") (source (origin (method git-fetch) @@ -183,7 +183,7 @@ (define-public containerd (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0qjbfj1dw6pykxhh8zahcxlgpyjzgnrngk5vjaf34akwyan8nrxb")))) + (base32 "0fw62aya0gwxaa2kkcjkbifp8n0xmk1x0qzjahlsls6g0pmh5pkq")))) (build-system go-build-system) (arguments (let ((make-flags (list (string-append "VERSION=" version) @@ -203,6 +203,11 @@ (define-public containerd (string-append "defaultShim = \"" (assoc-ref outputs "out") "/bin/containerd-shim\"\n"))) + (substitute* "pkg/cri/config/config_unix.go" + (("DefaultRuntimeName: \"runc\"") + (string-append "DefaultRuntimeName: \"" + (assoc-ref inputs "runc") + "/sbin/runc\""))) (substitute* "vendor/github.com/containerd/go-runc/runc.go" (("DefaultCommand[ \t]*=.*") (string-append "DefaultCommand = \"" @@ -226,8 +231,8 @@ (define-public containerd (lambda* (#:key import-path outputs #:allow-other-keys) (with-directory-excursion (string-append "src/" import-path) (let* ((out (assoc-ref outputs "out"))) - (apply invoke "make" (string-append "DESTDIR=" out) "install" - ',make-flags))))))))) + (apply invoke "make" (string-append "DESTDIR=" out) + "PREFIX=" "install" ',make-flags))))))))) (inputs (list btrfs-progs libseccomp pigz runc util-linux)) (native-inputs From patchwork Fri Apr 1 00:46:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 38260 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 294B027BBEA; Fri, 1 Apr 2022 01:50:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 985A327BBE9 for ; Fri, 1 Apr 2022 01:50:19 +0100 (BST) Received: from localhost ([::1]:58082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1na5UY-00077t-MS for patchwork@mira.cbaines.net; Thu, 31 Mar 2022 20:50:18 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37408) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1na5TM-0006Su-RR for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46414) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1na5TM-0004Pb-1r for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1na5TM-0003Oc-0G for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#52790] [PATCH v2 4/7] gnu: containerd: Switch to gexp arguments. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Apr 2022 00:49:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52790@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 52790-submit@debbugs.gnu.org id=B52790.164877409512948 (code B ref 52790); Fri, 01 Apr 2022 00:49:03 +0000 Received: (at 52790) by debbugs.gnu.org; 1 Apr 2022 00:48:15 +0000 Received: from localhost ([127.0.0.1]:40301 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SZ-0003Mg-0j for submit@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:15 -0400 Received: from mout.gmx.net ([212.227.17.20]:56229) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SQ-0003Kf-9W for 52790@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1648774080; bh=wpuY0jE0Kjgp3uAXlwWTpSxzbEmYcwYp2LaBjQfdYP0=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=l4xhw07el7vSIa5puavUIjejxTSg3rf6sU4FoG9jvckzZwIcPbw265+o8LEksOoVG RqTa5o7q3adq5yPB8X790GAs++EpvtYcBnipIqHsLkNGzP1dRukA30HZ8D0LYBbqCy G7B7m68Uy17s/+C2Q4PE2ffer/OHd26UvBgTTEis= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MrQJ5-1oLIaV1eXX-00oUMK; Fri, 01 Apr 2022 02:48:00 +0200 From: Pierre Langlois Date: Fri, 1 Apr 2022 01:46:39 +0100 Message-Id: <20220401004642.14949-5-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220401004642.14949-1-pierre.langlois@gmx.com> References: <20220401004642.14949-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:jlYTAVBc9bg+Bb6YKCqodi5HHFXPhWQcf7TCoTVryUXYb/SQUCW VzU6xsmloqbQz1P0i/QmXKvWKSUrt0f9/o/hdWJTsM8LVv6iUDrpGY9ixtZ+RTM1cBaof5G 80njqMIQlXk9Jpbry9ETBEVHHDQdY5T+o7uFHUVN5fJnscoYkpDvtMo4BHZ1Pgs0cJ+rx2h IA8CpaJhl4/v3VCneX8DQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:7MzxoOmavMY=:EO+qVzEIpH/hl0uU0HSA2e T/NIhEhQWK+EFEL1twrfilsM47dSsZTjAhOuMGmc6VOCS8QlJQgQf9Cux3lLr+Zhb7dU+m/cT FhYTUekSiGi3Nd7raKj7U4KUG1YU6ez5U0dzwwG/hg/73Zc6AlysLZQX3NYfHvU6OI83JThOF YmrctpDjhVGCzJCCejnAJKh35dChzfrA09XVMjJbrz1CbVmDq1cCC+9X1DHaM0qyGP7RVRSIn Qj0fDbwsqemmjQwI0jO+IL0buGPhYo7msNjVULasc6YF8x7JkLtWQJZsEHT6qF3io2gtUZXQt Kc5vhleJBPtXJgg184jaEeSkaPl4UOOEFiJE6l3dkleuRYYKe9q6jWG5+hSe7vUDZkYg+Kg9f 2H8Zq1JQJkXobHNZByHfDu0keNAkIWut96XI35R5Kc4LGDbj1oGGGKT4gXPhkknFNgyP109+e dfgXbck8E9fCik2dtcMUACCotlqCeJPT3GWtOTnkPftx1MlZUIoEl45pSHn9jvCjNi94HrlL3 n4UUE0YbhpoD465idJFPwYxwOuDFlfgqM3y9uxeel1bu3OT/a/ji4kx0xiETGcED75TybRkzv I5sr41jg1F78PhmOaJwyFRGqfXm2JPCbQbTSpvetDXd/VD3x2e1v8sXfng6gv/FpZr2pNO6Zt Lz5H6YXprYb1IyC0tDr4xiy783tJX8j5bBnZolWEThcotEsqEkhHV4ZlA4R2Rg7UIanAh8E6q B2pFcXVC0nXzYyaeudJ92VeJQ4GRzu1S2Mp5hN5fIhMqtHNJLUUASbEXQc7RkmkPj/9yWi/bo 43K6SCFSOkK9LnoekfxIlsto3esMLT7/d2a2A4safRAgUZ50PDAHyukXzpt7+41hOnC7V2hlF C+lkGGw52b077pdoQqGFCEhJwvZzXoMySpcYnty1QWRF2bS7lDVNJAFt0nrRe7xjd/nGzZpmh 5RmxI+7pfET0lGQXssAbNzwlYlPLksubdUG0q4l3Y3m8SIpS9PYsTuRcWz4vTOLdRuyHjfrpl W9IrtY2QQjMbP57azfEYEfXjPm0tKk1DILR8+ZeGK4gjdwbu56BQsHdQjpp1bRKcR/jr8aO9U 8RFayiMtAV49Yo= 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/docker.scm (containerd)[arguments]: Rewrite as gexps. Pass all flags via make-flags variable. Switch to using search-input-file. --- gnu/packages/docker.scm | 95 +++++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 46 deletions(-) -- 2.34.0 diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 7a7594f2b1..d2c022f552 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -29,6 +29,7 @@ (define-module (gnu packages docker) #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) @@ -186,53 +187,55 @@ (define-public containerd (base32 "0fw62aya0gwxaa2kkcjkbifp8n0xmk1x0qzjahlsls6g0pmh5pkq")))) (build-system go-build-system) (arguments - (let ((make-flags (list (string-append "VERSION=" version) - "REVISION=0"))) - `(#:import-path "github.com/containerd/containerd" - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-paths - (lambda* (#:key inputs import-path outputs #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-path) - (substitute* "runtime/v1/linux/runtime.go" - (("defaultRuntime[ \t]*=.*") - (string-append "defaultRuntime = \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n")) - (("defaultShim[ \t]*=.*") - (string-append "defaultShim = \"" - (assoc-ref outputs "out") - "/bin/containerd-shim\"\n"))) - (substitute* "pkg/cri/config/config_unix.go" - (("DefaultRuntimeName: \"runc\"") - (string-append "DefaultRuntimeName: \"" - (assoc-ref inputs "runc") - "/sbin/runc\""))) - (substitute* "vendor/github.com/containerd/go-runc/runc.go" - (("DefaultCommand[ \t]*=.*") - (string-append "DefaultCommand = \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n"))) - (substitute* "vendor/github.com/containerd/continuity/testutil\ + (let ((make-flags #~(list (string-append "VERSION=" #$version) + (string-append "DESTDIR=" #$output) + "PREFIX=" + "REVISION=0"))) + (list + #:import-path "github.com/containerd/containerd" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs import-path outputs #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (substitute* "runtime/v1/linux/runtime.go" + (("defaultRuntime[ \t]*=.*") + (string-append "defaultRuntime = \"" + (search-input-file inputs "/sbin/runc") + "\"\n")) + (("defaultShim[ \t]*=.*") + (string-append "defaultShim = \"" + (assoc-ref outputs "out") + "/bin/containerd-shim\"\n"))) + (substitute* "pkg/cri/config/config_unix.go" + (("DefaultRuntimeName: \"runc\"") + (string-append "DefaultRuntimeName: \"" + (search-input-file inputs "/sbin/runc") + "\""))) + (substitute* "vendor/github.com/containerd/go-runc/runc.go" + (("DefaultCommand[ \t]*=.*") + (string-append "DefaultCommand = \"" + (search-input-file inputs "/sbin/runc") + "\"\n"))) + (substitute* "vendor/github.com/containerd/continuity/testutil\ /loopback/loopback_linux.go" - (("exec\\.Command\\(\"losetup\"") - (string-append "exec.Command(\"" - (assoc-ref inputs "util-linux") - "/sbin/losetup\""))) - (substitute* "archive/compression/compression.go" - (("exec\\.LookPath\\(\"unpigz\"\\)") - (string-append "\"" (assoc-ref inputs "pigz") - "/bin/unpigz\", error(nil)")))))) - (replace 'build - (lambda* (#:key import-path #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-path) - (apply invoke "make" ',make-flags)))) - (replace 'install - (lambda* (#:key import-path outputs #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-path) - (let* ((out (assoc-ref outputs "out"))) - (apply invoke "make" (string-append "DESTDIR=" out) - "PREFIX=" "install" ',make-flags))))))))) + (("exec\\.Command\\(\"losetup\"") + (string-append "exec.Command(\"" + (search-input-file inputs "/sbin/losetup") + "\""))) + (substitute* "archive/compression/compression.go" + (("exec\\.LookPath\\(\"unpigz\"\\)") + (string-append "\"" + (search-input-file inputs "/bin/unpigz") + "\", error(nil)")))))) + (replace 'build + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (apply invoke "make" #$make-flags)))) + (replace 'install + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (apply invoke "make" "install" #$make-flags)))))))) (inputs (list btrfs-progs libseccomp pigz runc util-linux)) (native-inputs From patchwork Fri Apr 1 00:46:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 38259 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 C22B027BBEB; Fri, 1 Apr 2022 01:50:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9E1AF27BBEA for ; Fri, 1 Apr 2022 01:50:19 +0100 (BST) Received: from localhost ([::1]:58098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1na5UY-00078d-N0 for patchwork@mira.cbaines.net; Thu, 31 Mar 2022 20:50:18 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37404) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1na5TM-0006Ss-RI for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46415) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1na5TM-0004Pc-DU for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1na5TM-0003Ok-Cc for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#52790] [PATCH v2 5/7] gnu: docker: Fix mkfs.xfs reference. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Apr 2022 00:49:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52790@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 52790-submit@debbugs.gnu.org id=B52790.164877409512955 (code B ref 52790); Fri, 01 Apr 2022 00:49:04 +0000 Received: (at 52790) by debbugs.gnu.org; 1 Apr 2022 00:48:15 +0000 Received: from localhost ([127.0.0.1]:40303 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SZ-0003Mn-ID for submit@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:15 -0400 Received: from mout.gmx.net ([212.227.17.21]:40443) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SQ-0003Ki-RY for 52790@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1648774080; bh=QgwONXUMdcZ6CcUXT7ll+aKkXEftXpmu3oZ4FF/MWcU=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=SRzlBbB7kt8j5XjhnRyKAnLSV9ccZzLPzTRAXpYWDAvvCfBMYx+5cbvDM3tJm3lyu drj8QJhmLbc96GL4k1N1RTp3y5i4ImJGzI2bVJJU7cuxMwUA8Yi+5zGYYHkP8J38w1 cm5hkL8h6RLIQgNwDweqFFhTpwBiHry64OnU+IQA= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MsHnm-1ntOQc2uKY-00tmsH; Fri, 01 Apr 2022 02:48:00 +0200 From: Pierre Langlois Date: Fri, 1 Apr 2022 01:46:40 +0100 Message-Id: <20220401004642.14949-6-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220401004642.14949-1-pierre.langlois@gmx.com> References: <20220401004642.14949-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:0LV0jJVxk/Rjtq5NJQS+GegKLlafUkMK8gKCok3VsR4GDb6t39g ihNyc7CvYbBROzTLoOYpQVMDI5ujfCpmNfpHsFq5RUi+u8Es1XDIwQJVC6SKSzZJ3FvTzHZ p8LNJGVq8fKJGX9+wwtLdMv6Kgnl06/kTGxXkl/Px2LgvIHriMcLCmBFnf7rcgjxClr06/6 D9YAlrTvtdxKIYgOwYdxQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:msASw76Ppow=:vWYXdA/foHf9WZPq3s88lX LjBIM6QzmrWXJuKvs7faNrVA0VLXQPhsxMpCOpY0hjNNNIc5W/5ksd5Z7Kl0mh5OAJRNTygfd pwHI0W9TqE8hbBkfJtokBBPo0QyXrKDncg8bdUvwSKMelxkubwxwfeB6yKHkMQ1roo9MSFOqL dOIJgYRFPy8niqGtAI/zamXDxQJJlL83c0vbFB6Oy6vYAKdYPYfWIzdxcl4orz9HW4E7wIDaz zNWfQ6zaXb+l2MNQblVMZ+rYxO29GYLnvdVWwz+83md4FvlwkbXMFXhjDif0oG36Pe6OJfv1I YQADJ5GNFxFRU+HFXIwwvFgPSaXd05pGZNZoBKxZkFgIuEZ++YJPkAfEd1+9SLm8orroO4PsS Zyjt3L84qGdb3egkbR59q1TCkRd3QzekANg/PIdq+G8sAOWhY8t4TsM6uJsouOCjvhUy6XeBD guvj9vAcuqheSpLyehsw3W/3aLjp2Qyg2hi8eK/BzsvvQvNu7B8sePNVVA+0zKs0PTxFxKTHa IpLIxbB8mxIaOXKZj8YmhJWwJn4KxVX6QV2TDBGo5IR0KXRP9BCNGohP4CUT1BYLaEHuzAioz sTVgNlWBK6jCK8Ut3pmN9KdtMugOrRx8OCROOuGHtqG/FkrurFnCuWxFnm+LH44zFHnPqNk7G r4aDPcfKuGFlIFbZr2MyV8Eq3hNUe/drEWbw0SA2fytguc4dP03f9MGeZsLDy5njumJgaUitd IMyjOA9cSFW8fs9ygH7GSTrTyTmO0ZDbP3R7k56i+p1jrmj+QHDpd64ePaAuFXDcX+mvpDYy5 AUk0FeRl79qVntiQApZXd/rKuRkdyn8V+zcCD6f3K8+2nevnQdO7vpQ9hwdtpyipsU+Rvtr67 WbrNoZ5MIirlxwcJSJ0NG42AJts3Gd+K/Fg+DOLq89QkXKwp4x1C4Vpi6H8bnBrzjuknZe6xB Mr6g/uEcer2YYKko8edKXMDh8dTD37If8EMpXV/asbqgxqQ0jS4tOIuSA3WZstTJ7756IFsy3 IXw3I9hjUl6eEfN57V7G7T8rQX7IQ6Pevc+hZjAyWTB4FmO2/+I06/QoQWTg6kCHXRo9ajcSo by87dltteeRadM= 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/docker.scm (docker)[arguments]: Refer to sbin/mkfs.xfs instead of bin/mkfs.xfs. --- gnu/packages/docker.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.34.0 diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index d2c022f552..0d721ead38 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -440,7 +440,7 @@ (define-public docker (substitute-LookPath* ("containerd" "containerd" "bin/containerd") ("ps" "procps" "bin/ps") - ("mkfs.xfs" "xfsprogs" "bin/mkfs.xfs") + ("mkfs.xfs" "xfsprogs" "sbin/mkfs.xfs") ("lvmdiskscan" "lvm2" "sbin/lvmdiskscan") ("pvdisplay" "lvm2" "sbin/pvdisplay") ("blkid" "util-linux" "sbin/blkid") From patchwork Fri Apr 1 00:46:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 38258 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 16C2727BBEA; Fri, 1 Apr 2022 01:50:17 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E76BC27BBE9 for ; Fri, 1 Apr 2022 01:50:15 +0100 (BST) Received: from localhost ([::1]:57908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1na5UU-00071D-QX for patchwork@mira.cbaines.net; Thu, 31 Mar 2022 20:50:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37412) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1na5TO-0006TV-OM for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46416) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1na5TM-0004Pw-Q7 for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1na5TM-0003Or-On for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#52790] [PATCH v2 6/7] gnu: docker: Update to 20.10.14. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Apr 2022 00:49:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52790@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 52790-submit@debbugs.gnu.org id=B52790.164877410012968 (code B ref 52790); Fri, 01 Apr 2022 00:49:04 +0000 Received: (at 52790) by debbugs.gnu.org; 1 Apr 2022 00:48:20 +0000 Received: from localhost ([127.0.0.1]:40305 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SZ-0003Mu-QT for submit@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:20 -0400 Received: from mout.gmx.net ([212.227.17.21]:58821) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SQ-0003Kk-Ul for 52790@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1648774081; bh=mCTP99AL91AbFIb9Dck7nh1badsTt69n3gx+7E6LFKo=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Xvkr9mcIslDqkYO8w68ZE6FWCJmN3a+3Q+FXHpN5po8Wr42k1F94TLVz831AeA25K yUdXK8n06HmKy1tfxWclgEMTxsSGHKxQ6bgMmgK4LT1T6wby1OCd6IUAQp29F4/Aou VzpgEKcy9+YBew05+VpYIXP0rEFkyfPflP1TgSZ0= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MBUqF-1njjqQ0Arn-00CvcG; Fri, 01 Apr 2022 02:48:01 +0200 From: Pierre Langlois Date: Fri, 1 Apr 2022 01:46:41 +0100 Message-Id: <20220401004642.14949-7-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220401004642.14949-1-pierre.langlois@gmx.com> References: <20220401004642.14949-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:I0S7OvuPdm4nMhPUHJyZBhpM/0qyXk1YEchsYY/pE1/t4HhxuSZ jBPmvQP5Ow1SLWr1IH9KfjQxmuV0zJVX9vJkqy3O1NPKmbvduEGmHFQKmAxNL3m6NIvHBgq Zs/CXgiq3O2VoEmgqi98sMDrCQqJgQR4Ong7CVjGns3B3ffswfaUXDCW3V2aj4KV8vQJSlx 3SVzjKqLdX5y7/1Y2D0lA== X-UI-Out-Filterresults: notjunk:1;V03:K0:gkj60CeNQCI=:IUW2Ux1OJlMxdciakfh1iv IGLxuwo0lJhzknOFZ9IgjxniQ3WMQY/udFwHqMbdpOwvqCKz8zIPdnMRjS3Sdjwx8UTds2F0n 50Fa/IfMOaDsxhgDeM8KRQVy+F4C7dKQ4/7wZLw2llWHN3Ewab9kH5dv5i/i7MFEvTJL24L7I 2wJjr2UuUD9gJUzcgkcI5osB5nTQ2Xqnq6+3sqOlTAK7SCbec2J/eqJQI19QolLx02qgdulQ/ +B+kVvHQJHwiMBY4fIneOMqdAhF6YQnQLgRW/v1r/4qSYBw/1+PQF/K0zDNi8/EJzFgXfB0Pi 8PP+QYB0IjMti+hMtlUHbYnlOmDlIFdD4+rKsYpL3U86fMln/CtCWITfyzmYjJBTEqc9mBfQu MTfq8fdIEr/yYE94jEW4s93esSSbx1ulwXKlP+v/lAi2h2M2TYnad80QkYwzOM6PhnTeVIqYd l7G1u6aDD0Xf2j8Pn3V3EsBWh27sQWAqnmJRFzisnaKo+UACvZqIfYCXTGAD2PU+SNN1TTw8T 7vkK2iUlGL9N0nWoKd3XspW99zFOH2dDTdKGhe7HnUD0kgIKJSqAl/nVChZd0GWjImPKQER/2 kcVNrWJXN2GWFck2VZqfp3wAwFozY8M2augUQyk5KdJ5Tc5F9jglXNAJVYe+sSunQ1wmWmIiW 4BQZyquHtQRVsN65QDq3JOwAEVv9xwm0rrrrJHvH9PIztrrQfOIuPRr2nOSzmR5uLiTwEZ5S1 KxsacWj3p+MBPHi8JszogX+nMZ8hl3c4bSsBSElYtpKRPdxwX2Xji9rh8xozNwGHIXm+Xi48f kArhYKOzbMXxOWLG14If5sNpUPzpdHFIUsAnYyZ289y1S4OQchTa5skCWuoWgxM1Xzu9ker0y TI0X2LB0nF4DFEfg45fwMqeJo0q729KziR5GLh6RUBElkXwKnqclKV/U6BnQUoybMrbFWsP7l 0gn2VhJYJ2P1N33oPWK9mOn3AaHd76hkaFFBcFGkSgSV3VYhgeNUkwr7DBjRlOZHFc6HCsoGP f2c/THjbXz6HWjS9BrbPG2btvLZKv9kovH94e0kaABShCyhca9EvZZrAuAsioSXu6BHgzA+om d9OerULU05ivFM= 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/docker.scm (%docker-version): Update to 20.10.14. (docker-libnetwork): Update commit according to vendor.conf. (docker)[origin]: Remove docker-fix-tests.patch. [arguments]: Adapt 'patch-paths phase, substitute "ip6tables" and buildkit-qemu. Remove trailing #t. [native-inputs]: Replace go-1.14 by go. (docker-cli)[arguments]: Set GO_LINKMODE to "dynamic". Remove trailing #t. * gnu/packages/networking.scm (go-sctp): Update commit according to docker-libnetwork's vendor.conf. * gnu/packages/patches/docker-fix-tests.patch: Delete. * gnu/local.mk (dist_patch_DATA): Remove patch. --- gnu/local.mk | 1 - gnu/packages/docker.scm | 69 ++++++++------------- gnu/packages/networking.scm | 6 +- gnu/packages/patches/docker-fix-tests.patch | 28 --------- 4 files changed, 29 insertions(+), 75 deletions(-) delete mode 100644 gnu/packages/patches/docker-fix-tests.patch -- 2.34.0 diff --git a/gnu/local.mk b/gnu/local.mk index a704161abc..d5b3d4bba3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1007,7 +1007,6 @@ dist_patch_DATA = \ %D%/packages/patches/docbook-xsl-support-old-url.patch \ %D%/packages/patches/doc++-include-directives.patch \ %D%/packages/patches/doc++-segfault-fix.patch \ - %D%/packages/patches/docker-fix-tests.patch \ %D%/packages/patches/dovecot-trees-support-dovecot-2.3.patch \ %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ %D%/packages/patches/dstat-skip-devices-without-io.patch \ diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 0d721ead38..020c89bb11 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -54,7 +54,7 @@ (define-module (gnu packages docker) ;; Note - when changing Docker versions it is important to update the versions ;; of several associated packages (docker-libnetwork and go-sctp). -(define %docker-version "19.03.15") +(define %docker-version "20.10.14") (define-public python-docker (package @@ -252,13 +252,12 @@ (define-public containerd ;;; anyway, as it needs many dependencies that aren't being satisfied. (define docker-libnetwork ;; There are no recent release for libnetwork, so choose the last commit of - ;; the branch that Docker uses, as can be seen in the Docker source file - ;; 'hack/dockerfile/install/proxy.installer'. NOTE - It is important that - ;; this version is kept in sync with the version of Docker being used. - ;; This commit is the "bump_19.03" branch, as mentioned in Docker's vendor.conf. - (let ((commit "55e924b8a84231a065879156c0de95aefc5f5435") + ;; the branch that Docker uses, as can be seen in the 'vendor.conf' Docker + ;; source file. NOTE - It is important that this version is kept in sync + ;; with the version of Docker being used. + (let ((commit "339b972b464ee3d401b5788b2af9e31d09d6b7da") (version (version-major+minor %docker-version)) - (revision "1")) + (revision "2")) (package (name "docker-libnetwork") (version (git-version version revision commit)) @@ -271,7 +270,7 @@ (define docker-libnetwork (file-name (git-file-name name version)) (sha256 (base32 - "19syb3scwiykn44gqfaqrgqv8a0df4ps0ykf3za9xkjc5cyi99mp")) + "0wx2hdwx56cbxiaky9kw2bi1prdfgzwr776lq1k0slw8kvn0cn32")) ;; Delete bundled ("vendored") free software source code. (modules '((guix build utils))) (snippet '(begin @@ -324,9 +323,7 @@ (define-public docker (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0419iha9zmwlhzhnbfxlsa13vgd04yifnsr8qqnj2ks5dxrcajl8")) - (patches - (search-patches "docker-fix-tests.patch")))) + (base32 "18nid42p1n20mg7spz0knh4izkk8qgjz9xi6v54czvy7aaj336i3")))) (build-system gnu-build-system) (arguments `(#:modules @@ -369,9 +366,10 @@ (define-public docker (("DefaultRuntimeBinary = .*") (string-append "DefaultRuntimeBinary = \"" (assoc-ref inputs "runc") - "/sbin/runc\"\n")) - (("DefaultRuntimeName = .*") - (string-append "DefaultRuntimeName = \"" + "/sbin/runc\"\n"))) + (substitute* "daemon/runtime_unix.go" + (("defaultRuntimeName = .*") + (string-append "defaultRuntimeName = \"" (assoc-ref inputs "runc") "/sbin/runc\"\n"))) (substitute* "daemon/config/config.go" @@ -400,16 +398,6 @@ (define-public docker (substitute* "pkg/archive/archive.go" (("string\\{\"xz") (string-append "string{\"" (assoc-ref inputs "xz") "/bin/xz"))) - ;; TODO: Remove when Docker proper uses v1.14.x to build - (substitute* "registry/resumable/resumablerequestreader_test.go" - (("I%27m%20not%20an%20url" all) - (string-append "\"" all "\""))) - ;; TODO: Remove when Docker proper uses v1.14.x to build - (substitute* "vendor/gotest.tools/x/subtest/context.go" - (("func \\(tc \\*testcase\\) Cleanup\\(" all) - (string-append all "func()")) - (("tc\\.Cleanup\\(" all) - (string-append all "nil"))) (let ((source-files (filter (lambda (name) (not (string-contains name "test"))) @@ -446,6 +434,7 @@ (define-public docker ("blkid" "util-linux" "sbin/blkid") ("unpigz" "pigz" "bin/unpigz") ("iptables" "iptables" "sbin/iptables") + ("ip6tables" "iptables" "sbin/ip6tables") ("iptables-legacy" "iptables" "sbin/iptables") ("ip" "iproute2" "sbin/ip")) @@ -494,10 +483,10 @@ (define-public docker "exec.Command") ;; Search for ZFS in PATH. (("\\ .pc) - go-1.14 gotestsum pkg-config)) + go gotestsum pkg-config)) (synopsis "Docker container component library, and daemon") (description "This package provides a framework to assemble specialized container systems. It includes components for orchestration, image @@ -615,7 +600,7 @@ (define-public docker-cli (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1asapjj8brvbkd5irgdq82fx1ihrc14qaq30jxvjwflfm5yb7lv0")))) + (base32 "1nv6mzq9i9psgfbzx7hfx1qb6fjp649qg8y392z8z2kqbjl20g3q")))) (build-system go-build-system) (arguments `(#:import-path "github.com/docker/cli" @@ -635,11 +620,11 @@ (define-public docker-cli ;; Make build reproducible. (setenv "BUILDTIME" "1970-01-01 00:00:01.000000000+00:00") (symlink "src/github.com/docker/cli/scripts" "./scripts") - (symlink "src/github.com/docker/cli/docker.Makefile" "./docker.Makefile") - #t)) + (symlink "src/github.com/docker/cli/docker.Makefile" "./docker.Makefile"))) (replace 'build (lambda _ - (invoke "./scripts/build/dynbinary"))) + (setenv "GO_LINKMODE" "dynamic") + (invoke "./scripts/build/binary"))) (replace 'check (lambda* (#:key make-flags tests? #:allow-other-keys) (setenv "PATH" (string-append (getcwd) "/build:" (getenv "PATH"))) @@ -648,8 +633,7 @@ (define-public docker-cli (with-directory-excursion "src/github.com/docker/cli" ;; TODO: Run test-e2e as well? (apply invoke "make" "-f" "docker.Makefile" "test-unit" - (or make-flags '()))) - #t))) + (or make-flags '())))))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -662,8 +646,7 @@ (define-public docker-cli (string-append etc "/fish/completions")) (install-file "zsh/_docker" (string-append etc "/zsh/site-functions"))) - (install-file "build/docker" out-bin) - #t)))))) + (install-file "build/docker" out-bin))))))) (native-inputs (list go libltdl pkg-config)) (synopsis "Command line interface to Docker") diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index b45f2f79f2..54116e4f4c 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1691,8 +1691,8 @@ (define-public go-netns (define-public go-sctp ;; docker-libnetwork-cmd-proxy requires this exact commit. ;; This commit is mentioned in docker-libnetwork-cmd-proxy's vendor.conf. - (let ((commit "6e2cb1366111dcf547c13531e3a263a067715847") - (revision "2")) + (let ((commit "f2269e66cdee387bd321445d5d300893449805be") + (revision "3")) (package (name "go-sctp") (version (git-version "0.0.0" revision commit)) @@ -1704,7 +1704,7 @@ (define-public go-sctp (file-name (git-file-name name version)) (sha256 (base32 - "1ba90fmpdwxa1ba4hrsjhi3gfy3pwmz7x8amw1p5dc9p5a7nnqrb")))) + "04463rnn9y9psp11ac5di6wrwxlhymw5h9hfhhhnxqwla90ikp0g")))) (build-system go-build-system) (arguments `(#:tests? #f ; Test suite is flakey. diff --git a/gnu/packages/patches/docker-fix-tests.patch b/gnu/packages/patches/docker-fix-tests.patch deleted file mode 100644 index 3e3e318e25..0000000000 --- a/gnu/packages/patches/docker-fix-tests.patch +++ /dev/null @@ -1,28 +0,0 @@ -Author: Danny Milosavljevic -The socket name ended up too long inside the container. -Use a shorter one. ---- a/pkg/authorization/authz_unix_test.go 2019-01-10 01:55:02.997985947 +0100 -+++ b/pkg/authorization/authz_unix_test.go 2019-01-10 02:03:21.177439757 +0100 -@@ -24,7 +24,7 @@ - ) - - const ( -- pluginAddress = "authz-test-plugin.sock" -+ pluginAddress = "/tmp/authz-test-plugin.sock" - ) - - func TestAuthZRequestPluginError(t *testing.T) { -@@ -263,12 +263,7 @@ - - // createTestPlugin creates a new sample authorization plugin - func createTestPlugin(t *testing.T) *authorizationPlugin { -- pwd, err := os.Getwd() -- if err != nil { -- t.Fatal(err) -- } -- -- client, err := plugins.NewClient("unix:///"+path.Join(pwd, pluginAddress), &tlsconfig.Options{InsecureSkipVerify: true}) -+ client, err := plugins.NewClient("unix:///"+path.Join("/", pluginAddress), &tlsconfig.Options{InsecureSkipVerify: true}) - if err != nil { - t.Fatalf("Failed to create client %v", err) - } From patchwork Fri Apr 1 00:46:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 38261 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 366BC27BBEA; Fri, 1 Apr 2022 01:50:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 04A3F27BBE9 for ; Fri, 1 Apr 2022 01:50:21 +0100 (BST) Received: from localhost ([::1]:58112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1na5Ua-000794-31 for patchwork@mira.cbaines.net; Thu, 31 Mar 2022 20:50:20 -0400 Received: from eggs.gnu.org ([209.51.188.92]:37414) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1na5TO-0006TW-P7 for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46417) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1na5TN-0004Pz-6M for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1na5TN-0003Oz-5X for guix-patches@gnu.org; Thu, 31 Mar 2022 20:49:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#52790] [PATCH v2 7/7] gnu: docker: Switch to gexp and new input style. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Apr 2022 00:49:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52790 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52790@debbugs.gnu.org Cc: Pierre Langlois Received: via spool by 52790-submit@debbugs.gnu.org id=B52790.164877410112975 (code B ref 52790); Fri, 01 Apr 2022 00:49:05 +0000 Received: (at 52790) by debbugs.gnu.org; 1 Apr 2022 00:48:21 +0000 Received: from localhost ([127.0.0.1]:40307 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5Se-0003N7-BM for submit@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:21 -0400 Received: from mout.gmx.net ([212.227.17.22]:37393) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1na5SR-0003Kq-Ac for 52790@debbugs.gnu.org; Thu, 31 Mar 2022 20:48:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1648774081; bh=8IXyVPXuFauSLWdwZi0pa0g26lOvFjg9C+706UMSuwA=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=C8qYWogy8fBMjppQMFkdHSyglNyP3KDKs3ddrm0PUXyx9E1TbfDC41GxIoeW6bHms Ay1caDctRQMmYnrhinmkRnDMRCuwmzUKjSsdtzzKSRi24BbkA+AhT+00zUBzgOGZFZ 8aoBrAvc2x/U5LRPlt4Y/faQP8TIFplckFpCFRr0= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MZktj-1nUIQY1Oo3-00Woz2; Fri, 01 Apr 2022 02:48:01 +0200 From: Pierre Langlois Date: Fri, 1 Apr 2022 01:46:42 +0100 Message-Id: <20220401004642.14949-8-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20220401004642.14949-1-pierre.langlois@gmx.com> References: <20220401004642.14949-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:7TtLWnNUxdJYKS/zTAUf0S4EE8UUTaYHjC/jUuNq6A2AriqpXPd QhVBse848B5hBqVjXsn7AAJt4c4Bl84uKOYA0C0k7rzi15uEXnN2gmfxQRKxazt8we4R5qV b+JILbjRtW6hsIww0K83Fxwf0tKiktF5Pjjk74c5oF7dulOUXuH0h2g3bZfdDniqq+SLJSE U7aRs8dmtuYv7wBPuzk6Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:Pl/jTqmjbvs=:eU+s/sFeGSGteWkuagfauI 6pbspCETQ8szDEDsGgx0ojo1VgbPYY8yzhp9VU5L+rmtI1G1ofYNvxTQ4NvMFN5nceCiz0Ypb 9OnEJjADDf/Q2zAw3Uf/EpeR/4ibv1xIfF19Z42CpcAiqIEFdIgOdF3MkdIsTfxDvwb8q8z6k wSk8RnlB6SBabYKt1iO1lDbR/1sSRFdZSqBvEADgdfhWr94nXKe/x/TkMd520iCvFLq20shrz brMyAAN5QEDcE/rcLcOj9lvixUvcIaaefvXj7WrA4kgJMwnyY0CYqBDoI8F5ltcXIl7ASu/qK MuIdWszRoxdJnZo+Uifwmu5yuR8BNXYLzCa1+il0baV45xtp26xlyVsxON/bLKyJs+0opyKjW U0w4N2bzjciFoGWYyHSfhyug5pxGQLO5EAwcIrmtxOTJ29VM6k0cFIUrsV6FkN5lV5i0frfK8 W07UAtZIMv7GbTCmT6wKRIGVDeNxtdmeEWT5x0m5tyEqeIKmxqP03afhbMDi6GodMiBMc5sus kDjUfONadp/davMUoIl7k28B+Hghg24EDI9bKyA97vv++hD982Ywc8Mkpg4M4Li+f4BZcpgGs y2QXChZOR+a2Qnq3P0fU9mloHJTq7IwSqTJGIwmPGmWTG7nMmGK8CO4FBaXIYU836rvBvgAt1 FLRL8ZTs3WsTr0fnIThJLXlh6srV4GWGd40NSAcTGsCiI6837QCW5pidJ3v5nzf7mCCe3J6Hg rR4jrxmzr/Wl6V0WHM/jZbcTHlvIEg5HTvalgvmG07DsabcMy45TvTHqfnG7k0gJRR3CzErtB 8V9FPHzDGuy0VGb+ls/+Rl9wJlO7G+Jeo2abgnatns69/qlyb37AiwP7/1znSzPXGykY8hqbA +foer4IRFOLHkp4WW2S3yxfXdz2SRn59+WuhKx2IM8p2UZ13LOR4K9BHOdWUuwkeVL07rDoby 8CAnteCowD34r9YJiC+6v3JxBq0bmblsKQ0WTpckC2MkHvuPQSVJJ9MKGOIz4k5ZlUeJWN14c 2U+rh0Edcaf7tmb4a6d836odAXRxE3KNWwJBG3P6vyxhXbOO8hlEt68rrbVWD9Evd37ww7UEp lkai0GvubveVRk= 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/docker.scm (docker)[arguments]: Rewrite as gexps. Switch to using search-input-file. [inputs]: Use new style inputs. --- gnu/packages/docker.scm | 483 ++++++++++++++++++++-------------------- 1 file changed, 241 insertions(+), 242 deletions(-) -- 2.34.0 diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 020c89bb11..b4095eb00f 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -326,257 +326,256 @@ (define-public docker (base32 "18nid42p1n20mg7spz0knh4izkk8qgjz9xi6v54czvy7aaj336i3")))) (build-system gnu-build-system) (arguments - `(#:modules - ((guix build gnu-build-system) + (list + #:modules + '((guix build gnu-build-system) ((guix build go-build-system) #:prefix go:) (guix build union) (guix build utils)) - #:imported-modules - (,@%gnu-build-system-modules + #:imported-modules + `(,@%gnu-build-system-modules (guix build union) (guix build go-build-system)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "builder/builder-next/executor_unix.go" - (("CommandCandidates:.*runc.*") - (string-append "CommandCandidates: []string{\"" - (assoc-ref inputs "runc") - "/sbin/runc\"},\n"))) - (substitute* "vendor/github.com/containerd/go-runc/runc.go" - (("DefaultCommand = .*") - (string-append "DefaultCommand = \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n"))) - (substitute* "vendor/github.com/containerd/containerd/runtime/v1/linux/runtime.go" - (("defaultRuntime[ \t]*=.*") - (string-append "defaultRuntime = \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n")) - (("defaultShim[ \t]*=.*") - (string-append "defaultShim = \"" - (assoc-ref inputs "containerd") - "/bin/containerd-shim\"\n"))) - (substitute* "daemon/daemon_unix.go" - (("DefaultShimBinary = .*") - (string-append "DefaultShimBinary = \"" - (assoc-ref inputs "containerd") - "/bin/containerd-shim\"\n")) - (("DefaultRuntimeBinary = .*") - (string-append "DefaultRuntimeBinary = \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n"))) - (substitute* "daemon/runtime_unix.go" - (("defaultRuntimeName = .*") - (string-append "defaultRuntimeName = \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n"))) - (substitute* "daemon/config/config.go" - (("StockRuntimeName = .*") - (string-append "StockRuntimeName = \"" - (assoc-ref inputs "runc") - "/sbin/runc\"\n")) - (("DefaultInitBinary = .*") - (string-append "DefaultInitBinary = \"" - (assoc-ref inputs "tini") - "/bin/tini-static\"\n"))) - (substitute* "daemon/config/config_common_unix_test.go" - (("expectedInitPath: \"docker-init\"") - (string-append "expectedInitPath: \"" - (assoc-ref inputs "tini") - "/bin/tini-static\""))) - (substitute* "vendor/github.com/moby/buildkit/executor/runcexecutor/executor.go" - (("var defaultCommandCandidates = .*") - (string-append "var defaultCommandCandidates = []string{\"" - (assoc-ref inputs "runc") "/sbin/runc\"}"))) - (substitute* "vendor/github.com/docker/libnetwork/portmapper/proxy.go" - (("var userlandProxyCommandName = .*") - (string-append "var userlandProxyCommandName = \"" - (assoc-ref inputs "docker-proxy") - "/bin/proxy\"\n"))) - (substitute* "pkg/archive/archive.go" - (("string\\{\"xz") - (string-append "string{\"" (assoc-ref inputs "xz") "/bin/xz"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "builder/builder-next/executor_unix.go" + (("CommandCandidates:.*runc.*") + (string-append "CommandCandidates: []string{\"" + (search-input-file inputs "/sbin/runc") + "\"},\n"))) + (substitute* "vendor/github.com/containerd/go-runc/runc.go" + (("DefaultCommand = .*") + (string-append "DefaultCommand = \"" + (search-input-file inputs "/sbin/runc") + "\"\n"))) + (substitute* "vendor/github.com/containerd/containerd/runtime/v1/linux/runtime.go" + (("defaultRuntime[ \t]*=.*") + (string-append "defaultRuntime = \"" + (search-input-file inputs "/sbin/runc") + "\"\n")) + (("defaultShim[ \t]*=.*") + (string-append "defaultShim = \"" + (search-input-file inputs "/bin/containerd-shim") + "\"\n"))) + (substitute* "daemon/daemon_unix.go" + (("DefaultShimBinary = .*") + (string-append "DefaultShimBinary = \"" + (search-input-file inputs "/bin/containerd-shim") + "\"\n")) + (("DefaultRuntimeBinary = .*") + (string-append "DefaultRuntimeBinary = \"" + (search-input-file inputs "/sbin/runc") + "\"\n"))) + (substitute* "daemon/runtime_unix.go" + (("defaultRuntimeName = .*") + (string-append "defaultRuntimeName = \"" + (search-input-file inputs "/sbin/runc") + "\"\n"))) + (substitute* "daemon/config/config.go" + (("StockRuntimeName = .*") + (string-append "StockRuntimeName = \"" + (search-input-file inputs "/sbin/runc") + "\"\n")) + (("DefaultInitBinary = .*") + (string-append "DefaultInitBinary = \"" + (search-input-file inputs "/bin/tini-static") + "\"\n"))) + (substitute* "daemon/config/config_common_unix_test.go" + (("expectedInitPath: \"docker-init\"") + (string-append "expectedInitPath: \"" + (search-input-file inputs "/bin/tini-static") + "\""))) + (substitute* "vendor/github.com/moby/buildkit/executor/runcexecutor/executor.go" + (("var defaultCommandCandidates = .*") + (string-append "var defaultCommandCandidates = []string{\"" + (search-input-file inputs "/sbin/runc") "\"}"))) + (substitute* "vendor/github.com/docker/libnetwork/portmapper/proxy.go" + (("var userlandProxyCommandName = .*") + (string-append "var userlandProxyCommandName = \"" + (search-input-file inputs "/bin/proxy") + "\"\n"))) + (substitute* "pkg/archive/archive.go" + (("string\\{\"xz") + (string-append "string{\"" (search-input-file inputs "/bin/xz")))) - (let ((source-files (filter (lambda (name) - (not (string-contains name "test"))) - (find-files "." "\\.go$")))) - (let-syntax ((substitute-LookPath* - (syntax-rules () - ((_ (source-text package relative-path) ...) - (substitute* source-files - (((string-append "\\ .pc) go gotestsum pkg-config))