From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id 8NB8HHYQtGZ7gQAAqHPOHw:P1 (envelope-from ) for ; Thu, 08 Aug 2024 00:25:26 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id 8NB8HHYQtGZ7gQAAqHPOHw (envelope-from ) for ; Thu, 08 Aug 2024 02:25:26 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=j10-labs-com.20230601.gappssmtp.com header.s=20230601 header.b="H/ii30Y3"; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1723076726; 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:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=wBYU48VBcYLppXAj+qfhFyXhd3mEGMe728tZVSGZx5s=; b=X9pgKmjmBxYh7H1LkV2iU033Hhtt1a7AQttn5kHMHOn9bOrbDMy0gXVM0Y03VsoZ7TTgLA VobKGxB2Gfgw0zsyP7FW1mxWE981iE8g8GB7xBuhQ8AwdSs9iSCTZTPoAmYdsd/StnkRAX 0naliHnibCE5sMSQ+2LqX5DBS2rXOyF1fsXoA2TGWEvRaQn9c10ZLiPWeXVbxuR8gfAq+9 5WVnunAtyjjR+WSBcINq+XIZecT89Ki91I89xANWOE2ZnlVwh5MExXm6GBJxo6qLU5nfGc VJdh5cE9kHyoL9pLm2+bQfF5Xip6D+QT3WxnyqQQpquvRXIL+LoYZVVWgAnoRg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1723076726; a=rsa-sha256; cv=none; b=V4D0b5z27KsbgMvMyfUwnO0R04TK8p4ohRojZWcWuhzV9saDVjA37/Tz3RPKxB1XTXqY/n D0P8j+p+yrS/f+NO3LwPMG4p8OM4IIPikapmlYvHDeZmx4BFj7MS4S/QgW5G/q4NRwb5cK 9ZV0DD3jmsbKifijksKUBVFO/ZtvZA7tQVRg3ScD36FI5lrS0w5HcQ+taQuFKY9f7GM7QM r2k7cwaJ5zSbNlI05EDb8n48vCoDHGI9nqpFYcQ09zuB6NtYWkYWsgzxGxQAv6MuyUqRYl pXRbsWQ1ztYiubhf4Y80bCDu1ML2RRbztOpbIkM5OKbs+ajE5o7CUC4BsrIE7w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=j10-labs-com.20230601.gappssmtp.com header.s=20230601 header.b="H/ii30Y3"; 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" 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 380436683A for ; Thu, 8 Aug 2024 02:25:26 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sbqxN-00058B-6D; Wed, 07 Aug 2024 20:24:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sbqxL-00057k-GL for guix-devel@gnu.org; Wed, 07 Aug 2024 20:24:39 -0400 Received: from mail-lj1-x229.google.com ([2a00:1450:4864:20::229]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sbqxJ-0005wS-Pp for guix-devel@gnu.org; Wed, 07 Aug 2024 20:24:39 -0400 Received: by mail-lj1-x229.google.com with SMTP id 38308e7fff4ca-2f0271b0ae9so3336831fa.1 for ; Wed, 07 Aug 2024 17:24:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=j10-labs-com.20230601.gappssmtp.com; s=20230601; t=1723076675; x=1723681475; darn=gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=wBYU48VBcYLppXAj+qfhFyXhd3mEGMe728tZVSGZx5s=; b=H/ii30Y3Lvx5btA2lD3CyT95mBnrkQwocqmBDXY8qM/WcHOjMQTu9ocCK7/siQPcJo raWzZcr/jNUNHDodONQSu38pbWq9mvc/1b+EG7X9rAKLAU+A7B+Ki1sQD2F7Q8S5gQ3G IRR+uClTj82xEPo7bj/lmYPfT/nP1LCThp0sDwzHq+/tMNIkoSo6/LUlsLRjaBWQ8Trd AOVbNazc+AZYlGJPeRfEVBcQHsxlmZInMHqLXGGET31ZI/SJgOpzKHUQplPAJ2OUfkM+ o0f0EsDXcNjyZBKlE14iOXwH/FsADaDsRiNy8tzI2sfv6pupdB7NSnjj2Y/Dripr0WVk udvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723076675; x=1723681475; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=wBYU48VBcYLppXAj+qfhFyXhd3mEGMe728tZVSGZx5s=; b=w0iyoXNa2lMknmeYMMpOVLQ5GnTSe4TtOG44r8c3+KKJn+BdCrvxR728XkPsFBvE0c 1IGsEGxZ7Fr5UrJuTZG6P4kpdLCwqa8uk6SUvRuxRpcRYQO8QwlXDE1Z28qLB4ZdeUdV am3VEOXFpV3rkSMBf+I7Wus0euPJpALx7dRpytv+HL5zo9e8On5ncpQXnfGaO9x1qev4 LYwQjoMZPX/azuS4radzqtDxpFzJJblXLOxbBgNI6hqw7up7Usl8p35DREBOGDdGJBSK eBAnCvQ6t5SuGC9xro8IRCNOex9gmIDloDnaUX1HAmlMnTNdLEja2vdg++DeACehH4Lg 9knQ== X-Gm-Message-State: AOJu0YxvDCY5HEOxKFoy/d44e+XZVqq1dxONOsq/i9lFAfFXDrMMBQqY sVBx8ulzUk3hsBFaTIyQZ0o7yFXgEufKiDTIAIG/AayGZeHL4YRJzwBHizlB2B0XMGF6iPOJmpI X3UY/7CkaBHfDvZkzxz1W482OZ+fmlTRn5fpk/TL96hEBR1niI6U= X-Google-Smtp-Source: AGHT+IFPncc9P3cWglxCUVouZhNu33ZD/BO4S+pbIMvYfBHrMHGHqaThm2/y3lekBijs4aiPD0iVUV6T7XlwrcJLxcs= X-Received: by 2002:a05:6512:ea0:b0:52e:f367:709b with SMTP id 2adb3069b0e04-530e5891effmr99836e87.42.1723076674348; Wed, 07 Aug 2024 17:24:34 -0700 (PDT) MIME-Version: 1.0 From: Kai Jellinghaus Date: Thu, 8 Aug 2024 02:24:23 +0200 Message-ID: Subject: Respect channel directory for 'guix channel To: guix-devel@gnu.org Content-Type: text/plain; charset="UTF-8" Received-SPF: none client-ip=2a00:1450:4864:20::229; envelope-from=kaij@j10-labs.com; helo=mail-lj1-x229.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: 380436683A X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -9.09 X-Spam-Score: -9.09 X-TUID: aUAqROvIM3pl I'm aware it's a bit of a special use-case but I'm wondering whether it'd be possible to respect the channel directory (from .guix-channel) when looking for self-build.\? I've managed to get it somewhat working (by modifying guix/channels.scm when looking for the file, and when applying patches). It does cause some unnecessary loads of .guix-channel, and my guille knowledge hasn't progressed to the point that I could figure out how to structure it differently. There may also be some concern that this will fail too early for an invalid 'guix channel? Not sure. Here's a patch (not possible to apply as-is, sorry, the hashes will be off) --- guix-channel/guix/channels.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/guix-channel/guix/channels.scm b/guix-channel/guix/channels.scm index 34f63eb833..de9c239872 100644 --- a/guix-channel/guix/channels.scm +++ b/guix-channel/guix/channels.scm @@ -455,7 +455,10 @@ (define (dot-git? file stat) (when (guix-channel? channel) ;; Apply the relevant subset of PATCHES directly in CHECKOUT. This is ;; safe to do because 'switch-to-ref' eventually does a hard reset. - (apply-patches checkout commit patches)) + (apply-patches + (string-append checkout (channel-metadata-directory + (read-channel-metadata-from-source checkout))) + commit patches)) (let* ((name (url+commit->name (channel-url channel) commit)) (checkout (add-to-store store name #t "sha256" checkout @@ -717,7 +720,9 @@ (define name (symbol->string (channel-name (channel-instance-channel instance)))) (define source - (channel-instance-checkout instance)) + (string-append + (channel-instance-checkout instance) + (channel-metadata-directory (channel-instance-metadata instance)))) (define commit (channel-instance-commit instance)) -- 2.46.0