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 ms0.migadu.com with LMTPS id yBOFAyqHMGGh6wAAgWs5BA (envelope-from ) for ; Thu, 02 Sep 2021 10:11:22 +0200 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 sHGjOimHMGFUBgAAbx9fmQ (envelope-from ) for ; Thu, 02 Sep 2021 08:11:21 +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 3FC472FF9 for ; Thu, 2 Sep 2021 10:11:21 +0200 (CEST) Received: from localhost ([::1]:60128 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mLhoc-0006mw-I9 for larch@yhetil.org; Thu, 02 Sep 2021 04:11:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36840) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mLhoM-0006l7-Ol for bug-guix@gnu.org; Thu, 02 Sep 2021 04:11:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56380) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mLhoM-000897-Gi for bug-guix@gnu.org; Thu, 02 Sep 2021 04:11:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mLhoM-0002gU-9Q for bug-guix@gnu.org; Thu, 02 Sep 2021 04:11:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#49801: Guix time machine provenance/manifest reproducibility issue? Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 02 Sep 2021 08:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49801 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: "Denis 'GNUtoo' Carikli" Received: via spool by 49801-submit@debbugs.gnu.org id=B49801.163057024110270 (code B ref 49801); Thu, 02 Sep 2021 08:11:02 +0000 Received: (at 49801) by debbugs.gnu.org; 2 Sep 2021 08:10:41 +0000 Received: from localhost ([127.0.0.1]:39693 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLho0-0002fa-Tz for submit@debbugs.gnu.org; Thu, 02 Sep 2021 04:10:41 -0400 Received: from mail-qv1-f43.google.com ([209.85.219.43]:43889) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mLhnz-0002fL-4K for 49801@debbugs.gnu.org; Thu, 02 Sep 2021 04:10:40 -0400 Received: by mail-qv1-f43.google.com with SMTP id z2so635655qvl.10 for <49801@debbugs.gnu.org>; Thu, 02 Sep 2021 01:10:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=riQz2epBdX2CtzxJk5TIDkdYhSQ7sCgufr7tGWGwU1Q=; b=NE8D7NQ/Nyp/EOL9ahy15owpMKWLvvkDltWE5ZKGbqSsBqxgEK6dpaZhpzu+5FxqtS 5HPo0u+VU64qB7dLO54+wxLbDUkTsCSvKMNU7r2oMsAOmF8KFJ3EmWizdKycebprBbTX IO7zLEN9STdb2V5201OrDv278flBtzgD8qjBKTYh7r7uqqPpM0DPoJGVJD7JHp3Q7/H/ ZdXGboDsiObGRPg8PviplPH2+Q+zIakahTeYJIdT3f2wPDENeELHXfRbYGfWXvEEE7vi Pgjl5RY1uB2eCGiigfN7/9fvlCUUxVTR4x4j+z+laU0wSSwBKzNd/ioeGwzQqJ+7Aqw1 hY1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=riQz2epBdX2CtzxJk5TIDkdYhSQ7sCgufr7tGWGwU1Q=; b=JqAraf/RDqfdE1js7g04KsRiFuxxD9b5fLkJngJq8NquDwP+OMPxXWIiw0fs0rkBp4 GQp4zS0Dj2U1l3pMUTQBwQLhkLlXL0FJudZBfEuucAtfvhR3amOW54ZNlqBfPXVzcAYZ SwjhT9uNdNWxQLkNfpqgzTj+DrsjS9DBXgFUU1WKonNWcFvTCbV1cMGS9vf4jrd/N9Rb OLhwIckfspbnWB9Uec8Nkx0Ot3cYl5iZWcDiD45p9WPyL0ntG8MzP0vwTdu/GarQ4FMy SVT2aCDRlym0/Uaeg8VtQzD2585ZvcqOTQrN5CiXn+leT/xAIUqOtXeyMKREthIE7ddq agsQ== X-Gm-Message-State: AOAM532e3zAlG+U3Xix39ahs/ZF09kvwCKbdXOGc5IVZyCBF/5am1OeZ RvJpom5+kz7zXu8N7lwBuy37iWTUp0no+3+wBM0HYnTZfn8= X-Google-Smtp-Source: ABdhPJwvqhnyqzHOZ3mG4qOdCHl+t40AO/ZodaLnD7HIg4jPSFce79j9zNzOh3IAz5v04IC6EihD1PEnlBCZ5sZ4bbk= X-Received: by 2002:a05:6214:1e1:: with SMTP id c1mr1829915qvu.42.1630570233291; Thu, 02 Sep 2021 01:10:33 -0700 (PDT) MIME-Version: 1.0 References: <20210801022142.2117e06e@primarylaptop.localdomain> <86k0kkclu3.fsf@gmail.com> <20210902002742.3866243a@primarylaptop.localdomain> In-Reply-To: <20210902002742.3866243a@primarylaptop.localdomain> From: zimoun Date: Thu, 2 Sep 2021 10:10:22 +0200 Message-ID: Content-Type: text/plain; charset="UTF-8" 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: 49801@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=1630570281; 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=riQz2epBdX2CtzxJk5TIDkdYhSQ7sCgufr7tGWGwU1Q=; b=Qthk9Bqib9B8X5tmwM3gcEJ9lfhMQ/QWy4CEQwfZ9bpn4C5TB1pj+UcrxVV293Ibo49J8l aWz4AHRakUrdMFNkUGxh+J1TpzeMFG+MlSNVhDl9Afu7YunvwOTGSX4PlujwtojRBftLrB fMiVCha7Vvkkl+PihjpBwTRM/hoLXZdtSDJoqfH6fS5XzqTXuZzaX27dGxlVjUmVl6kzbV Ithkrd+pIz2450KBFnHzV3P2WP4VjYfgAViho4zaPAflJvmhPIWW4CwAGKw/2w9psN4tP+ Mt+0ovL81DVVimWmqgZHCUQrjUGtBc5pcFpMFuYGHZy/SD/jnsRWylwTj4nbRg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1630570281; a=rsa-sha256; cv=none; b=MeHqRNyct31xiWwuc5MZh34pyVDX/aiNCW+nfb/y9EcFbQh71cass4NZVDkRaAU1HeFeWV Rng2EyKkxjaMEtzUNhGIaICSC1rliQ54JxieS0jMay6fQTemg/BNFEJSC31FRJgaeWrw79 jSrIvd500DuVLXH7FQSX/+zDQg47wC2G7oKW4Z8ljDCDQCuAtCqzc5V7hLnTFFX+j9uNet l5Czonis/XmLaAr77q2oa8JJrByu8fRhwif50ZsQB5ojOg0oaUzB+ffNbmX2IWT5zvh8Tj ElbaiwS3o/SHTuYieTdM4gJCg1Y63kJeIf/4U9WNKixgHeewQwcfEFBDZsJ0LQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="NE8D7NQ/"; 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: -0.32 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="NE8D7NQ/"; 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: 3FC472FF9 X-Spam-Score: -0.32 X-Migadu-Scanner: scn1.migadu.com X-TUID: dDICeFP/6C6s Hi Denis, Thanks for the investigation and the attempt. Well, I miss if it works or not... On Thu, 2 Sept 2021 at 00:27, Denis 'GNUtoo' Carikli wrote: > With and without this patch: > > diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm > > index fb8ce50fa7..af1cf77f07 100644 > > --- a/guix/scripts/pull.scm > > +++ b/guix/scripts/pull.scm > > @@ -739,7 +739,7 @@ Use '~/.config/guix/channels.scm' instead.")) > > (cons (match ref > > (('commit . commit) > > (channel (inherit guix) > > - (url url) (commit commit) (branch > > #f))) > > + (url url) (commit commit))) > > (('branch . branch) > > (channel (inherit guix) > > (url url) (commit #f) (branch > > branch))) > > on top of 95c29d2746943733cbe8df7013854d45bb0df413 ("gnu: electron-cash: > Update to 4.2.5." which is today's master HEAD), I get the same diff > with and without time-machine. ...here I understand the patch fixes the issue... > I made and used this Makefile to build two hello tarball in both cases: > > COMMIT ?= 95c29d2746943733cbe8df7013854d45bb0df413 > > > > all: \ > > hello-guix-$(COMMIT).tar.xz \ > > hello-time-machine-$(COMMIT).tar.xz \ > > > > hello-guix-$(COMMIT).tar.xz: > > install -m 644 \ > > `../pre-inst-env \ > > guix pack \ > > --compression=xz --save-provenance hello` \ > > $@ > > > > hello-time-machine-$(COMMIT).tar.xz: > > install -m 644 \ > > `../pre-inst-env guix time-machine \ > > --branch=master \ > > --commit=$(COMMIT) \ > > -- \ > > pack --compression=xz --save-provenance hello` \ > > $@ > > And once the file named manifest is extracted from both tarballs I get > this diff (with and without your slightly modified patch): > > --- ./hello-guix-95c29d2746943733cbe8df7013854d45bb0df413/gnu/store/lw9x5aimyqcq5iazj786fv7q5l3h0syk-profile/manifest 1970-01-01 01:00:01.000000000 +0100 > > +++ ./hello-time-machine-95c29d2746943733cbe8df7013854d45bb0df413/gnu/store/30pf6ppiqpjsjaaiw35kc5lp6dcixpf1-profile/manifest 1970-01-01 01:00:01.000000000 +0100 > > @@ -12,4 +12,19 @@ > > "/gnu/store/a462kby1q51ndvxdv3b6p0rsixxrgx1h-hello-2.10" > > (propagated-inputs ()) > > (search-paths ()) > > - (properties))))) > > + (properties > > + (provenance > > + (repository > > + (version 0) > > + (url "https://git.savannah.gnu.org/git/guix.git") > > + (branch #f) > > + (commit > > + "95c29d2746943733cbe8df7013854d45bb0df413") > > + (name guix) > > + (introduction > > + (channel-introduction > > + (version 0) > > + (commit > > + "9edb3f66fd807b096b48283debdcddccfea34bad") > > + (signer > > + "BBB0 2DDF 2CEA F6A8 0D1D E643 A2A0 6DF2 A33A 54FA")))))))))) ...but then here I see it does not fix it. However, because you run "./pre-inst-env guix pack --save-provenance", it seems expected that the 'properties' is empty. From my understanding, '(find guix-channels? channels)' does not return the 'guix' channel because it is the current Git checkout. It is not the case with "guix time-machine" because it creates an inferior using the 'guix' channel. Moreover, if you want to try the patch, you need to run: ./pre-inst-env guix pull -p /tmp/new ./tmp/new/bin/guix describe # return commit 12345 ./tmp/new/bin/guix pack --save-provenance ./tmp/new/bin/guix time-machine --commit=12345 -- pack --save-provenance and be careful with the '--localstatedir' and '--sysconfdir' variables at './configure' time. Well, from my point of view, the Guix way would be: guix describe -f channels > channels.scm guix pack --save-provenance then later or elsewehere guix time-machine -C channels.scm -- pack --save-provenance Although, it will not fix the bug you are exposing. :-) WDYT? Last, I have not carefully checked and maybe I am wrong, the both options "--commit=1234 --branch=master" are exclusive I guess; i.e., the argument 'master' passed to '--branch' is not used in this case, IIUC. Cheers, simon