From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id yXgVFzSnLWHzBAAAgWs5BA (envelope-from ) for ; Tue, 31 Aug 2021 05:51:16 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 4GgxEjSnLWGtTwAAB5/wlQ (envelope-from ) for ; Tue, 31 Aug 2021 03:51:16 +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 5849D158DD for ; Tue, 31 Aug 2021 05:51:15 +0200 (CEST) Received: from localhost ([::1]:44976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKunq-00049D-1a for larch@yhetil.org; Mon, 30 Aug 2021 23:51:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37544) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKune-00046q-Ik for bug-guix@gnu.org; Mon, 30 Aug 2021 23:51:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49296) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mKune-0008T4-9J for bug-guix@gnu.org; Mon, 30 Aug 2021 23:51:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mKune-0005z9-2o for bug-guix@gnu.org; Mon, 30 Aug 2021 23:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#50066: core-update: Raw origin tarballs are not handled correctly. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 31 Aug 2021 03:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50066 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Mathieu Othacehe Received: via spool by 50066-submit@debbugs.gnu.org id=B50066.163038183022965 (code B ref 50066); Tue, 31 Aug 2021 03:51:02 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 50066@debbugs.gnu.org Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1630381875; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=+QLzocNo31EmFjmDUvrgHCAg1e4z3XnV9JcBusiAHvI=; b=a7uTz10eISJZVWl+nYgnwLoe4J2TSODm1I+yh5WuVzPnw3ixZgMcwX+aVMpQT/MnPjM5aO i745npwSgCkAG/j8mL3c6hV88LKAWV1Dq3ARKeSHVe3sOoc3/DKf6fARUFZpggf8LL2z39 0hoKa54Ga+EduciBIwJw/7fJ0fQVG+iL+AelwaW6VoWrRVhX7zD1jmGW6aGz+cyqR8kCeh YxLr0+d75KMgL+bV8pK3TwSm/z2spAWMLY7oIyOsiiYKt78QZm/FflKsilIE792O7U+NRA 31TfcJGxwYsdP3W5bdzEZM2eWlzLAFTtwaQOEAeSoQ1WkTToruxBR0rO0nyYkw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1630381875; a=rsa-sha256; cv=none; b=ZVyP4KjT4Iux3ao4zYR/e+DQC9t2DQNJpdr1W7hoUagiYAl07HmpPmqq7ql5Eh7mVCbJr0 8HQisQNpREQgAvNaH0V4JujVz78qSJz5mf0czl910GsHbxnu43qCGuB2g9i8Z++Mh2CLhv iQA5TW9lJnbSR2fWUQuEaKfOza8Il2pPdaI7E+vOVnRpE4RnZXjJ/CdzREi6pYiTDbHwdv lXHu+qvJTG/ITSOKbAJFcJlsgEYT4KAh5HoR+Dd351gXJn3h1mKbQZAMycfRQQbR/fQeZO ciDBC1Wmcx4YZbIqCOerhamNflxJk/xkc6pSXK3qu7hhKUBK4rVXLzNo79uMlA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=u04vKKmC; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Spam-Score: -1.32 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=u04vKKmC; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: 5849D158DD X-Spam-Score: -1.32 X-Migadu-Scanner: scn0.migadu.com X-TUID: kE+HwalosmVG 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