From patchwork Wed Mar 15 12:51:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 48020 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 58CD216CB3; Wed, 15 Mar 2023 12:52:53 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4623F16C76 for ; Wed, 15 Mar 2023 12:52:50 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcQbz-0003RN-3z; Wed, 15 Mar 2023 08:52:11 -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 1pcQbv-0003QB-Hf for guix-patches@gnu.org; Wed, 15 Mar 2023 08:52:07 -0400 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 1pcQbt-000399-J7 for guix-patches@gnu.org; Wed, 15 Mar 2023 08:52:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcQbt-0001ZD-Dm for guix-patches@gnu.org; Wed, 15 Mar 2023 08:52:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62202] [PATCH 06/21] import: juliahub: Add updater and recursive-importer. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Mar 2023 12:52:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62202 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62202@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 62202-submit@debbugs.gnu.org id=B62202.16788847095874 (code B ref 62202); Wed, 15 Mar 2023 12:52:05 +0000 Received: (at 62202) by debbugs.gnu.org; 15 Mar 2023 12:51:49 +0000 Received: from localhost ([127.0.0.1]:39306 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcQbd-0001Wa-57 for submit@debbugs.gnu.org; Wed, 15 Mar 2023 08:51:49 -0400 Received: from 15.mo581.mail-out.ovh.net ([87.98.180.21]:52681) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcQba-0001Vs-9a for 62202@debbugs.gnu.org; Wed, 15 Mar 2023 08:51:47 -0400 Received: from director3.ghost.mail-out.ovh.net (unknown [10.108.4.253]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 296B12258B for <62202@debbugs.gnu.org>; Wed, 15 Mar 2023 12:51:44 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-gf8xs (unknown [10.110.103.57]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 7594B1FE65; Wed, 15 Mar 2023 12:51:43 +0000 (UTC) Received: from ngraves.fr ([37.59.142.107]) by ghost-submission-6684bf9d7b-gf8xs with ESMTPSA id /J2sIF+/EWR+CQAAW2kIng (envelope-from ); Wed, 15 Mar 2023 12:51:43 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-107S0014f05d24b-e775-4662-bee9-0b846d223a5d, F74D9BBE9ED44B45FF66447495DD0B0753EB5D4A) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 Date: Wed, 15 Mar 2023 13:51:15 +0100 Message-Id: <20230315125130.23041-6-ngraves@ngraves.fr> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230315125130.23041-1-ngraves@ngraves.fr> References: <20230315125130.23041-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 13790022061887840994 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrvddvkedggeegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepffelffdtieeijedugffgvddvieetheegveehueeggfegleehleekffehtdeuuefhnecuffhomhgrihhnpehjuhhlihgrhhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpfeejrdehledrudegvddruddtjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepiedvvddtvdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekuddpmhhouggvpehsmhhtphhouhht 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches --- guix/import/juliahub.scm | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm index fb361a0044..c38c830caa 100644 --- a/guix/import/juliahub.scm +++ b/guix/import/juliahub.scm @@ -34,7 +34,9 @@ (define-module (guix import juliahub) #:use-module (json) #:use-module ((guix licenses) #:prefix license:) - #:export (juliahub->guix-package)) + #:export (juliahub->guix-package + %juliahub-updater + juliahub-recursive-import)) (define (juliahub-uri name) (let* ((url (string-append "https://docs.juliahub.com/" name "/")) @@ -197,16 +199,26 @@ (define* (juliahub->guix-package package-name (append dependencies-names test-dependencies-names)))) (values #f '())))) +(define (guix-package->juliahub-name package) + (let* ((url (juliahub-package-url package)) + (git-name (car (last-pair (string-split url #\/)))) + (ungitted-name (if (string-suffix? ".git" git-name) + (string-drop-right git-name 4) + git-name)) + (package-name (if (string-suffix? ".jl" ungitted-name) + (string-drop-right ungitted-name 4) + ungitted-name))) + package-name)) + (define* (import-release package #:key (version #f)) "Return an for the latest release of PACKAGE." (let* ((package-name (guix-package->juliahub-name package)) (package (juliahub-fetch package-name)) - (version (or version (juliahub-version gem))) - (url (rubyjuliahubs-uri gem-name version))) + (version (or version (juliahub-package-version package)))) (upstream-source (package (package-name package)) (version version) - (urls (list url))))) + (urls (list (juliahub-package-url package)))))) (define %juliahub-updater (upstream-updater @@ -219,5 +231,5 @@ (define* (juliahub-recursive-import package-name #:optional version) (recursive-import package-name #:repo '() #:repo->guix-package juliahub->guix-package - #:guix-name ruby-package-name + #:guix-name julia-name->guix-name #:version version))