From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id iKtjDiYZV2GAEAAAgWs5BA (envelope-from ) for ; Fri, 01 Oct 2021 16:20:22 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id yCIaCiYZV2EtDwAA1q6Kng (envelope-from ) for ; Fri, 01 Oct 2021 14:20:22 +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 F23EE1B0B6 for ; Fri, 1 Oct 2021 16:20:21 +0200 (CEST) Received: from localhost ([::1]:36570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mWJOe-0005WS-C2 for larch@yhetil.org; Fri, 01 Oct 2021 10:20:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mWJOM-0005Um-UN for guix-patches@gnu.org; Fri, 01 Oct 2021 10:20:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45258) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mWJOM-0004C2-Ls for guix-patches@gnu.org; Fri, 01 Oct 2021 10:20:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mWJOM-0005Qm-Dc for guix-patches@gnu.org; Fri, 01 Oct 2021 10:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50515] [PATCH 2/2] website: Add 'computed-origin-method' packages to 'sources.json'. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Oct 2021 14:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50515 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50515@debbugs.gnu.org, ludo@gnu.org Received: via spool by 50515-submit@debbugs.gnu.org id=B50515.163309797620837 (code B ref 50515); Fri, 01 Oct 2021 14:20:02 +0000 Received: (at 50515) by debbugs.gnu.org; 1 Oct 2021 14:19:36 +0000 Received: from localhost ([127.0.0.1]:56804 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJNv-0005Q1-Vu for submit@debbugs.gnu.org; Fri, 01 Oct 2021 10:19:36 -0400 Received: from mail-wr1-f41.google.com ([209.85.221.41]:47022) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mWJNr-0005Pl-Hl for 50515@debbugs.gnu.org; Fri, 01 Oct 2021 10:19:34 -0400 Received: by mail-wr1-f41.google.com with SMTP id k7so15636718wrd.13 for <50515@debbugs.gnu.org>; Fri, 01 Oct 2021 07:19:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:references:date:in-reply-to:message-id:user-agent :mime-version:content-transfer-encoding; bh=ZQ6x5xq+7Ip5nBTrKiVPFp9KEio7vzsVTNoKUXhQiGs=; b=T01zpNi5wBuHtvoORWwFKN18sE14h7GnjWQg/FCDK2HaRaL+dOSj4OI6QB9TkygtCm 6+HPVi6mE2v/Ve6jvbIMMnj1OS3uOUWoFTiUk+FR9lDLojpY59IzouVt8Z6Mb/CiEJtt lvYEygQWm+yhM7nxNDExZh4HYii7hySUSBgJqOBA3bMxKoQBfsJcP7W7AbZ0AQ31aThm Rw/JyP4bbm1ey6gVk73MyYxm0DA5Xi+KqLOXp+NTP3uUNw1KBWPEq3vTebgclL/q6UxW 5Dh8b23Q/UE+rbsHYrWw+L77eh/9YE21pZt9VRuvliEVpuvqXrJ0lkZvCWEfUQj89Ko2 PK1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=ZQ6x5xq+7Ip5nBTrKiVPFp9KEio7vzsVTNoKUXhQiGs=; b=XcwmGAARDjpHzz1L8mDFVhR4eJFqYR/luIy1Enqhph+9R/BYy2JMXHlIC3RpfYMhwQ OoqxLp69UAJFRv1JjNMNN9zPNmfG8RhCjYuSF8RjRBu8C/jN4i98HbasInbEXwLxtw+q B8KRg1gGbdsNAizgVQqhP5PUSD5QQtuBONCsNBxm4mu8znR5CMN7uJawdKS2LqI/zmqa 8MWtkOVH1W3UJcHDjsQyrYASLroK1QY2D8aHU6cuQhIx95x6ckkwjtXcWbmCyEKAV0Wz xMcL1wKbfM3h2ei5Z+Kr9DZOWbuKbvb9HyU8t6MkLU4x+279XjhWUHqMtNoQu08DYdz/ visw== X-Gm-Message-State: AOAM530fBAgMJn9h7Dg834rBjVxnA1ynBlpjPD2WMrz2cpxEw3B8F5wu EcYb0nf++ssWMbdt/bh563Y= X-Google-Smtp-Source: ABdhPJwr/kzs+ZMMVTZfXQtoCTMOW5UKTEmmkNtDOyu9p6fzoKUl1kgPhfI1CkZdIvuVJ4yaf03maw== X-Received: by 2002:adf:ab19:: with SMTP id q25mr3330747wrc.64.1633097965570; Fri, 01 Oct 2021 07:19:25 -0700 (PDT) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id h11sm5267457wru.10.2021.10.01.07.19.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Oct 2021 07:19:25 -0700 (PDT) From: zimoun References: <20210911002608.14074-1-zimon.toutoune@gmail.com> <20210911002608.14074-2-zimon.toutoune@gmail.com> Date: Fri, 01 Oct 2021 16:16:16 +0200 In-Reply-To: <20210911002608.14074-2-zimon.toutoune@gmail.com> (zimoun's message of "Sat, 11 Sep 2021 02:26:08 +0200") Message-ID: <86wnmwakzz.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1633098022; 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: content-transfer-encoding:content-transfer-encoding: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=ZQ6x5xq+7Ip5nBTrKiVPFp9KEio7vzsVTNoKUXhQiGs=; b=vDdXYPA6tW8uwW88A0gdbYKR7Vydzo+VMXePIK/i0aCigq3YvSr9BguIWYl48PgmaQFm+K XLW8dbOoBK3eJ4BkQHDEo+BAFXwFGDI1K+I46TUln50DrFHsIoQGEU+3vVetLz3rbIySgo VibXpJ/XMMiBUD/DDoz1WjLaO2fmG/mFJO3pbq5NHOsH9HLi3Bg/Cn07asFEKMitsJHKcW /H6woogqOrdJ8Ne007VmtUu2tdHpjtFIXyniBWr9OApywqvS5haNAMyZfHOlAKs65lIB+b 7Y3PmSnmErITHeQ7fXM5NkYHJAtlM6UR4Su9lIJjV1Kxy/D4ZS1XQ3Z8I2+qFQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1633098022; a=rsa-sha256; cv=none; b=srCS3JAR/wp/FB8tnfpIWVNpgMFn/RcxHoh9jmNiKPh28ptQFLKMKu5HEJ9rJ8OyY0v5JQ URhvmrzRNZoUGeu22pqnmQmaxdW61vPep933G4+xiblKRsr9uz1U7PaF5yDjLPtt9OK4gU o4Hk0jmZbDe4zMuAdJx1lvBoTxBhMSFvARk77sHcNAljCkISRwfgP9i84btpmSnxwqa+Nn EvQVAxWUqQbjhDBROtoMknWsehvJQeRp0gbmw3Bm/RhsJu7Le6dndFW8HJko1irq1cvwF0 NBLKHKwmCY7lpOs1+I1fMk6hI9TFwXmuEv/8a6+rlKTluRKV6ccC3zmUR8QKHw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=T01zpNi5; 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-Migadu-Spam-Score: -1.30 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=T01zpNi5; 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-Migadu-Queue-Id: F23EE1B0B6 X-Spam-Score: -1.30 X-Migadu-Scanner: scn0.migadu.com X-TUID: 6k1kqhrKFZ/o Hi, Thanks for 50620. However, because the package guix had not been updated in the same time =E2=80=93 see [2/2] of 50620 =E2=80=93 it makes co= nvoluted to avoid: --8<---------------cut here---------------start------------->8--- ERROR: In procedure %resolve-variable: error: computed-origin-method: unbound variable --8<---------------cut here---------------end--------------->8--- The package guix supports the previous location and as soon as it will be updated the new location will be effective. Because I am not convinced that people (at least me) will track that; to make it work with both locations means something along these lines: --8<---------------cut here---------------start------------->8--- (define computed-origin-method? (catch #t (lambda _ (define computed-origin-method (@@ (guix packages) computed-origin-method)) (lambda (method) (eq? method computed-origin-method))) (lambda _ (lambda (method) (or (eq? method (@@ (gnu packages linux) computed-origin-method)) (eq? method (@@ (gnu packages gnuzilla) computed-origin-metho= d))))))) (if (computed-origin-method? method) ;; Packages in gnu/packages/gnuzilla.scm and gnu/packages/linux.scm ;; represent their 'uri' as 'promise'. (match uri ((? promise? promise) [...] ;;Regular packages represent 'uri' as string. `((type . ,(cond ((or (eq? url-fetch method) [...] --8<---------------cut here---------------end--------------->8--- Update the package guix reduces to just: --8<---------------cut here---------------start------------->8--- (if (eq? method (@@ (guix packages) computed-origin-method)) ;; Packages in gnu/packages/gnuzilla.scm and gnu/packages/linux.scm ;; represent their 'uri' as 'promise'. (match uri ((? promise? promise) [...] ;;Regular packages represent 'uri' as string. `((type . ,(cond ((or (eq? url-fetch method) [...] --8<---------------cut here---------------end--------------->8--- which had been the original aim of 50620. Could you please update the package guix? See [2/2] of 50620. :-) Or do I miss something? Cheers, simon