From patchwork Mon Apr 15 20:19:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 3295 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 6813E16E6A; Mon, 15 Apr 2019 21:20:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_MED,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id EC1DD16E6A for ; Mon, 15 Apr 2019 21:20:11 +0100 (BST) Received: from localhost ([127.0.0.1]:55198 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hG85K-0006EG-SA for patchwork@mira.cbaines.net; Mon, 15 Apr 2019 16:20:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49729) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hG85G-0006Dz-G5 for guix-patches@gnu.org; Mon, 15 Apr 2019 16:20:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hG85D-0006Ru-9n for guix-patches@gnu.org; Mon, 15 Apr 2019 16:20:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50255) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hG85C-0006Rh-E6 for guix-patches@gnu.org; Mon, 15 Apr 2019 16:20:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hG85C-0003JW-3b for guix-patches@gnu.org; Mon, 15 Apr 2019 16:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35282] [PATCHv2] gnu: docker: Patch paths of xz and docker-proxy. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 Apr 2019 20:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35282 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Danny Milosavljevic Received: via spool by 35282-submit@debbugs.gnu.org id=B35282.155535956512682 (code B ref 35282); Mon, 15 Apr 2019 20:20:02 +0000 Received: (at 35282) by debbugs.gnu.org; 15 Apr 2019 20:19:25 +0000 Received: from localhost ([127.0.0.1]:35566 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hG84a-0003IT-Ls for submit@debbugs.gnu.org; Mon, 15 Apr 2019 16:19:25 -0400 Received: from mail-qt1-f173.google.com ([209.85.160.173]:43862) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hG84X-0003IA-4W for 35282@debbugs.gnu.org; Mon, 15 Apr 2019 16:19:22 -0400 Received: by mail-qt1-f173.google.com with SMTP id v32so20704483qtc.10 for <35282@debbugs.gnu.org>; Mon, 15 Apr 2019 13:19:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=V38oQRGAKS2fQ6P8e4wxXJf9nOhNPX0tJRFO9QbnpYk=; b=awjVJ1H6tQhH9IO/pglJS+qZrHr/H9fcIQ3O0oChP16Wp5HQuyja2+25SA7tlel788 aY/9IJc//cUcHCe3VMJL5jcdLoVLm7h+4HnY6EKqUQAkQgBjOLGlnfPcMgts8GJh4GlM 3QURwtC9f21KS61xsnA6Tw7Ph9WEBFu800gj5YXUFKLUaDgrvmSGeK1bF9eqONlPsYY/ TjbtSjENuTjW68tRUlAbfm8wDspft4G6TD2/4uVSob7Jj1+ETMg10Nnjx3X7EsqK7byA oU/TZO8cJvuI9Wuo2GxEtamdFhu9KvVv/U+xhmhCjAILbuEohd5u8/X0ImqbIWvGsSQc Baog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=V38oQRGAKS2fQ6P8e4wxXJf9nOhNPX0tJRFO9QbnpYk=; b=GAjaQnK2VGtN7T8VdFb9k7UqOzk++5M7QlpzMTohOXckcPqFmekIFFWaUVG9FS2alH bN8fiCz7XSpoxpzW4x4AgzuJZLvFUczR4ViUfamE38Z7UCCzZyBAd+Y6Pmv0nh1yRFua Ijpckx3N5pIICyP82e1S/UNMikGZZIYE7IBO9j8jKt0AQ1N6KlWWvN/L353tOIj7xQYq afkKhXkmcald1vV7eGsKoxx2HeaNXJhRLQD1JQSJ0Zht+YoUvxwLtwNhXZv95eHzAGkL Zg8/Sg8oToPd1Lc3QaquNdyaWdn4FyHWCvU90j8XrBdZD2jznCDeNC4f5TqFMnT8aakQ Zx9w== X-Gm-Message-State: APjAAAW92EnLPjaGzm5fcXJ6WQ7Ae79NSgvRMSiHBezUbzKJkCZtB0OQ C+NzFpNxcTulCiibJsEM+yNImXh9 X-Google-Smtp-Source: APXvYqwZ3Wd7g4rdmGtQHqRZ4bsHPF3Sdb2tNn1Qg2zcH5+e8frWVENXnbJhiuhlvS4A05hI7+2HwQ== X-Received: by 2002:a0c:f806:: with SMTP id r6mr60162888qvn.188.1555359555233; Mon, 15 Apr 2019 13:19:15 -0700 (PDT) Received: from kwak (dsl-158-139.b2b2c.ca. [66.158.158.139]) by smtp.gmail.com with ESMTPSA id n201sm28303176qka.10.2019.04.15.13.19.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 15 Apr 2019 13:19:14 -0700 (PDT) From: Maxim Cournoyer References: <87h8b0nn1z.fsf@gmail.com> <20190415075632.3a5802e8@scratchpost.org> Date: Mon, 15 Apr 2019 16:19:12 -0400 In-Reply-To: <20190415075632.3a5802e8@scratchpost.org> (Danny Milosavljevic's message of "Mon, 15 Apr 2019 07:56:32 +0200") Message-ID: <87bm17m37j.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 35282@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hello again, Actually, the proposed change was not sufficient, as it would transform reexec.Command -> exec.Command. The attached series fixes it (patch 0003, with the other rebased). Thanks! Maxim From 9809ec36652d4949af65eb75755e9dd6d8da5c40 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 13 Apr 2019 22:58:55 -0400 Subject: [PATCH 7/7] gnu: docker: Refer to xz by its absolute path. * gnu/packages/docker.scm (docker)[inputs]: Add xz. [phases]{patch-paths}: Patch the reference to xz. --- gnu/packages/docker.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 16bc812dd7..43071775e4 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -371,6 +371,9 @@ built-in registry server of Docker.") (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"))) (let ((source-files (filter (lambda (name) (not (string-contains name "test"))) (find-files "." "\\.go$")))) @@ -531,7 +534,8 @@ built-in registry server of Docker.") ("runc" ,runc) ("util-linux" ,util-linux) ("lvm2" ,lvm2) - ("xfsprogs" ,xfsprogs))) + ("xfsprogs" ,xfsprogs) + ("xz" ,xz))) (native-inputs `(("eudev" ,eudev) ; TODO: Should be propagated by lvm2 (.pc -> .pc) ("go" ,go) -- 2.20.1