From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 6ICsDbpd+19ucQAA0tVLHw (envelope-from ) for ; Sun, 10 Jan 2021 20:04:10 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id OCViCbpd+1+5QwAAbx9fmQ (envelope-from ) for ; Sun, 10 Jan 2021 20:04:10 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B4502940463 for ; Sun, 10 Jan 2021 20:04:09 +0000 (UTC) Received: from localhost ([::1]:44084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kygwa-000775-JB for larch@yhetil.org; Sun, 10 Jan 2021 15:04:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39106) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kygwU-00076v-Om for guix-patches@gnu.org; Sun, 10 Jan 2021 15:04:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43457) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kygwU-0003jb-Hu for guix-patches@gnu.org; Sun, 10 Jan 2021 15:04:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kygwU-0005H1-DQ for guix-patches@gnu.org; Sun, 10 Jan 2021 15:04:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45773] [PATCH core-updates 0/1] Allow patch-and-repack to work with plain files. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Jan 2021 20:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 45773 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45773@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161030898320198 (code B ref -1); Sun, 10 Jan 2021 20:04:02 +0000 Received: (at submit) by debbugs.gnu.org; 10 Jan 2021 20:03:03 +0000 Received: from localhost ([127.0.0.1]:55003 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kygvW-0005Fi-Qi for submit@debbugs.gnu.org; Sun, 10 Jan 2021 15:03:03 -0500 Received: from lists.gnu.org ([209.51.188.17]:38222) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kygvW-0005FQ-08 for submit@debbugs.gnu.org; Sun, 10 Jan 2021 15:03:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38960) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kygvV-00073n-Pv for guix-patches@gnu.org; Sun, 10 Jan 2021 15:03:01 -0500 Received: from mail-io1-xd2c.google.com ([2607:f8b0:4864:20::d2c]:40266) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kygvU-0003QV-38 for guix-patches@gnu.org; Sun, 10 Jan 2021 15:03:01 -0500 Received: by mail-io1-xd2c.google.com with SMTP id r9so15595096ioo.7 for ; Sun, 10 Jan 2021 12:02:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0w5hhl22QWx5oERXuGDjTyVxzo66BN9ItgfmYsisqEA=; b=dh3Qm7U/WOrFuEWo4x8HZ3qpM8fICMI+xcTJLeV6X05JGCz3xyDaKkLIGAypqvZNkp wrNZkuqq3z4ovwImhCSjAP+J23mugHF9GFOrDC9U+CMM4B8/KqUHyJzzHzKvJhZDv3Ih JLgHgWGIUDFrpj+XdVwpvHbR1w/IsW6Y3ajvPezRE/S6sl0Aey9zOaFhkdmR1btaHpxB GNvGLKGm47a1dy+WRfUjzdDhgZlIH9N9f/C5+LbRNDKnj6qLT5MYdt7ZEHKyL4tRdoJS tq63vhgFxcTTVexOt1jFyKjLZvQqXD974P87zQTbXZYS7v9CNZwUeV45gagC7L1Evf3+ /cRg== 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=0w5hhl22QWx5oERXuGDjTyVxzo66BN9ItgfmYsisqEA=; b=FGfHJBwU7OaN1se/j4Qxe7XdEgGwFPs1mnY43xwMPKxGUgoNh2N03VEnQ1CgdC8LRL lxcm/pRQWANCFkTyVnTQWWO/7lKIu10GqTC5yZltQ84ZnGzfbx4RkNa/H+IH+fTqcWor urxx318A6NgSnvTr/gCJbiblV9DzAcxBuHeEOc8iZw7h5NzBuwrP2eMjm99OvYxog5z7 C6x72GZ6tpV21Y0ooMFrl0EmxGRiODYlY5aF6yUZIVuaBWxGZTEpyrqSj+7lW0qBmCbh g8b3ciLKMiHPYU/nQvtaleqCuJN6D0vvRqIJLcNnA5BdPeSJNSiSqllWe+HprUqwTJOn zBcg== X-Gm-Message-State: AOAM5308x836vtCOMCCx2gWl7vjPihWwClGOCxGiDFId5XDUvVDUJ+9q bzJZFQpCw7J/fB7sd9t54rBCH+ToolaysQ== X-Google-Smtp-Source: ABdhPJyXJfcYkVQPODR7fOuElj68g6mtTBLHEN3iL6I3ow3OGGAcAMYEwE22ZMB3rLJjOgm1QyHaYQ== X-Received: by 2002:a5d:8d8b:: with SMTP id b11mr12646252ioj.68.1610308978982; Sun, 10 Jan 2021 12:02:58 -0800 (PST) Received: from localhost.localdomain (dsl-205-233-124-188.b2b2c.ca. [205.233.124.188]) by smtp.gmail.com with ESMTPSA id m8sm9582813ioh.16.2021.01.10.12.02.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Jan 2021 12:02:58 -0800 (PST) From: Maxim Cournoyer Date: Sun, 10 Jan 2021 15:02:31 -0500 Message-Id: <20210110200231.24214-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::d2c; envelope-from=maxim.cournoyer@gmail.com; helo=mail-io1-xd2c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, 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-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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 2.75 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=gmail.com header.s=20161025 header.b=dh3Qm7U/; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: B4502940463 X-Spam-Score: 2.75 X-Migadu-Scanner: scn1.migadu.com X-TUID: ssT073K/NYeP While attempting to reproduce the now closed issue , I stumbled upon another annoyance, which is that the patch-and-repack procedure used as part of an origin derivation didn't support single files, so the following failed, for example: <#part type="text/plain" filename="/home/maxim/src/guix-core-updates/repro.scm" disposition=inline description="Script exhibiting problem"> <#/part> The following patch fixes that, allowing to use plain files with any of the already supported compressors, or non-tarball archived that would include a single directory (the same convention as used for our tarballs). Maxim Cournoyer (1): guix: packages: Allow patch-and-repack to work with plain files. guix/packages.scm | 96 +++++++++++++++++++++++++++++++--------------- tests/packages.scm | 87 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 149 insertions(+), 34 deletions(-) -- 2.29.2