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))