From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id UOJWFzC97GPXLAAAbAwnHQ (envelope-from ) for ; Wed, 15 Feb 2023 12:08:32 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 4KxhFjC97GOLJAEAG6o9tA (envelope-from ) for ; Wed, 15 Feb 2023 12:08:32 +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 017564EE9 for ; Wed, 15 Feb 2023 12:08:31 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=pwdi5JwD; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1676459312; 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: 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=4UWfX97gCjtanYer9ubf6Yb9unEv7KlXeUi3VO6yE6A=; b=ogOcoOciao5A5SWDtt8Ga8z15Ljv8ZfSH3JQuJ/aPSg3/XD9jNVlnI7W2kwEVpdiU9CJXF L/ZKWYaqdWY8d3jWMFl/9WO/mz+3HUs06etOgZCvz0B30G+5W827SGOmeMHLrm31E55K7c k6brUL2g5IzuzoA4CLj04Qa/ppTs/hTvSH3NPmLAqgfqJD8OURhoD4CYch1wTtSMUNrg7E GUIW+LFGPwEaIe9HlhNUsvuyl/o/Tlp7i4zrhTaa9NMzkvaRltznwQXhNAOczwZii8UyXR MM0uBL9NIBSCW1FWYE4Mf2AtVtWL/sjRgwuBPCVyzdYRm9VMJ1fMvGC4k9iTwA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=pwdi5JwD; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1676459312; a=rsa-sha256; cv=none; b=k9snec3gbdV4fIFu69csyLq1/RUU7Jk8yX284CFTw5p0eooiXdUo3cbzb5tGtgP3maYyJK QAqqzmM+Px0vD4jyCS63oKc8z0+BTqU67GM+guzwULB60MdnJbiT+xYa8RVBpR16H81SeW BQjR8wbjm7xXpXI7MD3GGuhIMf0pTUnQNzMkrwJiz89D/h0GDXqmV0Xb/jmga8MOeX239C 6LuX6rr8EzUbrPavkgqt2sc/oL9KyJ+MzEjdBABsbqa8s7BJmIBoihoujpjl3aFLIGP3T2 ORCTOPYOSzSCsmKZnJ+VT3MzN/kMShr6RnLpbbRb9YIJiwUd8AlhwtALTNISSg== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pSFds-0003FO-AR; Wed, 15 Feb 2023 06:08:04 -0500 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 1pSFdq-0003Er-QS for guix-patches@gnu.org; Wed, 15 Feb 2023 06:08:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pSFdq-00076r-Fb for guix-patches@gnu.org; Wed, 15 Feb 2023 06:08:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pSFdq-0008Fp-5W for guix-patches@gnu.org; Wed, 15 Feb 2023 06:08:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 08/31] import: hackage: Use upstream-name property. Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Feb 2023 11:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61420 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Lars-Dominik Braun , 61420@debbugs.gnu.org Cc: Lars-Dominik Braun Received: via spool by 61420-submit@debbugs.gnu.org id=B61420.167645923431648 (code B ref 61420); Wed, 15 Feb 2023 11:08:02 +0000 Received: (at 61420) by debbugs.gnu.org; 15 Feb 2023 11:07:14 +0000 Received: from localhost ([127.0.0.1]:57969 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSFd3-0008EO-H7 for submit@debbugs.gnu.org; Wed, 15 Feb 2023 06:07:13 -0500 Received: from mail-wr1-f42.google.com ([209.85.221.42]:41781) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pSFd0-0008E2-OG for 61420@debbugs.gnu.org; Wed, 15 Feb 2023 06:07:12 -0500 Received: by mail-wr1-f42.google.com with SMTP id bu23so18708000wrb.8 for <61420@debbugs.gnu.org>; Wed, 15 Feb 2023 03:07:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1676459225; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id :reply-to; bh=4UWfX97gCjtanYer9ubf6Yb9unEv7KlXeUi3VO6yE6A=; b=pwdi5JwDZZgaKLPMKlqd1RAKPnxJteOkFw1TRobnzzAQJ9lyT3wJhSHWZH0VE4wjjo tbG9hqKHqqIFm0dpU0S/Un93sprBsqdYPXUh8oRZsiwkNltBnzXAhcmjsqztgGvmDaiD ePjC5HwiJ3WVjECoSDjKv1vEpFCkpNpd1lVG33DknifqUlVVKahoxXDAaGn8FFicNwC1 IKiA6d8pNJOntY7mhux8BM54wBulZEMkbtbU+fwxWnIJEdEhUTc41DtNJRwlktYJtAEB 2lRAU7A/3RCsEtCl0ughC1tuMm+/I9mnKzzQC4Xv4NMXuP/tE8vwmT39Rm/v4MEbuvms 3AvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1676459225; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4UWfX97gCjtanYer9ubf6Yb9unEv7KlXeUi3VO6yE6A=; b=EbCnQBAbrMlGIuJ4Kk8sHSOz4G4htBTY0X8Nmaw3dUo8mklQVj46OP/OHcAjzxgA36 uGj+jpJD/dqv7/gcy1oBPzU3dU4Kx2O33iav203WzWgt3BgjUuMyveahhUmLr1kZzuAB oD9fYQDCjlEfYHAqs+nRFQLvxgoXv45rnbLPzvw4XAUN6Yre8hpFY4GdsPUb4xwliMJS ZwmuQSj/vkbKbzO6NXgxjsOYOZQhGNH9JEY066zRlB+NDjKLDc22apI37ayzzaobQ4rH FblXMopQ5DLASt79co8Ce2tKnSj2wzFY+1Ugi+VFfg+jRQAPfJdEXJ9OGMZtxIrN/+DE 24/A== X-Gm-Message-State: AO0yUKXfnHXNYx3WB8CFxoy0pn3U6Js2iB4PXm4LVFAuDOfY0plr3df1 A3Dd8DFx44mg0+G5jUXBKMU= X-Google-Smtp-Source: AK7set9zP1p44O3u5wDM5LBOENcznD6qd5TMTJUxk7ktiUqsV/5VbrBEMotVnb2i8/OrSWFbQpa36A== X-Received: by 2002:adf:dd82:0:b0:2c3:d296:7a94 with SMTP id x2-20020adfdd82000000b002c3d2967a94mr934221wrl.3.1676459224839; Wed, 15 Feb 2023 03:07:04 -0800 (PST) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id v15-20020adfebcf000000b002c3f81c51b6sm15291619wrn.90.2023.02.15.03.07.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Feb 2023 03:07:04 -0800 (PST) From: zimoun In-Reply-To: <20230211100825.47971-7-lars@6xq.net> References: <20230211100825.47971-1-lars@6xq.net> <20230211100825.47971-7-lars@6xq.net> Date: Wed, 15 Feb 2023 11:48:00 +0100 Message-ID: <867cwjfbmn.fsf@gmail.com> 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: X-Migadu-Queue-Id: 017564EE9 X-Spam-Score: 5.89 X-Migadu-Spam-Score: 5.89 X-Migadu-Scanner: scn0.migadu.com List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-TUID: EhtjFR7R3FuM Hi, On Sat, 11 Feb 2023 at 11:08, Lars-Dominik Braun wrote: > * guix/import/hackage.scm (guix-package->hackage-name): Removed. > (latest-release): Use package-upstream-name* instead. > * guix/import/stackage.scm (latest-lts-release): Ditto. > (stackage-lts-package?): Ditto. > -(define guix-package->hackage-name > - (let ((uri-rx (make-regexp "(https?://hackage.haskell.org|mirror://hac= kage)/package/([^/]+)/.*")) > - (name-rx (make-regexp "(.*)-[0-9\\.]+"))) > - (lambda (package) > - "Given a Guix package name, return the corresponding Hackage name." > - (let* ((source-url (and=3D> (package-source package) origin-uri)) > - (name (match:substring (regexp-exec uri-rx source-url) 2))) > - (match (regexp-exec name-rx name) > - (#f name) > - (m (match:substring m 1))))))) Why not just do a drop-in replacement of the implement of =E2=80=99guix-package->hackage-name=E2=80=99 by the implementation of =E2=80=99package-upstream-name*=E2=80=99? Other said, avoid to introduce a new procedure and remove another; and instead just replace the implementation of the old by the new. > - (let* ((hackage-name (guix-package->hackage-name package)) > + (let* ((hackage-name (package-upstream-name* package)) It would avoid all these kind of replacement, no? Cheers, simon