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 ms11 with LMTPS id 6KbzDvYsXl9+OgAA0tVLHw (envelope-from ) for ; Sun, 13 Sep 2020 14:30: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 mp2 with LMTPS id SIlDCfYsXl8ROAAAB5/wlQ (envelope-from ) for ; Sun, 13 Sep 2020 14:30: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 BBDF69403EC for ; Sun, 13 Sep 2020 14:30:13 +0000 (UTC) Received: from localhost ([::1]:52656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHT1A-0006Dy-Ge for larch@yhetil.org; Sun, 13 Sep 2020 10:30:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38700) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHT11-0006D0-Br for guix-patches@gnu.org; Sun, 13 Sep 2020 10:30:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39721) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kHT11-0005dt-11 for guix-patches@gnu.org; Sun, 13 Sep 2020 10:30:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kHT10-00041t-Rx for guix-patches@gnu.org; Sun, 13 Sep 2020 10:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43193] [PATCH] guix: Add --with-dependency-source option Resent-From: Jesse Gibbons Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Sep 2020 14:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43193 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 43193@debbugs.gnu.org Received: via spool by 43193-submit@debbugs.gnu.org id=B43193.160000735615413 (code B ref 43193); Sun, 13 Sep 2020 14:30:02 +0000 Received: (at 43193) by debbugs.gnu.org; 13 Sep 2020 14:29:16 +0000 Received: from localhost ([127.0.0.1]:51267 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHT0G-00040X-Ar for submit@debbugs.gnu.org; Sun, 13 Sep 2020 10:29:16 -0400 Received: from mail-pl1-f177.google.com ([209.85.214.177]:37465) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHT0E-00040J-0J for 43193@debbugs.gnu.org; Sun, 13 Sep 2020 10:29:15 -0400 Received: by mail-pl1-f177.google.com with SMTP id u9so3259933plk.4 for <43193@debbugs.gnu.org>; Sun, 13 Sep 2020 07:29:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding:content-language; bh=+LbvV8sH7AxX8smWhh0DFYdr1jACRN/jOKPdTkpMN/g=; b=TjduH85SaNSmfDBlyA1ky/TXpV8zBjITWe12/qZdXQeA+atZbvj9nPnjK2LgiH9wuY eXOqDmmMGZmNaxtLVG8JTu8o9FmZBGNc70xNG7nmWVR451urv8IBsAeL6egZGnzyBWcJ MuayVxcGV/CNR7SyUbtg+1vPP3fOMPDEt9+RLtE8SrejaTc6Be5igQX1KfLqMK0ZztL4 A50jcx7B5ggW/teJfS6CjKr+JDcQyhAJBoG+t2ksc6KzQ7AC1hjJNxkN95ehp//q+eta tLLbhvaGrnnjLy0AsJx02y7ZdPy+WAgLKolyQZPW/zRIsGMboW1hUj/XoK7p+BO9kVfi Qwow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=+LbvV8sH7AxX8smWhh0DFYdr1jACRN/jOKPdTkpMN/g=; b=ntdHltDPMoaBCRt2ELlXk3NQLBl/5S0U+hYdbbU99ixa729R3XJYKEDEw6cPQAcpEM wN6/ce6m7xPVmgF6B0/Ct/9wyKlGsxcgpGOKZpErKgOWfnR1KFfay/yUIBWmNgAHw9Lv sWv51ESQWv1U2FsSa94uaiFVxLRzzsZ+1Xaq3+SNAY4FemRuT9dm/5tIWkXTjHp/7SCJ UR0KPug7SoEROoYvd5g6gQmDiuTXEunjASyaEk6RyD3QIkz2cQZoqpDYnu71Rb7KArbW prOHQrEhg2iMlZAnd5APlS7NMHdGJk2+eq5ckRfPGvlBDkZRp5As4ThEfjKmL78SrQhz f1Ng== X-Gm-Message-State: AOAM530o+Gjo399zXcZmogeYx3YjGFrSwBJ42dww0RX161kwITIaBC69 7w8beWfVrUKdMQrA3DtIscleWUgO583nFw== X-Google-Smtp-Source: ABdhPJw075jPFwR1LC36cwUv2vCynEwwT6doGL2Ur0SohG+Z4C5JhXTu9qMNyWqy20R/MX5LumaP+A== X-Received: by 2002:a17:902:be11:b029:d1:bb21:4c9c with SMTP id r17-20020a170902be11b02900d1bb214c9cmr6690444pls.8.1600007347699; Sun, 13 Sep 2020 07:29:07 -0700 (PDT) Received: from [192.168.1.25] ([38.141.58.134]) by smtp.gmail.com with ESMTPSA id b11sm576315pfd.33.2020.09.13.07.29.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 13 Sep 2020 07:29:06 -0700 (PDT) References: <9c3a00ba-19bf-a8e9-8803-d150e91f1b6e@gmail.com> <87y2lige5l.fsf@gnu.org> <7f52c72f-c280-b585-d1ad-ca012f804910@gmail.com> <87wo10s4j6.fsf@gnu.org> <4c890f8c-539c-1c9c-f558-7ba01cffa480@gmail.com> <87y2ld7s5b.fsf@gnu.org> From: Jesse Gibbons Message-ID: <9130ce2d-4d10-0aa5-ad68-b312097fcb4a@gmail.com> Date: Sun, 13 Sep 2020 08:28:50 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Icedove/68.12.0 MIME-Version: 1.0 In-Reply-To: <87y2ld7s5b.fsf@gnu.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-Spam-Score: 0.2 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -0.8 (/) 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-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=gmail.com header.s=20161025 header.b=TjduH85S; 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-Spam-Score: 0.09 X-TUID: I/4pe+Vt6vko On 9/13/20 6:55 AM, Ludovic Courtès wrote: > Hi, > > Jesse Gibbons skribis: > >> On 9/11/20 9:43 AM, Ludovic Courtès wrote: > [...] > >>> So maybe drop the second clause for non-recursive replacement, and drop >>> ‘transform-package-source’ as well. >> I included a fallback to transform-package-source because the >> following happens: >> >> $ ./pre-inst-env guix build --with-source=$(guix build --source hello) hello >> guix build: error: invalid source replacement specification: >> "/gnu/store/hbdalsf5lpf01x4dcknwx6xbn6n5km6k-hello-2.10.tar.gz" >> >> This does not fail when I fall back to the non-recursive logic. >> >> I can drop transform-package-source, but I will need to do some more >> hacking to figure out how the package name and version are parsed from >> the file name as described in the manual, and move it to the logic in >> transform-package-inputs/source. > Yes, that’d be nice. Namely, if you do: > > guix build hello --source=hello-1.2.3.tar.gz > > it should work just as now (from the source file name, we assume that > the source applies to package “hello”). > > Conversely, doing: > > guix build hello --source=xyz-hello-1.2.3.tar.gz > > would have no effect. It would not even emit a warning, unlike now. I was able to get this working nicely. >> I'm not going to have as much free time starting next week, so I might >> not be able to do that for a while, but I will try to get it done >> ASAP. > Sure, let’s stay in touch, I think we’re almost done! I wrote a new test that checks non-leafs. The following tests fail: test-name: options->transformation, no transformations test-name: options->transformation, with-source test-name: options->transformation, with-source, replacement test-name: options->transformation, with-source, with version test-name: options->transformation, with-source, no matches test-name: options->transformation, with-source, PKG@VER=URI Some of these tests raise a similar error, some only have a false actual value, and "options->transformation, with-source, no matches" will need to be changed at the test level because it checks for a warning in the output. I've been trying to debug, but the tests don't even give a stack trace. I will do what I can to fix the tests and follow up at the end of the week. -Jesse