From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id GMh4EIJp52NeEAAAbAwnHQ (envelope-from ) for ; Sat, 11 Feb 2023 11:10:10 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id wAV/EIJp52M0ZgEA9RJhRA (envelope-from ) for ; Sat, 11 Feb 2023 11:10:10 +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 2125F26FC8 for ; Sat, 11 Feb 2023 11:10:10 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmop-0004sk-6W; Sat, 11 Feb 2023 05:09:19 -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 1pQmob-0004nr-BP for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:08 -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 1pQmoa-00009G-F5 for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmoa-0004CS-BB for guix-patches@gnu.org; Sat, 11 Feb 2023 05:09:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61420] [PATCH 08/31] import: hackage: Use upstream-name property. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:09:04 +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: 61420@debbugs.gnu.org Cc: Lars-Dominik Braun Received: via spool by 61420-submit@debbugs.gnu.org id=B61420.167611013415975 (code B ref 61420); Sat, 11 Feb 2023 10:09:04 +0000 Received: (at 61420) by debbugs.gnu.org; 11 Feb 2023 10:08:54 +0000 Received: from localhost ([127.0.0.1]:38866 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoQ-00049V-4r for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:54 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:34006) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmoH-00046S-6n for 61420@debbugs.gnu.org; Sat, 11 Feb 2023 05:08:46 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4PDRBs5bPnz9sct; Sat, 11 Feb 2023 11:08:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1676110117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=C3HB5SFk4WX9OxVAJbPys7QyQzJJ3Jupv4d+mbJHNg8=; b=HS0Pbb/KnpV5LNHALMIY+w1ILBgTXBmmdVT6uDpDIqWYsErG1LPVvZUi9JKAft+6FqGc6W pSGvGjJyHMX4WCaApbiIbWVN21DDi9zAcYSnMAXHWKCIER0kBNMITHp6fQYute0NQeag1m IrMMPD+OuYAbEDGC++D3LCyWTnV82cS3qH2+Wag80eU3m8zxDUv1NGP9MOdgSzfYJ4BFPO BN8TJu0pqSCtw5mtekQEq3pCJze7Dl9336WcjOKHK7Yy1YGFWEbhKD+50KqJUzlblzZL8w xX5WQCLltWgU5a4zBMwzSxvxiTO7/ZJLXOUL5KmOswVQfp7rppgcGiDiW7UIYw== From: Lars-Dominik Braun Date: Sat, 11 Feb 2023 11:08:04 +0100 Message-Id: <20230211100825.47971-7-lars@6xq.net> In-Reply-To: <20230211100825.47971-1-lars@6xq.net> References: <20230211100825.47971-1-lars@6xq.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1676110210; a=rsa-sha256; cv=none; b=h28ckV9kFjG8dnaEnduCWUYmA2ZtfhsBr+G4pYV5FoPaDPPL1hw6MGmzjGIKdtqyTj03x1 qYcPDZMWqhtmo4alI8YBswDYY1DYTCoE5sccGQw6dWxWDlQryCGz9K/qcB2s9k+g2k8iWO 0Okrm0z9wgTRqa19c0/bXn8s4Bgu5uBpM1wHniq1afYsw0Q6h/s6Jjw94ix55kZRQUJqdl Dx8dPQ+3wqfNdB6A2jgtGkmfcGWCxtAcgIQ+lw2YLbKgP5WItBxdykuh6Hu+y0tsokZZEz ZCK5tJxDMgtU4NCUj4BIKA/uhV0XD8+i91296nNQmnsngqGslk4l3wHD6Maj+g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=6xq.net header.s=MBO0001 header.b="HS0Pbb/K"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=6xq.net (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=1676110210; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=C3HB5SFk4WX9OxVAJbPys7QyQzJJ3Jupv4d+mbJHNg8=; b=SaYrsjFBY3P9khQxwmpY5LYEoKBLAka6G1GwipxZZTwF0Kq+qZXXUDJl+jS6+EXcIOH1dk SX7ebINY8d5QeRocveeWzEv8IvgrhXhphbkj1Oh5B7/FxAUnm4lHml4LDZsbxEzbwd2htV pv26m5TmceUD6SAXa/TRfl4YZA0Ee+4AEKea/ZbCYzpNXzpwBhgpA1kWdFov5Nr/4ipE3C uif9+LVb/M7KuERbW0Cg+jAKh/XgexAJ1YOnjDmhwxaL2q3aBQhYKgoss0z4GZMUlVvrlY lPSgH5/MGzv0lnognCQ8NHdFkpNNocviliFZJ4fTp5nP9y1CAKembbHxmfE1kg== Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=6xq.net header.s=MBO0001 header.b="HS0Pbb/K"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=6xq.net (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" X-Migadu-Spam-Score: 7.30 X-Spam-Score: 7.30 X-Migadu-Queue-Id: 2125F26FC8 X-Migadu-Scanner: scn1.migadu.com X-TUID: 1lglZEDzZeJT * 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. --- guix/import/hackage.scm | 14 +------------- guix/import/stackage.scm | 4 ++-- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index 9e305cf080..2f901af47b 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -52,7 +52,6 @@ (define-module (guix import hackage) hackage-recursive-import %hackage-updater - guix-package->hackage-name hackage-name->package-name hackage-fetch hackage-source-url @@ -126,17 +125,6 @@ (define (hackage-name->package-name name) (string-downcase name) (string-append package-name-prefix (string-downcase name)))) -(define guix-package->hackage-name - (let ((uri-rx (make-regexp "(https?://hackage.haskell.org|mirror://hackage)/package/([^/]+)/.*")) - (name-rx (make-regexp "(.*)-[0-9\\.]+"))) - (lambda (package) - "Given a Guix package name, return the corresponding Hackage name." - (let* ((source-url (and=> (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))))))) - (define (read-cabal-and-hash port) "Read a Cabal file from PORT and return it and its hash in nix-base32 format as two values." @@ -371,7 +359,7 @@ (define* (latest-release package #:key (version #f)) (formatted-message (G_ "~a updater doesn't support updating to a specific version, sorry.") "hackage"))) - (let* ((hackage-name (guix-package->hackage-name package)) + (let* ((hackage-name (package-upstream-name* package)) (cabal-meta (hackage-fetch hackage-name))) (match cabal-meta (#f diff --git a/guix/import/stackage.scm b/guix/import/stackage.scm index 9462e70791..735eeb75f7 100644 --- a/guix/import/stackage.scm +++ b/guix/import/stackage.scm @@ -149,7 +149,7 @@ (define latest-lts-release (formatted-message (G_ "~a updater doesn't support updating to a specific version, sorry.") "stackage"))) - (let* ((hackage-name (guix-package->hackage-name pkg)) + (let* ((hackage-name (package-upstream-name* pkg)) (version (lts-package-version (packages) hackage-name)) (name-version (hackage-name-version hackage-name version))) (match (and=> name-version hackage-fetch) @@ -173,7 +173,7 @@ (define (stackage-lts-package? package) (false-if-networking-error (let ((packages (stackage-lts-packages (stackage-lts-info-fetch %default-lts-version))) - (hackage-name (guix-package->hackage-name package))) + (hackage-name (package-upstream-name* package))) (find (lambda (package) (string=? (stackage-package-name package) hackage-name)) packages))))) -- 2.38.2