From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id sGcoM1DdIWLhNQEAgWs5BA (envelope-from ) for ; Fri, 04 Mar 2022 10:35:12 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id YIGtL1DdIWKsqwAAauVa8A (envelope-from ) for ; Fri, 04 Mar 2022 10:35:12 +0100 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 66F2D2DDAE for ; Fri, 4 Mar 2022 10:35:12 +0100 (CET) Received: from localhost ([::1]:57082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nQ4L8-0005YF-9m for larch@yhetil.org; Fri, 04 Mar 2022 04:35:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57900) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQ4Ka-0005Ww-Q7 for guix-devel@gnu.org; Fri, 04 Mar 2022 04:34:36 -0500 Received: from [2a00:1450:4864:20::62d] (port=41762 helo=mail-ej1-x62d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nQ4KY-0002Kj-R5 for guix-devel@gnu.org; Fri, 04 Mar 2022 04:34:36 -0500 Received: by mail-ej1-x62d.google.com with SMTP id a8so16225682ejc.8 for ; Fri, 04 Mar 2022 01:34:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=beadling-co-uk.20210112.gappssmtp.com; s=20210112; h=references:user-agent:from:to:subject:in-reply-to:message-id:date :mime-version; bh=OrFY4UzrHK1vZ9Lq674rY0k9WmcUMeIPkCBjGOYjC1Q=; b=arDo2pqEqhrRZ67NFYu4Jj/BhtkYc6egLWxDdnVdzOTHRZfMc2hUJZge/H6SDqzvE4 dNHffUgU807gz/qhYnHLZmVQtAvlUnNwJqHjmfns/1BlrJ1NvYpFzJrzgf4hywK6Q7G8 4sz/IAr3LGLUiP8Etoz2iqAMMN4TuikmweX6z7zQGp9X7dHufa8mhDR2KriEdsadcCvC oknuHEHM4bI7dovpeAjNS3lRo5rVroHBg9aQQABY55OmH27KcEKy4VqMKofrYIa5dmgF mhseVTmCke3RJQsBDLA2J7dn4+VFwDye6M9yKzpOfet6t/X5E4VBuiv46iVN/1wr5prR Y7KQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:references:user-agent:from:to:subject :in-reply-to:message-id:date:mime-version; bh=OrFY4UzrHK1vZ9Lq674rY0k9WmcUMeIPkCBjGOYjC1Q=; b=VJ3ZP2E3JF6Sy8yNIkHfa0DzP2a+m3+KqpQaOeb9WPcDaNf5wwbevaUjefNsHH27ZT 0+DGlsQHxfEnKyrGsm6b3VI2ZIe3vSV08veQEbfP9ZkRwx4SBiJW0QnEGYIAoFU+WF4j wIktWDhIXqx4UNBuOu+Y4bQ5kBMTBzhNfkBmLBxp/xYuOg6QksHqDGhUMppljwGiUkZC dZJTE02cXTDitHk0mlqFs1xSxe+1kgb27Nb+oR0p8kNWYzmdMJvgGlCWP843qL/ZOvHl IFZlYaY/kYG1A+lOozN5shOQcaJFxrrpeGaejEFiWe/mb5S7fPVQiT0QJ8MPSa2UbMC7 mD4A== X-Gm-Message-State: AOAM533z78vVI8LpaI8qPY+9WCHb584r3R47x4H6FccTG3b9HAUn2hl3 JQkiaPhxLKMwRl19OZXhq+0GSXnEIyPBzlYf X-Google-Smtp-Source: ABdhPJwoLjS/D/hJbMZVGH5bKGxg3P8oycOZ4WMHOxjrjfVDcBQycvmXN8CXKtU7+Y2sXmQptOHkng== X-Received: by 2002:a17:907:16a6:b0:6da:6543:3f9e with SMTP id hc38-20020a17090716a600b006da65433f9emr9411927ejc.156.1646386469544; Fri, 04 Mar 2022 01:34:29 -0800 (PST) Received: from xps13 (host-2-103-29-35.as13285.net. [2.103.29.35]) by smtp.gmail.com with ESMTPSA id zk1-20020a17090733c100b006dab4a41df8sm622578ejb.111.2022.03.04.01.34.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 04 Mar 2022 01:34:28 -0800 (PST) References: <62b594e94117bc98c9edf0e3f8f067ccc46b10a3.camel@gmail.com> User-agent: mu4e 1.4.15; emacs 27.2 From: Phil To: Liliana Marie Prikler , Guix Devel Subject: Re: Help to workaround libgit2 fetch refs issue In-reply-to: Message-ID: <875yougixp.fsf@beadling.co.uk> Date: Fri, 04 Mar 2022 09:34:26 +0000 MIME-Version: 1.0 Content-Type: text/plain X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::62d (failed) Received-SPF: none client-ip=2a00:1450:4864:20::62d; envelope-from=phil@beadling.co.uk; helo=mail-ej1-x62d.google.com X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, PDS_HP_HELO_NORDNS=0.659, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1646386512; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=OrFY4UzrHK1vZ9Lq674rY0k9WmcUMeIPkCBjGOYjC1Q=; b=nOEnFOWy6z7DAnGjqsFDpu1PlCNGHsQMpxM0F6j8r4/OEXQI/6mg8rHq8uXUmHiM7TpIqJ maAI2J6LALgUyU3eOYlqMVGgeI/N3C+OFpm9GL0327MJYSZty+ttLSHPwUVyjoraPW83N5 1XNzQ7nccYq2FObop2eaw17bWxiaVkkuIBU++/znVEbTp5UwTlUj+nmRoSp5rPhIyAX3ii dn8JrdpKvoLEBXwp6wylU5vxNoAUq7V1wScgzqXJnK2zAgRbyPpSzsmDxxRkRHYV69gYoj BXGFPi2ZjlSKKuY2GU2niIs3Z3fwhNIL/cTe2mPpfgvuXfTCLKbnysLNsC+0Lw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1646386512; a=rsa-sha256; cv=none; b=QZXl1UCr9VdiUxO5KtP0Swc+xm3JaiM8ousEBd6hlY0XjR/E5Q1nWgrHL93A0Ua6boHWeY GdBrOqSz+DjiAR7rOaYQmhndd2LTUe4JZWKmYYQ2fWC+R0nd8Fuhh1HBmcFUAHHQUk8qd4 SSiwDxgowopWaQjHkgviEylBGIFwRmRIewQ17EyAyqqDvWToXQDEOPTaqFvrl8FYghr2sa xEZmW+pe9q2/wYzZ9pAviBVFbwL9hPNOK5/IPJcn22UiYaKUl8qW/dxxg73j23iHACZbZq ZZU9vmpBVN+F42sOLfMiPJ+YDK0MjHCQOII445C2Cmg3exb1NRRnMUUhAoW8MQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=beadling-co-uk.20210112.gappssmtp.com header.s=20210112 header.b=arDo2pqE; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -5.56 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=beadling-co-uk.20210112.gappssmtp.com header.s=20210112 header.b=arDo2pqE; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-devel-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-devel-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 66F2D2DDAE X-Spam-Score: -5.56 X-Migadu-Scanner: scn0.migadu.com X-TUID: +ursOvui30Ts Just to add.... Duplicating of guix-checkout in a private channel has side-effects - if anyone has any ideas of how to workaround this, I'd be love to discuss... alas, at this point I think I have 3 temporary options: 1) Patch in my local Guix and roll my own build of Guix (see below) 2) Workaround outside of Guix by cloning the repo for Guix not using libgit2 3) Tell my CI/CD to continue to build all my PRs twice if the first build fails. Details below. Phil writes: > Thanks for the reply Liliana, > > On Wed, 2 Mar 2022 at 21:06, Liliana Marie Prikler wrote: > > I've included what I think is a true minimal implementation, borrowing from (guix git) where possible to minimize duplication - in > case anyone else ever stumbles into the same issue (although it's pretty niche, I admit!). Whilst my original post works it restricts the use of --with-branch and --with-commit options with packages that use my new record type. It's now obvious why, looking at package-git-url it only handles origin and git-checkout records. I need to add my git-checkout-x-ref here too: (define (package-git-url package) "Return the URL of the Git repository for package, or raise an error if the source of PACKAGE is not fetched from a Git repository." (let ((source (package-source package))) (cond ((and (origin? source) (git-reference? (origin-uri source))) (git-reference-url (origin-uri source))) ((git-checkout? source) (git-checkout-url source)) (else (raise (formatted-message (G_ "the source of ~a is not a Git reference") (package-full-name package)))))))