From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 30 23:50:30 2021 Received: (at 50066) by debbugs.gnu.org; 31 Aug 2021 03:50:30 +0000 Received: from localhost ([127.0.0.1]:60842 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mKun8-0005yL-6c for submit@debbugs.gnu.org; Mon, 30 Aug 2021 23:50:30 -0400 Received: from mail-qk1-f175.google.com ([209.85.222.175]:43904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mKun5-0005y4-8P for 50066@debbugs.gnu.org; Mon, 30 Aug 2021 23:50:28 -0400 Received: by mail-qk1-f175.google.com with SMTP id ay33so18126826qkb.10 for <50066@debbugs.gnu.org>; Mon, 30 Aug 2021 20:50:27 -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=+QLzocNo31EmFjmDUvrgHCAg1e4z3XnV9JcBusiAHvI=; b=u04vKKmC6spaMCWZJw/bHnXeNG10xFidtHCdFtzGIkzYxCeyf5ZElL7zIHFatoOcAH 7X5KT2W3F2bWxBSr3q+dJXIoVubM+B6titUwywYc2u7XrP5SgBphnOACxTT3HBsURyN8 B/KJ+gWLEE1BiQeDAzEBcc79WCvWu67JPrDUGNdrU/XCft/v8YzFkBykhyDkXQ6tCVtQ GNsx7EVr6fHVpFS985lfI3Ifl8XnYECBsPVrsVdA5EInNpwsGDmNYglDHxxwA6Mk2tNm nRxgicX5a+QbaNfAatdXK0BQav7UlOBO5Cl/VtJkpB65P9aEEcguE6wCEZBVnNTgm4gG wbVg== 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=+QLzocNo31EmFjmDUvrgHCAg1e4z3XnV9JcBusiAHvI=; b=Yrd7qsCCHxQjDQIi/mX+Tx71JjZlYXkkLLo7aYXFxzChAImbTQa0jLYWExmKWXH1Cp HbZXXbD5Z4sk3oN+bpDM64gq41+QivkFF35NChffrKPKk42XY+Nt1+sD/E3pLT7osX52 bIoUNBovu2h67qeTH+iyJ4T8oLXWlZG7Wuk7IOHCvPcyO/bZX9FxGpts5MKuuQDgrCch liOceMot0b8cJEL/j8Mcm0+s3uvUH0Nm1qPFjddm/qMrzLRub7K60++1JTeygO3+yXw8 it9LuS62pAap3YN+T7H+pMnuXWNMTZqEPZLxKRpXmcep+wpJ0wxVjm5BK0il6t2N8D5Y My9w== X-Gm-Message-State: AOAM531yaphizni4h3MX4rNSRLa4+G9n+UjRSoVDSwkHTkwc0aPvUXDA nq1pon9xOpfGy/ZupUlYcs3iNfQUjKEpIA== X-Google-Smtp-Source: ABdhPJzwSHK9M5eMS+4LNpJ1CQBWJT3mg5oKV2QVbbJT7qFb9xkZLRhjN36vVCID1atW7BKEg9n4UA== X-Received: by 2002:a37:9445:: with SMTP id w66mr1057667qkd.410.1630381821574; Mon, 30 Aug 2021 20:50:21 -0700 (PDT) Received: from hurd (dsl-10-141-212.b2b2c.ca. [72.10.141.212]) by smtp.gmail.com with ESMTPSA id v27sm12653440qkj.129.2021.08.30.20.50.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Aug 2021 20:50:21 -0700 (PDT) From: Maxim Cournoyer To: Mathieu Othacehe Subject: Re: bug#50066: core-update: Raw origin tarballs are not handled correctly. References: <87bl5z85ga.fsf@gnu.org> <87lf4nsene.fsf@gmail.com> Date: Mon, 30 Aug 2021 23:50:20 -0400 In-Reply-To: <87lf4nsene.fsf@gmail.com> (Maxim Cournoyer's message of "Fri, 27 Aug 2021 00:19:33 -0400") Message-ID: <874kb6jmrn.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 50066 Cc: 50066@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Mathieu, [...] > Thanks for the report; it looks like a bug indeed. I had probably > overlooked that case (where there is no compression but we are still > dealing with an archive format). The annoying thing is that touching > this code will trigger a world rebuild; so unless we find other big > problems and batch the fixes, it may not be worth it. > > The site.py problem you reported may be one, if I find a solution. > > Other things on my mind: > > 1. rustc bootstrap from 1.39 (the itch to make it faster comes back > everytime I have to build it ;-)). I'm nearing completion on this front. > 2. fontconfig update that should allow per-profile fonts management via > XDG_DATA_DIRS (I have the commit ready, but failed to test it due to > having to build rust and getting distracted by 1. :-)) I'll propose a few patches to include in the 'frozen' core-updates branch since we've found a world-rebuilding change worthy of addressing anyway (the patch below). 1 file changed, 4 insertions(+), 4 deletions(-) guix/packages.scm | 8 ++++---- modified guix/packages.scm @@ -836,10 +836,10 @@ specifies modules in scope when evaluating SNIPPET." ((file-is-directory? #+source) (copy-recursively directory #$output #:log (%make-void-port "w"))) - ((not #+comp) - (copy-file file #$output)) - (else - (repack directory #$output))))))) + ((or #+comp (tarball? #+source)) + (repack directory #$output)) + (else ;single uncompressed file + (copy-file file #$output))))))) (let ((name (if (or (checkout? original-file-name) (not (compressor original-file-name))) Sadly the plain .tar file was/is not covered by tests (and not easily so), but if his was my only omission, it should be correct (TM). Attentive review needed :-). Thank you! Maxim