From patchwork Wed Mar 17 00:56:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Milosavljevic X-Patchwork-Id: 27898 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 1154E27BC56; Wed, 17 Mar 2021 14:04:48 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D774C27BC55 for ; Wed, 17 Mar 2021 14:04:47 +0000 (GMT) Received: from localhost ([::1]:54060 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMWn1-0004Bi-07 for patchwork@mira.cbaines.net; Wed, 17 Mar 2021 10:04:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54174) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMLQk-0006LZ-Pp for guix-patches@gnu.org; Tue, 16 Mar 2021 21:57:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58239) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lMLQk-0005NE-A8 for guix-patches@gnu.org; Tue, 16 Mar 2021 21:57:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lMLQk-00027y-9J for guix-patches@gnu.org; Tue, 16 Mar 2021 21:57:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47203] [PATCH] packages: Fix patch-and-repack for ZIP files. Resent-From: Danny Milosavljevic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 17 Mar 2021 01:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47203 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47203@debbugs.gnu.org Cc: Danny Milosavljevic X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16159461848129 (code B ref -1); Wed, 17 Mar 2021 01:57:02 +0000 Received: (at submit) by debbugs.gnu.org; 17 Mar 2021 01:56:24 +0000 Received: from localhost ([127.0.0.1]:41552 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lMLQ4-000270-Kd for submit@debbugs.gnu.org; Tue, 16 Mar 2021 21:56:24 -0400 Received: from lists.gnu.org ([209.51.188.17]:46778) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lMKUW-0000iG-6C for submit@debbugs.gnu.org; Tue, 16 Mar 2021 20:56:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMKUV-0008Q7-Tt for guix-patches@gnu.org; Tue, 16 Mar 2021 20:56:51 -0400 Received: from mail-lf1-x132.google.com ([2a00:1450:4864:20::132]:42166) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lMKUT-0003S2-Qe for guix-patches@gnu.org; Tue, 16 Mar 2021 20:56:51 -0400 Received: by mail-lf1-x132.google.com with SMTP id v2so380363lft.9 for ; Tue, 16 Mar 2021 17:56:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=datacom-wien.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=YZhHUkqzow78OdN5AWk6ENNffkszyjcjcYvGGaiVq0k=; b=LaAwPV9Vb0h0eBcnQK0WsGTZjBd7zrdO2K8IhBfxHyVw0H+wHr1dfYrZTGsD71mz20 f6ChtCedVAp3D2hrUwSZ0Ga+dKCb+luHq72lHnTbY/X0oaCA2AeVKlWgol8rfzJjOpMA QkUSsICFc5/JGBxRSGyqOIkDkFMjQxLD2VbBr6ckH27qrg0c7UtyXndLgorY9xT0Rssv UBS3e0n5GJchNbGy74xt+7iUFKuJraGvpM/rKzgDM12LbSUpD+vA6W8/Vkgck/AiV1lY wGv06/b1xrQN4SS27zWlJ6FwfEVOY03qSH5USlhouAsGgKRGoxShK1zbLoTGfJOCamvA 2ygA== 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:date:message-id:mime-version :content-transfer-encoding; bh=YZhHUkqzow78OdN5AWk6ENNffkszyjcjcYvGGaiVq0k=; b=ZcIPorXQEqcNcKZuefJXoXTiNkUfY9XtL0KaPSbFS6TDWjJ12ezwnoHF1Pn0ZwePSp 5nqxaEhc/upyILAUDGkcbX0wyEeAJVY1HS+jGsOjXpGiA9rVw00+lgN0SmT0aLX+2qVd vsK7Ee3p61BL9TYyvYj7KMmWfK1VTzuFEDbQc2TYQzFgiqfQef3Jv5HnwL1weg/cYDBd qe19k3xgtSYYUwQZdl0Rthn6CqhPScTp/x7lHTMJ1tXv1xgq0dYJrSG9bizy1OET6CxW +iEAStwS0ZPfMNcmZxPLcxq2thjSkom4UrZT9wV6av7EuqOiU8TjhbrujIQcf/sDT9aC 70Aw== X-Gm-Message-State: AOAM533hAGtku2oCRLUWesyYL5EESttAhwh7KBlFSqDCISUopbHs0+1w zihoQ8cQshwhrtGAt3ah349gOkquwQWGiw== X-Google-Smtp-Source: ABdhPJwGiDOZ2t90PpbgzxBDPELQcZeXhi7zG18Y6cv5IXF8XZgzhHPA01sM6+UoufSJBMIlWSxlHA== X-Received: by 2002:a05:6512:22ce:: with SMTP id g14mr790337lfu.101.1615942605968; Tue, 16 Mar 2021 17:56:45 -0700 (PDT) Received: from dayas.lan (2a02-8388-0281-94f0-b958-b6e3-fc53-344d.cable.dynamic.v6.surfer.at. [2a02:8388:281:94f0:b958:b6e3:fc53:344d]) by smtp.gmail.com with ESMTPSA id b20sm3187788lfa.183.2021.03.16.17.56.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Mar 2021 17:56:45 -0700 (PDT) From: Danny Milosavljevic Date: Wed, 17 Mar 2021 01:56:38 +0100 Message-Id: <20210317005638.3644-1-danny.milo@datacom.wien> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::132; envelope-from=danny.milo@datacom.wien; helo=mail-lf1-x132.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 16 Mar 2021 21:56:19 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Wed, 17 Mar 2021 10:04:18 -0400 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 * guix/packages.scm (patch-and-repack): Fix for ZIP files. --- guix/packages.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/packages.scm b/guix/packages.scm index dd1d473fca..2e4270645b 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -744,7 +744,7 @@ specifies modules in scope when evaluating SNIPPET." ((and=> (compressor #+source) (cut string= "unzip" <>)) ;; Note: Referring to the store unzip here (#+unzip) ;; would introduce a cycle. - ("unzip" (invoke "unzip" #+source))) + (invoke "unzip" #+source)) (else (copy-file #+source name) (when command