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 nj7oG856+180BAAA0tVLHw (envelope-from ) for ; Sun, 10 Jan 2021 22:08:14 +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 QA5eF856+19YGwAAbx9fmQ (envelope-from ) for ; Sun, 10 Jan 2021 22:08:14 +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 C698D9402AF for ; Sun, 10 Jan 2021 22:08:13 +0000 (UTC) Received: from localhost ([::1]:49154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kyise-0007In-Hp for larch@yhetil.org; Sun, 10 Jan 2021 17:08:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58594) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kyisU-0007Ie-7o for guix-patches@gnu.org; Sun, 10 Jan 2021 17:08:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43533) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kyisU-000361-19 for guix-patches@gnu.org; Sun, 10 Jan 2021 17:08:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kyisT-0005iH-Qs for guix-patches@gnu.org; Sun, 10 Jan 2021 17:08:01 -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 22:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45773 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45773@debbugs.gnu.org Received: via spool by 45773-submit@debbugs.gnu.org id=B45773.161031648021953 (code B ref 45773); Sun, 10 Jan 2021 22:08:01 +0000 Received: (at 45773) by debbugs.gnu.org; 10 Jan 2021 22:08:00 +0000 Received: from localhost ([127.0.0.1]:55079 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kyisS-0005hz-0T for submit@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 ) id 1kyisI-0005gn-0a for 45773@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@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@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 References: <20210110200231.24214-1-maxim.cournoyer@gmail.com> Date: Sun, 10 Jan 2021 17:07:43 -0500 In-Reply-To: <20210110200231.24214-1-maxim.cournoyer@gmail.com> (Maxim Cournoyer's message of "Sun, 10 Jan 2021 15:02:31 -0500") Message-ID: <87o8hw4f9s.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" 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: -0.25 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=gmail.com header.s=20161025 header.b=P7ZncPQu; 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: C698D9402AF X-Spam-Score: -0.25 X-Migadu-Scanner: scn0.migadu.com X-TUID: 0WJio2AAZjAi --=-=-= Content-Type: text/plain Hello, Maxim Cournoyer writes: > 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> 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 --=-=-=--