GNU bug report logs - #45773
[PATCH core-updates 0/1] Allow patch-and-repack to work with plain files.

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.

Package: guix-patches; Reported by: Maxim Cournoyer <maxim.cournoyer@HIDDEN>; Keywords: patch; merged with #45774; dated Sun, 10 Jan 2021 20:04:02 UTC; Maintainer for guix-patches is guix-patches@HIDDEN.

Message received at 45773 <at> debbugs.gnu.org:


Received: (at 45773) by debbugs.gnu.org; 10 Jan 2021 22:08:00 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Jan 10 17:08:00 2021
Received: from localhost ([127.0.0.1]:55079 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kyisS-0005hz-0T
	for submit <at> debbugs.gnu.org; Sun, 10 Jan 2021 17:08:00 -0500
Received: from mail-il1-f169.google.com ([209.85.166.169]:45113)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <maxim.cournoyer@HIDDEN>) id 1kyisI-0005gn-0a
 for 45773 <at> debbugs.gnu.org; Sun, 10 Jan 2021 17:07:58 -0500
Received: by mail-il1-f169.google.com with SMTP id y13so8453088ilm.12
 for <45773 <at> debbugs.gnu.org>; Sun, 10 Jan 2021 14:07:50 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
 h=from:to:subject:references:date:in-reply-to:message-id:user-agent
 :mime-version; bh=GeHxFP91v8IKyXIOUT86+eJZA9SRLVG81XMKucNTQ3s=;
 b=P7ZncPQuqanAn5HKyCNDqQGUyU9CEmghfmyQsRc90ttHGexMqrOMc3ZqFBxHvph1M1
 64KLmlZfok4yNwiebNDWIT9vKeK03rfGaskCeRRnCQyG06fsi2vk20FaTIVO9HJMuGuk
 9UndPM3z0ojok1HQ1P5ZDkwX47ppN5eXsbBUksXAO65D4n66JlwnM2HQw/fMAvZidtge
 tet5CA7AfwxmukQzRC6wyrp4A7AV3byPe9HYFN2zYyL699lKqIWv1fccZ1YmXfIR/Vaf
 IlUD9vYZsw4u4jQ7NFWl/j6pwb/VFuqnCBvZ0tela2HSRyt/U2hNTGtVAwuyS1SQ0XW4
 5NFQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20161025;
 h=x-gm-message-state:from:to:subject:references:date:in-reply-to
 :message-id:user-agent:mime-version;
 bh=GeHxFP91v8IKyXIOUT86+eJZA9SRLVG81XMKucNTQ3s=;
 b=GjnhVE6zFdhEy7LQQdqeRDGGb3MdEZgTP56qm6R20bD699y9x0KI36kUGs1ItoaM4E
 CeTtAxHVeNscRH4jch7zCuNdB7EiQnxxvOBUHB5+C9XXcHRSAysDngsMDJOeZpiLT+Kj
 HQXBHdgidw0eviE5ev8JPoAvwVlAzYSoSbTPqIM1yAGEwNRfqtJhuBCRSS92lnF/Vdoz
 gEFTy8yz6A5ItwOS4cJbLyXoTf1cTGL71kO897/FOJfyocaXJnzJ0AwgViLzUgTVUCwQ
 AWzPfOS7uXhzfEAfe4wIZRAsG7lnR3l2yoj4yjTWaBWJ/FKlGduqskvII/oBO6cSdVgg
 IMwA==
X-Gm-Message-State: AOAM5313RxzYEIZQPuqSrTXtdnbym7vAUgsuaFV+SYVFn4vduiz/h0wr
 dRts85l2gBbSgXotxU2ZLwOSLYlMpXrXgg==
X-Google-Smtp-Source: ABdhPJx5fR8ZYH3LCF/1EjuS+5PbD1TohmXFMmTDR7Zu6lx+0OB98//ILb7QFaf1BeomLWxGO8pqMA==
X-Received: by 2002:a05:6e02:1908:: with SMTP id
 w8mr13206897ilu.229.1610316464547; 
 Sun, 10 Jan 2021 14:07:44 -0800 (PST)
Received: from hurd (dsl-205-233-124-188.b2b2c.ca. [205.233.124.188])
 by smtp.gmail.com with ESMTPSA id f2sm10085895iop.6.2021.01.10.14.07.43
 for <45773 <at> debbugs.gnu.org>
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Sun, 10 Jan 2021 14:07:43 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 45773 <at> debbugs.gnu.org
Subject: Re: bug#45773: [PATCH core-updates 0/1] Allow patch-and-repack to
 work with plain files.
References: <20210110200231.24214-1-maxim.cournoyer@HIDDEN>
Date: Sun, 10 Jan 2021 17:07:43 -0500
In-Reply-To: <20210110200231.24214-1-maxim.cournoyer@HIDDEN> (Maxim
 Cournoyer's message of "Sun, 10 Jan 2021 15:02:31 -0500")
Message-ID: <87o8hw4f9s.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux)
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 45773
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

--=-=-=
Content-Type: text/plain

Hello,

Maxim Cournoyer <maxim.cournoyer@HIDDEN> writes:

> While attempting to reproduce the now closed issue
> <http://issues.guix.gnu.org/30116>, 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>

That didn't work out well :-).

Here's the attachment that I meant to send along the cover letter.


--=-=-=
Content-Type: text/plain
Content-Disposition: inline; filename=repro.scm

;;; Run script with: ./pre-inst-env guile -e main -s repro.scm

(use-modules (gnu packages base)
             (gnu packages bootstrap)
             (guix build utils)
             (guix derivations)
             (guix download)
             (guix packages)
             (guix store))

(define %test-file-uri
  "https://raw.githubusercontent.com/realgud/realgud/master/realgud/common/bp-image-data.el")

(define (main _)
  (let ((source (origin
                  (method url-fetch)
                  (uri %test-file-uri)
                  (modules '((guix build utils)))
                  (patch-inputs `(("tar"   ,%bootstrap-coreutils&co)
                                  ("xz"    ,%bootstrap-coreutils&co)
                                  ("locales" ,glibc-utf8-locales)))
                  (snippet
                   '(begin
                      (with-fluids ((%default-port-encoding "ISO-8859-1")
                                    (%default-port-conversion-strategy 'error))
                        (substitute* "bp-image-data.el"
                          (("something")
                           "something else")))))
                  (sha256
                   (base32
                    "1qpn2zhh2qw579bhgjyxvf670r4kibaxls589hkm2yhwfvsjvs68")))))
    (with-store store
      (build-derivations store
                         (list (run-with-store store
                                 (origin->derivation source)))))))

--=-=-=
Content-Type: text/plain


Thanks,

Maxim

--=-=-=--




Information forwarded to guix-patches@HIDDEN:
bug#45773; Package guix-patches. Full text available.
Forcibly Merged 45773 45774. Request was from Maxim Cournoyer <maxim.cournoyer@HIDDEN> to control <at> debbugs.gnu.org. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 10 Jan 2021 20:03:03 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Jan 10 15:03:03 2021
Received: from localhost ([127.0.0.1]:55003 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1kygvW-0005Fi-Qi
	for submit <at> 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 <maxim.cournoyer@HIDDEN>) id 1kygvW-0005FQ-08
 for submit <at> 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 <maxim.cournoyer@HIDDEN>)
 id 1kygvV-00073n-Pv
 for guix-patches@HIDDEN; 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 <maxim.cournoyer@HIDDEN>)
 id 1kygvU-0003QV-38
 for guix-patches@HIDDEN; Sun, 10 Jan 2021 15:03:01 -0500
Received: by mail-io1-xd2c.google.com with SMTP id r9so15595096ioo.7
 for <guix-patches@HIDDEN>; 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 <maxim.cournoyer@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH core-updates 0/1] Allow patch-and-repack to work with plain
 files.
Date: Sun, 10 Jan 2021 15:02:31 -0500
Message-Id: <20210110200231.24214-1-maxim.cournoyer@HIDDEN>
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@HIDDEN; 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-Spam-Score: -1.3 (-)
X-Debbugs-Envelope-To: submit
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.3 (--)

While attempting to reproduce the now closed issue
<http://issues.guix.gnu.org/30116>, 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




Acknowledgement sent to Maxim Cournoyer <maxim.cournoyer@HIDDEN>:
New bug report received and forwarded. Copy sent to guix-patches@HIDDEN. Full text available.
Report forwarded to guix-patches@HIDDEN:
bug#45773; Package guix-patches. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Last modified: Sun, 10 Jan 2021 22:15:02 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.