From patchwork Mon May 9 23:35:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 39187 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 8636027BBEA; Tue, 10 May 2022 00:36:29 +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 547B127BBE9 for ; Tue, 10 May 2022 00:36:29 +0100 (BST) Received: from localhost ([::1]:45730 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1noCvU-0000F5-E5 for patchwork@mira.cbaines.net; Mon, 09 May 2022 19:36:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1noCv4-0000E9-EP for guix-patches@gnu.org; Mon, 09 May 2022 19:36:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37620) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1noCv4-0001SR-4k for guix-patches@gnu.org; Mon, 09 May 2022 19:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1noCv4-0003yR-35 for guix-patches@gnu.org; Mon, 09 May 2022 19:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#52790] [PATCH v3 1/7] gnu: runc: Update to 1.1.1. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 May 2022 23:36: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.165213934015194 (code B ref 52790); Mon, 09 May 2022 23:36:02 +0000 Received: (at 52790) by debbugs.gnu.org; 9 May 2022 23:35:40 +0000 Received: from localhost ([127.0.0.1]:59739 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCuh-0003wu-Ts for submit@debbugs.gnu.org; Mon, 09 May 2022 19:35:40 -0400 Received: from mout.gmx.net ([212.227.17.21]:60325) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCua-0003vp-6R for 52790@debbugs.gnu.org; Mon, 09 May 2022 19:35:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652139326; bh=zPL23sGnW2LS9L2cBZP4kO2/1rRkjOOQYlzdaDynLkA=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Ur7a+3qTuDSC7TgAk+UN/GRKNZ7i2Hw3lYNE2r/e/g2hOHj7OdqI4nOMsTsFOZZKf ZBtSw7sG4NWz9RcX3lt35AEdikSvyVStW5C5hinzLVgvaQNnD9HImzbn7cB/wUcNPj UA+3lNtF83bU0Umx1kMqBqxfLIPAVh9f1UPJwBkQ= 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 1MLi8m-1nWg3i0Cw4-00HeLz; Tue, 10 May 2022 01:35:26 +0200 From: Pierre Langlois Date: Tue, 10 May 2022 00:35:13 +0100 Message-Id: <20220509233519.26703-1-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <87wneu1dyz.fsf@gmx.com> References: <87wneu1dyz.fsf@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:bEZ6KEFXxxfeeG4OsIuVTHDHLcxZGIbgoKaAgKXBYZ23w++R8zc PF1TjkArxTWHoE7y+kKmZCgX1jfhPLuAEQOG07cX+GpAIH4fa3tiIKc8hQXuGzn5ALO+TSV tNlojXgHBfcBgFsrFRXKqTXbwcxLCMzT8bJq1JugIDyLfiUHYyERzpeTWIPeuBCo46g1EG1 UvaDSA3q2VRm4u/tqwDQA== X-UI-Out-Filterresults: notjunk:1;V03:K0:l6RDJqfJGmQ=:8+BIgFE0T7OI+i9NBjtxu/ 8Z064fkSjjL29gK5uxLGDY49HeSBHEw81j4XxrGE1oFtXzXbOXYXIcdwDX0SzyTz7hC8gCa/l b7pZhNhXuh/AulovDdu0xJwyDIIgUVHNeTsI3woS10Cmn0quSQcoxqQVTBjUrUeY3lueSkQJW qLI+X4DoD/SmdOQSGwe7a4F3+ku3BmoPN7mXEZ7FKWtfJQ7XmzuR15mmWWN7vdxVmQFUiZock DGQxavBi3slRTcHNiFnTVkGUdRdjAHWdJXrYll5cT5vmMdrtrkkMBZnFHySwDNe9HgLTUptPY jIExytGsDKaQJmqLB/8IQwa8Okxla00fiOBeIQHnHKPN1QkrmYq06QlH/jG2TuVNi+23mxQ06 MLDbN1AZKcOo6yQRugY/hILin0TQbas7rMfqH7SFp68aFtLpJOQ8S7zYF2K5Rlu0+bc+VH2ug uid8+3Vy2Qk9xoDtBNXwJFTg/C6ceM2u2tZQETordjW0mbrjG4Pd3ES3in9/JFbVl8dpnV971 belQKJ7zNJrJw4KJS2qcrJ1QJlMc2Eqrkf5VeNB266kEMXvtk9Itj/HYTMnFRtWnvvKXUGtyD VQPCN1e5+mxVwlcPMb0CkbxboSDzPKRzNU3iShOzPkejo9Ve1IzZkDltZvVa9oG0YEKmBF7FK ccMCYIZEL3w6uipL5kjpZwPc+BR/XrZ8o3DjsRxgkc61Pn8u+wQNyTrGFG8SLSmOY1b0f7D7X QCvdkqSyW8J6bfYxm+c8c+jflw3alUVHFh04bf/uivtQkGcSdBNFmOXq1Gl/oJRiJscSTVBnd uuAjWw2YsFyLQo3Bdbn7cHGxBbfA06nnFV9RbLjQYkkN2uc3jPNoJJbpf/9naiC3M/ToH+eUr LaBPXgnpyOgGxOOObkg6oYAZfyeYoEzoRQT+r5V4EIsaw01DM3sY9czCEzsXzgtBTubyWygo2 4j2MpimEe7TuoNn8QMy88IF+tQZXsOyrONTfupv/2jJXhH+Scxt+X4FOmRspcJtauBnkkXrOx /AAbR8XL/zS6B23CFc2WFQHgxwGdAmpbrHJoedqnguMtqjt7xBfcgdz63XV93GN9W3I1UQZAr UuEzAN0TG80l9U= 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.1. [native-inputs]: Use new style. --- gnu/packages/virtualization.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 2.36.0 diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index f3396e7c94..55f1878a18 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 @@ -1762,7 +1762,7 @@ (define-public looking-glass-client (define-public runc (package (name "runc") - (version "1.0.0-rc93") + (version "1.1.1") (source (origin (method url-fetch) (uri (string-append @@ -1771,7 +1771,7 @@ (define-public runc (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "0b90r1bkvlqli53ca1yc1l488dba0isd3i6l7nlhszxi8p7hzvkh")))) + "0jx56x49dgkygdbrfb3pmxycy1n37arj97jra8n422dj36xz1hbm")))) (build-system go-build-system) (arguments '(#:import-path "github.com/opencontainers/runc" @@ -1796,8 +1796,7 @@ (define-public runc (invoke "make" "install" "install-bash" "install-man" (string-append "PREFIX=" out))))))))) (native-inputs - `(("go-md2man" ,go-github-com-go-md2man) - ("pkg-config" ,pkg-config))) + (list go-github-com-go-md2man pkg-config)) (inputs (list libseccomp)) (synopsis "Open container initiative runtime") From patchwork Mon May 9 23:35:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 39188 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 C796127BBE9; Tue, 10 May 2022 00:36:29 +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 8C4FB27BBE9 for ; Tue, 10 May 2022 00:36:29 +0100 (BST) Received: from localhost ([::1]:45726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1noCvU-0000EZ-Mu for patchwork@mira.cbaines.net; Mon, 09 May 2022 19:36:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47112) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1noCv4-0000E0-1o for guix-patches@gnu.org; Mon, 09 May 2022 19:36:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37619) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1noCv3-0001SK-PQ for guix-patches@gnu.org; Mon, 09 May 2022 19:36:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1noCv3-0003yJ-NM for guix-patches@gnu.org; Mon, 09 May 2022 19:36:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#52790] [PATCH v3 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: Mon, 09 May 2022 23:36:01 +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.165213934015187 (code B ref 52790); Mon, 09 May 2022 23:36:01 +0000 Received: (at 52790) by debbugs.gnu.org; 9 May 2022 23:35:40 +0000 Received: from localhost ([127.0.0.1]:59735 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCub-0003wM-Oj for submit@debbugs.gnu.org; Mon, 09 May 2022 19:35:39 -0400 Received: from mout.gmx.net ([212.227.17.22]:57581) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCua-0003vq-Em for 52790@debbugs.gnu.org; Mon, 09 May 2022 19:35:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652139326; bh=mpJqyN7EBdfr+4b+T7Y9x8pTyAHYJ1iFk1ALgFk6cRk=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Ia3pQwq6VgLYMqPS6ntuv4zqBI8fc7nVD2Mk9LuKCCiIV0LJ3LKpMwB0DrAGWujCK tfCZ+B71Uv7E32bJOmX6ICkPIe3KPUE6xYFiw8FrnD+MXhymOQr0wIFncZrclorloP eAbyK+GSzC42+mWyrNBIh3AIy54oulgHEQWfDbAY= 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 1N49lJ-1nwd0Z1UIL-0101iE; Tue, 10 May 2022 01:35:26 +0200 From: Pierre Langlois Date: Tue, 10 May 2022 00:35:14 +0100 Message-Id: <20220509233519.26703-2-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220509233519.26703-1-pierre.langlois@gmx.com> References: <87wneu1dyz.fsf@gmx.com> <20220509233519.26703-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:hpiarWYNPb3HvLR29ruwV/+IxENdcuwTOGc0GQfyVLFagpCdRlZ I+Oz/ifVa+Z8tbz1qjyLCI1piKlznLbRyKqeNHEgG9Ct2N2BId4HherII0WJSSvYI6DjOGi Il//onNt6Jty+HEMUzgBrrJLRh/+Oi6nEatDZTy9Xk83goqVlsV9OQd62Ey7nkn/djqr2mW YCM5f8RSR8WvA36ESdA/w== X-UI-Out-Filterresults: notjunk:1;V03:K0:+eSvTks0Nlk=:l12/zQzo6+Q176+wIIZziy OPStWSGNZlB3Yo9dMVnn5ixZ/nM94sc+lfJb1hRvleSVvoKq4F1a9C1f94KeR87s6ZciJir3t 75/gvd6bmwfwT+D9JBZmS1sHCmQPFOFhmPHjoqQ1D0QWlSpAgi/JcSCzsaT59312wlfuLSpae xaCBKeC5JHe3STkjfo5zk7XXinuSl02n+aQf4mSEHrd/frcteAekRKy+5nbRSNERzymyDgaO6 iGKSE8smUYa6JGTDnjRJNnP0z1mH+LYl0eZ3ZgUBsCm3wnjaVBX/JCAqfLT51VbwpsK9xsPKp d6sd6bwkuR0FaxTj6+81R6479LCx6hZkngsUDZKwsyTx6H7I7qqRavrLd/zcUHJUzlu05DMcm IEcMe+DnhnHccdOuwTRlgyIm9rbcCSVoGlvQjc1MO7IH38qPVCKXZOdIY8Bh6egtp9Y7fQbp5 HAuIlKseZR1DvViyZ/yWjdKmGM1tFZsO0bgJ79XhONr0h8huuaJkzgsNnT4nHpvgMFM7Gy7FU Bc/rYfNLAyUaG9elEOxP98DhOH7Tb/ykZgU8vMX8OuAOAY9QmCj64kUTKJnD84dbyv/FEZvzL nFV5Rs0Rrz2/r8t/rs3I1A+CZtG1tWaCF3vaukDPOWb9a+Rc5xsGe1q4hm4lfW5L0dXi2Yhsf mBLkQAlgKdv3F6R9cwBqA13C7f5UwKmF/41+TckpokHKZ5O7pLu+TutKMnW0GDcB7j+vW4uUV cAf7tiLvvoRlJ8exRO2ynLc5LRAV6/OmM5b3uIdtAkpYxxhGsNfqtGVIePE5KWaNx6FKc5D5T 7qAnk4xiP6lHSJF2YO/vgj3ZTnF6dFdJDgguQahupPflQiraEPjWKHNcwOnR3bUQAbD+qSQST w4BR6LFBJ+hI14VM3YBMj5i8ruNkJdoARx/3qszB8/9QsSfBz5IkD/iaOkT1Qhr8sMT22mWJ2 5CPMUsMU0aIM7VOA3u+OxT9+MhonzJgnsGROfRlRHc7GJl/phb+lJGMsDDrn+ivQv9AgIrGx9 ALfrEKOJo7WPdHJGXUlIUi6z50vloiopqT427+FuDwQ2IWUxH2EJpJ/vIG3qhIOMpTp1XgbqC ZkhzOfGG8oKn3A= 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.36.0 diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 07731886ae..5c0f4d496d 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 Mon May 9 23:35:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 39191 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 9E68F27BBEA; Tue, 10 May 2022 00:36:38 +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 6A04827BBE9 for ; Tue, 10 May 2022 00:36:38 +0100 (BST) Received: from localhost ([::1]:46504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1noCvd-0000tQ-KJ for patchwork@mira.cbaines.net; Mon, 09 May 2022 19:36:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47118) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1noCv4-0000EG-PO for guix-patches@gnu.org; Mon, 09 May 2022 19:36:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37621) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1noCv4-0001SY-Gt for guix-patches@gnu.org; Mon, 09 May 2022 19:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1noCv4-0003yY-Ey for guix-patches@gnu.org; Mon, 09 May 2022 19:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#52790] [PATCH v3 3/7] gnu: containerd: Update to 1.6.4. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 May 2022 23:36: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.165213934015202 (code B ref 52790); Mon, 09 May 2022 23:36:02 +0000 Received: (at 52790) by debbugs.gnu.org; 9 May 2022 23:35:40 +0000 Received: from localhost ([127.0.0.1]:59741 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCui-0003x1-Bw for submit@debbugs.gnu.org; Mon, 09 May 2022 19:35:40 -0400 Received: from mout.gmx.net ([212.227.17.20]:53943) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCua-0003vs-PR for 52790@debbugs.gnu.org; Mon, 09 May 2022 19:35:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652139326; bh=1rB/jtLzY4rN2tVRaszVD08rEMWgs27Lr9Zyxe1TIBw=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=JjQiQPTWRcH2K1nROzP4Jw+kClWWIArYr8sX8A9YPT/RymTiHkhaSU3B9vHPTfdHa /WkC+j55YRxm4ULuVwCV8iRWq6dCCPJSnc+AKpf0yanlsDoNbZkTVFJoEGe5quWORe EKmZJOmFbdAI0kZg7WrX5WJh9dmxtAtsX/iAmjws= 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 1N2mBQ-1nvoBu2m0y-0133yx; Tue, 10 May 2022 01:35:26 +0200 From: Pierre Langlois Date: Tue, 10 May 2022 00:35:15 +0100 Message-Id: <20220509233519.26703-3-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220509233519.26703-1-pierre.langlois@gmx.com> References: <87wneu1dyz.fsf@gmx.com> <20220509233519.26703-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:93Rm4xIRpVH+xPlSF8Dl3629sFmPD+MnqRKvR06O02xgOrkcux2 Iq+x7/jnegA3nBHGMV3gon45B9sT9YjGNVFaV2DWY2ePtlLJU98EjuaOj5kIns1Ywlb4ehQ O05CAZCYB3n9ZpWvGOvvCjBPHffKgGSxQXEMMmJo7733PU4fqkXGaHg/RhvJMze95bHcPQn wMC1D2JBTbg8y31FK5Wow== X-UI-Out-Filterresults: notjunk:1;V03:K0:5Sk3gXp4WwE=:aeQKSqkZit/+wBOOEPr4VO Caf2y7hjMX9Pf06uUVrVkGG7PIXJcYvwVYRiSycKWi/4gUXyDnymEAhS7KZnwV3O+/7xGnbBE xRxDfaZDJkzZBhYwO8xK83SWcYwcfAntAvXXWEAsedE5WjjlZnRjTe+paJoJ2OymkHXUyJrTn KcbQA+DO7dZl2CIAcO8jrqBsW4rvbOTRaZtEU9+HZGohE/jjDVyALmFV8gk3fipveGdNZS932 2GEA6EKy3msXSgNtWdBVhjF5xKpdH9bVIM7L7LfUl/J3Hy4J3cPviaExpPb7x9GoQ6H5miOuG hpOWzzVwzvYayv3wigIv7N+Sb+MPna3tUP2TKFVa5gaCny5wXVJRLz/zrqW/DohgcfhMybKDT Qsy8f2mIfAJTrS9fES6CWv2Kl9GsoT9GC5elaFYHURCOOzm9EBmxz5a9hKxz4qCVMrbHePvpM 7VdK2VIkxs62feNKi1iNDozv5sumYH9LvadHc1rKiBbrlyn8LQBNmbcC0PSCRTZ2KWl3G51eg x1qqo4/ZoYrsPVgzqGM4z/i2zdpZpvy2b9uQbzLTXSWkZl0tRsVOrbXZFIKCEOG0woC6ZEgqK Fo6REGzCZatnO3wnDZVKBtXmAZtcixWug80yjJ9vdV5zTFjWShlsv7eyq1vH0au55r5qGEXWr YbKBQ8vWMbKP2e/cJJn4oWYJuWOuYY/QrTimgs4drG4iR6cJ8FcEJjaxC11huZimai9F2dTxY B2P4XmLrfyHh4LsIvLAMtR+bqEoE8+rJHsBKOXr+f4XuhN8AA4k81BXuxydtdYl/4BkN2kpcu YXBgJKtZVwqigMG1wq0fEsHKSBaGvuY1jYhJBHuFcgITpx8NwLh9hr+a/8zrS7+v01GQ88ek1 n6rroNdaPqtZmt0VWGvzK9F5olB8GKa23ueA4hjoBVyMw90nwut5CV+8QCxpKCR1EvrZm0xFK Sr+oFKUVXqWD4+887doWca6RL9sMDT2KGA6oDVNnOsoUt6rwLsiBDDMBC2IYUdaLmLXbhvJve 5MTNuUwqisweLx49rlPQ/A1IyFjOMSbhHyhJhr/X1vIHHnqwB8n6m/x1n5icMLsZhIAVKsoKa bMzicDUZSAwuMw= 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.4. [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.36.0 diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 5c0f4d496d..e95614cfae 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.4") (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 "1hy5jaf5x8lffh3p4hdkk6ar8i4w84i0b539k1h5baqx9gnq2l2s")))) (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 Mon May 9 23:35:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 39189 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 9BF7627BBEA; Tue, 10 May 2022 00:36:31 +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 1C34427BBE9 for ; Tue, 10 May 2022 00:36:31 +0100 (BST) Received: from localhost ([::1]:45760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1noCvW-0000Ik-7c for patchwork@mira.cbaines.net; Mon, 09 May 2022 19:36:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47120) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1noCv5-0000EP-5G for guix-patches@gnu.org; Mon, 09 May 2022 19:36:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37622) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1noCv4-0001Se-Sh for guix-patches@gnu.org; Mon, 09 May 2022 19:36:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1noCv4-0003yf-Qx for guix-patches@gnu.org; Mon, 09 May 2022 19:36:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#52790] [PATCH v3 4/7] gnu: containerd: Switch to gexp arguments. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 May 2022 23:36: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.165213934115210 (code B ref 52790); Mon, 09 May 2022 23:36:02 +0000 Received: (at 52790) by debbugs.gnu.org; 9 May 2022 23:35:41 +0000 Received: from localhost ([127.0.0.1]:59743 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCui-0003x9-Np for submit@debbugs.gnu.org; Mon, 09 May 2022 19:35:41 -0400 Received: from mout.gmx.net ([212.227.17.20]:48059) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCua-0003vt-RI for 52790@debbugs.gnu.org; Mon, 09 May 2022 19:35:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652139327; bh=Dhy2AQoYBE800tmU6GY9PyKj+4POxKBXCi2L+TwZAG4=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=N3VqVKuhG9PXsprC3mMZcfwCe9A0Vv1K7ywaLpAkgACNi4Fr848YNAoJf6O0KvZBk 1DVbQJUYVy4TkICSY4H3cZlTI8v2yfSHTgjiL2vIlpY2RRxoEfGOKyDgoam4xsppNm +4pQhDI99A+7M8lWK+uirnz47ZQN5boZMYgeCmZY= 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 1N7zFj-1nsnW947Od-014xfE; Tue, 10 May 2022 01:35:27 +0200 From: Pierre Langlois Date: Tue, 10 May 2022 00:35:16 +0100 Message-Id: <20220509233519.26703-4-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220509233519.26703-1-pierre.langlois@gmx.com> References: <87wneu1dyz.fsf@gmx.com> <20220509233519.26703-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:6bNye7AoCoeH+ukW2WeIfM48WSJR0q+jHm1y0YX3lqSq9wqom64 g+HWbytjXh1ANgfmGI2Hs93wqxW+lCrFySvfvN8GJP2oHbZ4ElF7Y0N/bRGnzNB39UkH+Ga yaapXS/wegWxRwzb8wlOppaLPzZYl+zdQjH2Nzi2q2f28OaeuqWK1dFD9u3n+x+lhdMr5yX juvJ63wDR30UqzLD67oGg== X-UI-Out-Filterresults: notjunk:1;V03:K0:6bHX3lZjk1Y=:95rEHjzE5IoAur8vQwICVm SBm+sLZwkhp06jA5TZ8YbXQ/vS6Hz8YbTBIYARx4kUI5z5MMgybtut2WnsOlwQBJbnLuI5qJI dEKJ+E3lP6K3rvCun+/qxRvQBQBgci0j6A3Qpr27pEfyU8AyjeIZEVqyi5Nz1u6dd3NrzvP8M kk7+dbrS4SLNAbwrkWwCO77LPWUyABDnBKLCksvMkrTeySyWkY+CFOuptJOZY+Zer16CgFQ44 GFuJy+nR7oWPQvoxp9xidICJo25GaUPJLfvIp9XIanSi3DdfkoOLgrSu2yhvN1T9bDOrj4LU7 JRVeYifNiMZNzfd9SFQKGXEk0W5lLZcSdD8fZ89XDK8gpyDn/qxOjZfx2SyQYkmp2DLjOoftH SNoWZtNv/uSyxyMBSzEtmJK5Onh2/5GpoTs3905a8lFvgAydHZ1qCjS2r8IZRRI+GD5QTeL7s taOpf8B8xkWLOaOhsOhW4yWi98Q9wdmDcF7KDfJqBDttj/z/EGaDxfkOCcISL9+Bvetx/J6T7 RMKcgvVVhCmnz0NDib3nsewGREe05qqR+nJsD8bypFbWJsZT2lHK2Ie6f+DuGFJR9uTHGlhC+ GIPa5f9LqHlhv5WGGzMqoanb/0fcsQrgpZiOCURWc/SIWl5ZTFxgViX55Zw7PEKQmXEIyokUW mgBUUVb6umNcIbNbvCTm2Rwk2BxIJWWy11763dcpmzqis9KLp/DB6FN6QR+gtytdc8/0WAkWG VW3EFb9YSKD/y6gwArzmcIN77dmo5757As8jLSWzD/gfGPh1dZHAU2/oaphnqWK2YeAOY6/mq hf20tAC+/P16HSpPzUXLuC2prH2TDgWqvQvDN1Hb7C+h8l/lv89tpkFI014H5foooLZkU1Fjn 3eYPeossYeeVCkIPKRoh+9P6gcXWSJURF2DspQPEVOkp5k9uq0HTssVXsDttvFxSi4cKr54KF 3SxMemqsIEYGeK6/sRCiCaiR4ZP8VXMD+SakkfQ9gilqYQvB31KKSFUUwripKMwJKK3S5jEKO ogz0oBBlKitW4rDmhLhIPXREE2kodz+J+AmdnfH3gZs7Bzb8cREnPhq6q6OyVwTN9GN1kD7EL JkQ7g+FgZuLW3I= 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.36.0 diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index e95614cfae..aa5f4d523b 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 "1hy5jaf5x8lffh3p4hdkk6ar8i4w84i0b539k1h5baqx9gnq2l2s")))) (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 Mon May 9 23:35:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 39192 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 BE2A727BBEA; Tue, 10 May 2022 00:36:44 +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 99B0027BBE9 for ; Tue, 10 May 2022 00:36:44 +0100 (BST) Received: from localhost ([::1]:46870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1noCvj-00018A-R0 for patchwork@mira.cbaines.net; Mon, 09 May 2022 19:36:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47126) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1noCv5-0000Ee-K1 for guix-patches@gnu.org; Mon, 09 May 2022 19:36:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37623) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1noCv5-0001Sk-8q for guix-patches@gnu.org; Mon, 09 May 2022 19:36:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1noCv5-0003yn-6g for guix-patches@gnu.org; Mon, 09 May 2022 19:36:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#52790] [PATCH v3 5/7] gnu: docker: Fix mkfs.xfs reference. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 May 2022 23:36: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.165213934115217 (code B ref 52790); Mon, 09 May 2022 23:36:03 +0000 Received: (at 52790) by debbugs.gnu.org; 9 May 2022 23:35:41 +0000 Received: from localhost ([127.0.0.1]:59745 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCuj-0003xH-78 for submit@debbugs.gnu.org; Mon, 09 May 2022 19:35:41 -0400 Received: from mout.gmx.net ([212.227.17.20]:51347) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCuc-0003vu-5Q for 52790@debbugs.gnu.org; Mon, 09 May 2022 19:35:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652139327; bh=ggciaduO5S+HruLgM1xRqMx6FKob/DJ1aj0MleEliP0=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=Nf/a7x9JOV9mUW0N/TXjaeBMxulY5ZG9ASYnSBRpt+M7YXkZ+mfOaMpWGjSdbp+Cb w3N2jTbC6AnyLF2ocwLxDTxqKYzZetlC/HSYEOyC/sU05ehYbuqkr0hZuJzE5gFvBV 0RyN2gRSZVQoYxDFEhdebFEsGRf6y6j6xE6ZgXJg= 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 1MVeI8-1nOwHb1FDA-00RWF5; Tue, 10 May 2022 01:35:27 +0200 From: Pierre Langlois Date: Tue, 10 May 2022 00:35:17 +0100 Message-Id: <20220509233519.26703-5-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220509233519.26703-1-pierre.langlois@gmx.com> References: <87wneu1dyz.fsf@gmx.com> <20220509233519.26703-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:YYNJqmNsi/kPoQYwCDltcnkGeJ2eTaPx1uZ+Nkl78hcGOR4ch54 eGEj02o8SdYkRglclTJnirRV8PFGk1RFBVjp79DuCfRNLX8HZLb3f5SwDBRzt+gIJtdpSWf F1fUMIvLP1lFydbHCEC/H9xuskC+4/YOAzLDAuiEyIvgaE6vnATb3K9LZyLwDgPnq1haC3Q my58d4cjg2wYL3P24VKhg== X-UI-Out-Filterresults: notjunk:1;V03:K0:bJ/dPgXkH2A=:9PXPwkr99H93dTC4L+kEtw R8SnEp/hKuFdrJO/RXl+nZlpWAE62l1RXZ5EieeG45ckl7qbXe2QfuqxUwz7Rw3STKD409EcR 2hRaW3EMr1ArVeb5etxfCZo+qJllHtBIOqVPjmRGSHXYDc9iIBZNCLCG26039Uq5gq3jqDTY3 uneRNjINToLcm9Oy5QLmaVqVLDvXo55SsCAo6G9QQm9/9OuA6Qo4a9bYDs8YcYdIcs0B8lWzj snbItQCdRX5LXesTBOZ3h8xO20xfyuRoNYKkIur/q2zeMpPI6keikSgGmXMsg1T9jvp+Rhl7E I8vTuFXpydCEjwdK01Xm7+Jvbz3fPHMYXCB4bLR4qQOeL0pyT9i2LYu0e7HcGgdndiiiK7KB1 M50XCbfpvVGgxHCyD3WfCKPcR0ROST1VT6SUsobwTpBnz8rpbjT5ZkfuJcL/hTPtTA/5GCOPW m5VJuscdqQo6YIOmdvgwRvX6g/tcdurf9YcJzORRXwDIxP5j8flRTi4FuSS/0cTaFPc7Nlvu3 qumy0OUmseYErnFaDT0Ve19OZg36Z/ss7RNjuHE0zmz8+lxU4g1C9o3nZFMyDEqc6pyS15XY7 zMmOKDgmkelY7OS5NF6iB6koR3sJo9SjJSh+fI/7EayCbII0ZKuST0e4F4hu8WxHHn7qqclJs rvbCCLvmy8j24A1SyzR0pg32MSXJVBysodUDRho3DTsya44FeFBuD1pwuxHo8s9EVn/sE3FU/ agX1BRoKhjwJMm0qZEXYDPr+/ZQVc3bXWIEqfQvaCSLuKuO+NPkFKety1oxmtajS2P35KY+bk Y02nS1wgPod+qhPVFGbOo1QtUR8vVyI4yywp6kcsqyBSz/AxQ3to5JjB39VjpMvxsPikWWQBG hVEznho/vn8ecfjCxo43OW7mmfobZ+QL6kVx9rPaLq/4ln5YyTf/dU89E2E3/zkMEp4lDfiZO /vvuzk0MkQtJXIhUvHJZRFbePol2Ra4ktq6n7SH+f/B+/7bZka+JWh+eIX5YAtRzTr1d33Fax IMiA6Fq9uramGTL9F7gGY0GFT2l8y8naV7pnltdXHsnMOYGno2JJ7rLQ7tOGCEjImL+AZsWSy b9wF9DOvDFppCg= 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.36.0 diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index aa5f4d523b..ff9bbecab6 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 Mon May 9 23:35:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 39190 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 A8CF727BBEA; Tue, 10 May 2022 00:36:33 +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 7032527BBE9 for ; Tue, 10 May 2022 00:36:32 +0100 (BST) Received: from localhost ([::1]:45854 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1noCvX-0000Qv-JQ for patchwork@mira.cbaines.net; Mon, 09 May 2022 19:36:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47138) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1noCv6-0000GP-Sz for guix-patches@gnu.org; Mon, 09 May 2022 19:36:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37624) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1noCv6-0001Sq-Kw for guix-patches@gnu.org; Mon, 09 May 2022 19:36:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1noCv5-0003yu-Io for guix-patches@gnu.org; Mon, 09 May 2022 19:36:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#52790] [PATCH v3 6/7] gnu: docker: Update to 20.10.15. Resent-From: Pierre Langlois Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 May 2022 23:36: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.165213934215225 (code B ref 52790); Mon, 09 May 2022 23:36:03 +0000 Received: (at 52790) by debbugs.gnu.org; 9 May 2022 23:35:42 +0000 Received: from localhost ([127.0.0.1]:59747 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCuj-0003xO-Gi for submit@debbugs.gnu.org; Mon, 09 May 2022 19:35:42 -0400 Received: from mout.gmx.net ([212.227.17.22]:40255) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCub-0003vv-HL for 52790@debbugs.gnu.org; Mon, 09 May 2022 19:35:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652139327; bh=tJ+ZsZyfLUBfbEnLDMBwVBP69pnw02b1NUoS/iMP01A=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=azayeJxWwC7YmbDHfHXGaPWOUk63XSwohP2A4Q49NH7GWfuLtRE+KPtV/47yoWL4e LpxFtqcSyo5NT9MgOIzKNcfG0twvskmMuhtL0iNd0RgU3Y57Zxn2kRH8uf9M/aKWbH Nwoxe8xTGF19nE0bWvkBVp8bzA7HBnnFiKrz6dEs= 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 1Mof9F-1o7aHG2jTF-00p5TG; Tue, 10 May 2022 01:35:27 +0200 From: Pierre Langlois Date: Tue, 10 May 2022 00:35:18 +0100 Message-Id: <20220509233519.26703-6-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220509233519.26703-1-pierre.langlois@gmx.com> References: <87wneu1dyz.fsf@gmx.com> <20220509233519.26703-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:l06rLhJ4rkxCZGDs3bPq5iOoLna87TkRff+g580cu5lGSnjLP/g qYD4/4SPI/vTE6xX5vrHlucdN1WO9CzhMLDlCdIO+XquXZC/9aQdbXPysMGJ4qgd/7qYjS5 6sYmxFFoIAiizgmPjyOQqqjvVcQ/+qOZX2GSjwkmGPooji0wfh+mwEtnItcjBkv7BWax1s1 ++VwxYrB7LoZybTlZ3v9w== X-UI-Out-Filterresults: notjunk:1;V03:K0:+1dccVZKWvk=:MHaJIzifH6oaGmSzvUHTYI IgwvPR8i5KtcnU33wuyOomr6mvknExz/fn0Z2b9GZSXeEkXR1V2aygiMWroOk2npe7+K63qLW kIfJU6KjscQi3BjC9SFixS9wW5Ias7IfhV8k8jNK5l0SuJ7YLPADmXLp4dW9YnR6XICp449EV EwQmFiLlhVuqy9o62UzDgO5omNfIqBXiHRiohlW2Hw4ZkUDZvI5cDUpAYaImfob8BXBtw3+EN EsQGjn8iszMT8BgT/a3OJh5WWNgHwssK9CPATW4zsWenlXUrKqTW6xUVIgWvnzclhMAOMqd4g m3lYEXB8KymxqRgI208ATzQPAztTik5fDX49YFnID1S5fyus2nDIfW6jQehLYRWlTi7v7wx2f rqdT1n/CAEn3/JyxE3qtx8fcnaugPS9avfsmhUQ4uN51BGTwM7w+1QJghATuSUixUQ4F877A0 lubzW060HIIylBZPrK6/209Qk5OBTCj6hzqnPwth2Ne95rk4x05mCPwXLU14apMDyNWiTNuTp 84MxVUeiIhXjgifzsvh1q0eLWaf1fmiZPA4Iq9224HzV04bAPw+X/2XWY3aWTntmLGolb8GP1 X2WfQ5UXRBEwMQVkbz1Bijd8eZK0elsCmaTIP8s3mIBByBXB7a8I+DWDnL71FZohKBquNuHXC tvp3ACUmx4akkrm2ifkwBAEwZ2jdGuf4mEakpYQsKctIh+4FGCvrivO79DP+/gRJVLm16QUrp SeHt9QA8zBjFFqczjFYEGVahMT0/msx+NZNKG3g4+S6tzFprXJAWJXDolxSi+wjXIvA1qawjp wyaMjfPf6r9tB9mVLhqobYP7v4l6kOSjM4exwzKV+lM1AtzcOC8/pOmah71FJxzpYIFYhoSOd ryrzk/UDgpFUTGSmi0c+EEgM1mQ+qgjIBgFzhdPa/Z0033h8LGKhLroiTUU5Frth+D1l2ZYVM qKBmzLJkBNkNkwMXzrYyNHpeBmLr0Syjuqxn4sh++EMZfDpHBB7MtvQuAIWOVcGlhooesMSFR cK9nz8PDMFB8k2MWa+exFLZrWktbs1OwV8EN/meBjV4puzRjwGVoQyJa3edmEBVIw8bf/1PUW RvKCzPovph9bvM= 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.15. (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 | 72 +++++++++------------ gnu/packages/networking.scm | 6 +- gnu/packages/patches/docker-fix-tests.patch | 28 -------- 4 files changed, 32 insertions(+), 75 deletions(-) delete mode 100644 gnu/packages/patches/docker-fix-tests.patch -- 2.36.0 diff --git a/gnu/local.mk b/gnu/local.mk index 3b7db46b26..69d3f404b7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1008,7 +1008,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 ff9bbecab6..a3d3e5fb51 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.15") (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 "1z816496aqla4nq0aksf0kpy8qk8x1a6y5hrazzkqliycbjnqizq")))) (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,13 @@ (define-public docker "exec.Command") ;; Search for ZFS in PATH. (("\\ isn't found. + ;; FIXME: We might need to package buildkit and docker's + ;; buildx plugin, to support qemu-based docker containers. + (("\\ .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 +603,7 @@ (define-public docker-cli (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1asapjj8brvbkd5irgdq82fx1ihrc14qaq30jxvjwflfm5yb7lv0")))) + (base32 "1jnql7szdk2wd3f5g1bxcairsmzirzybn3hy7xzqx1i679f2fg5v")))) (build-system go-build-system) (arguments `(#:import-path "github.com/docker/cli" @@ -635,11 +623,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 +636,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 +649,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 9010e1f120..28ef92679d 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 Mon May 9 23:35:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Langlois X-Patchwork-Id: 39193 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 91E1627BBEA; Tue, 10 May 2022 00:36:52 +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 6137827BBE9 for ; Tue, 10 May 2022 00:36:51 +0100 (BST) Received: from localhost ([::1]:47098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1noCvq-0001HN-JK for patchwork@mira.cbaines.net; Mon, 09 May 2022 19:36:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47136) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1noCv6-0000Fs-Bo for guix-patches@gnu.org; Mon, 09 May 2022 19:36:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37625) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1noCv6-0001Ss-0T for guix-patches@gnu.org; Mon, 09 May 2022 19:36:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1noCv5-0003z1-Uq for guix-patches@gnu.org; Mon, 09 May 2022 19:36:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#52790] [PATCH v3 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: Mon, 09 May 2022 23:36: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.165213934415232 (code B ref 52790); Mon, 09 May 2022 23:36:03 +0000 Received: (at 52790) by debbugs.gnu.org; 9 May 2022 23:35:44 +0000 Received: from localhost ([127.0.0.1]:59749 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCuk-0003xW-FR for submit@debbugs.gnu.org; Mon, 09 May 2022 19:35:43 -0400 Received: from mout.gmx.net ([212.227.17.20]:35955) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1noCub-0003vy-Tb for 52790@debbugs.gnu.org; Mon, 09 May 2022 19:35:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1652139328; bh=T7UvKtpyEWBjUIFQvSshKc6kmRtmWLSIjnKG2efdJFs=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=CEdVoWXYL0Uz9hhFp9rtt51JyRjMBp/VYv1Kofgrb5mIOVlo1DkXW42n7n8z2R7XO 1PL8SQ73F6r/YOwpwEVz5XpXY4hwyJyFfNVt6w3X9jczzEbGcgBBUXJrNkJBehDglo fkyvxdK19CT81Uv/3ZD+ed751T5HGW2JNMhWfW2s= 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-1o46CL41n8-00tkK9; Tue, 10 May 2022 01:35:28 +0200 From: Pierre Langlois Date: Tue, 10 May 2022 00:35:19 +0100 Message-Id: <20220509233519.26703-7-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220509233519.26703-1-pierre.langlois@gmx.com> References: <87wneu1dyz.fsf@gmx.com> <20220509233519.26703-1-pierre.langlois@gmx.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:WK6eTdUXRrjGeNloaIOGSOaFWhYOh6Yd3YvoojPKl99QSgpkGZx scniUEoequtpQv1D2ClZXT/JR/QJ+eZwlsLr5kMqVTrqF+FClF7Na/o5gHLfwbk68XhnGLt Oc0XOLU7j8/X03e4ysftzyDsleRhw9aH+MmgaFS15rmYja33nCQHjbclJS6cG8ueYdPlHcd Ag3+22d8Pem7mqtorYCMg== X-UI-Out-Filterresults: notjunk:1;V03:K0:2VhmABSr5dM=:QmSB25rArL3Pbl8032uhTp nQo/O75qeNf2VK9BSIj35/PQjToinj8Cp9WsWACu/P+tulTfwj9bFPz4nh0PurFu/WyNf2Ztv eshrERJIYKTMNxsig0lL/oKLP9ExcmcHBfS1aRC1txtm9mAT6h7uz0KfI8AI2/ItFmWctouvv GoI/V0kXL2f7vdjs/GwnFcQOwddIg177hybyap8MjXOwsoLxDe4zO/rT7N7S5Y4Wt3jBxiCul 9NJai04H3aWySqroeOHcJDG3gIV+8bQu4ZQAT1ZCYlbEUInw9qla/+PSekwmGdJf6IfCniKbv w7TgX+BqpXARUJWUtV6tC07k7xCe0yQzn+EuHKdQfo30pmTf2dviulBlx7ao9AkUygToouxPw 7Ww8R+EV7Hi7jE9PtqRD2dxH3U8cZfDyfxyk8oHo1LGP5g2Y75jK+KgAKll9Yav0eKimQ2G5h VAaK1AfWhj+F5WuFAJmgcqWBsbH3L3Urr6jlfjFe4VMpdBhJz5vtvtxDyViz0by6Q3ESiwson Hd+JPDk82ZlyP93hEcY2fASMfZLmlhTl/OLT/UfXxZSO91GWfuRF+2lqXGGFwxNvYMvu+IsBn 1Tvigluk3C6nf+yGQ/G6fSJF/vIkx67QjkLL4eJRtFqQPG962UvBz+Oy9xqKUyuOLWJzkoXPC Ty7hQXPeSMsiGZ5dUNbzRO/ELF5jwAKOHUM7ktWWr5PPD7Upw1QUr7qAbhwMKB6dS0V6q6++8 oFBGiHeArKbSIai5h/i0KJ0kxgmOevjLpUe7QTPtqNzE/Hqv98tTeak32lOHzYcfV7e5NWjkt XrFSxmiheYkIMMeij292djOLab5u6K4FYkjuxWZmz6MZpwBUoXRwbQfhb5MlIOJs2doqDuuXv cCm8pGGVUj59VxCQmV75SVYoO5cndbVQLif/3/4E5OXsx+5a6uRWKXEol3KsF01M7tSzYNlFT wNqVOIVyHtcylfHWvHF+JzB5RgjbWC+2JC8lBMcPcmGsjDyY0Att9dpkD1XbSnGIIG7pnUXr3 UYKCqJbFZHiHmRWaj+0UG+l054SZ6Q+D19wW7ILfUKhwq1JoSR36RFAiNAxYWhcBMj7nFqVf8 haZhecJzay9J2c= 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.36.0 diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index a3d3e5fb51..2df4cdb98a 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -326,260 +326,259 @@ (define-public docker (base32 "1z816496aqla4nq0aksf0kpy8qk8x1a6y5hrazzkqliycbjnqizq")))) (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 "\\ isn't found. ;; FIXME: We might need to package buildkit and docker's ;; buildx plugin, to support qemu-based docker containers. - (("\\ .pc) go gotestsum pkg-config))