From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id EE0nMKy/EWT2ZgAASxT56A (envelope-from ) for ; Wed, 15 Mar 2023 13:53:00 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id wOIsMKy/EWRmWAAA9RJhRA (envelope-from ) for ; Wed, 15 Mar 2023 13:53:00 +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 798E639713 for ; Wed, 15 Mar 2023 13:53:00 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pcQc2-0003Up-Vy; Wed, 15 Mar 2023 08:52:15 -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 1pcQbz-0003RO-54 for guix-patches@gnu.org; Wed, 15 Mar 2023 08:52:11 -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 1pcQbw-00039m-3u for guix-patches@gnu.org; Wed, 15 Mar 2023 08:52:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pcQbv-0001Zw-T6 for guix-patches@gnu.org; Wed, 15 Mar 2023 08:52:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62202] [PATCH 12/21] import: juliahub: Handle the case where we have a subdirectory. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 15 Mar 2023 12:52:07 +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.16788847245996 (code B ref 62202); Wed, 15 Mar 2023 12:52:07 +0000 Received: (at 62202) by debbugs.gnu.org; 15 Mar 2023 12:52:04 +0000 Received: from localhost ([127.0.0.1]:39325 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcQbr-0001YR-FT for submit@debbugs.gnu.org; Wed, 15 Mar 2023 08:52:03 -0400 Received: from 11.mo581.mail-out.ovh.net ([87.98.173.157]:51159) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pcQbl-0001XN-K7 for 62202@debbugs.gnu.org; Wed, 15 Mar 2023 08:51:58 -0400 Received: from director2.ghost.mail-out.ovh.net (unknown [10.109.138.153]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 96C5223998 for <62202@debbugs.gnu.org>; Wed, 15 Mar 2023 12:51:56 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-r6rck (unknown [10.111.208.70]) by director2.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 35F261FEAA; Wed, 15 Mar 2023 12:51:55 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-6684bf9d7b-r6rck with ESMTPSA id 4Q87DGu/EWS+BgAA9fVuhw (envelope-from ); Wed, 15 Mar 2023 12:51:55 +0000 X-OVh-ClientIp: 81.67.140.142 Date: Wed, 15 Mar 2023 13:51:21 +0100 Message-Id: <20230315125130.23041-12-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 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 13793399762104738530 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrvddvkedggeegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvddtfeeuueehgfduffehgedtlefguefggedvgfevjeeikeeuvdetgeeuudeltdefnecuffhomhgrihhnpehjuhhlihgrhhhusgdrohhrghenucfkphepuddvjedrtddrtddruddpfeejrdehledrudegvddruddtudenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepiedvvddtvdesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekuddpmhhouggvpehsmhhtphhouhht 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 From: Nicolas Graves via Guix-patches via 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-Authentication-Results: i=1; aspmx1.migadu.com; dkim=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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1678884780; a=rsa-sha256; cv=none; b=Vyd84DhuQUtKfCw3BtPW0K9KIqO1/UUb3yrGynDzwYjtkQYRtiUMJrBHIizW7lZuJxQUwU mZV6Y8VfYTo1tr2fhMNBseGv+9J27HQ8CcGHalSAOE7+HASPIbwjgX5kPkVuyUCW+CoGlM GeA5ot8hd4feSQ5xgJPGsVnW94iplegPrroPz98jNQlBkify8bB+sNCZOGTTzgJ1QgbV4V 3sW9ASBx9njaI9ujv1rTDXMNzKcsko+F9tavwM3pc1jwRrm+GHvueraoibWCte1NKBS9cm 61KzfcyqqeVM3THw+fWt9FKbjzR201kZSce0Br2VaiRSGKGDAM2uxvSF1abD/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1678884780; h=from:from:sender:sender:reply-to: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; bh=k4cEMCrpYMDbgkn0LzUwVexuV5QI08/PWyvCNIZt+co=; b=QuFKIugLu2hl5aLfuZUh/O5YYJ7XzVd965yiRWXlno4QtrCS+yoLSW1LmVgnfQA3rXzK61 EKxG7w8wg8v/O2i0tSjxHLIzM6GSf9jMdoVSGazCpoTF2mBXAM9SPAtTPApctm+MgqLkuW 7UjV/ps7KdazX+7yRa3TYX5RDA0yeqpK44dShJzbyijkL+NH5oUbZsdyis7lI2IF7Fnz8f lC3VAWRSIuK12kfzJ/U5VszpgPaGVEdFBzWomqw1B3z3kqPaGhZwJ7jwFl3+zVo7wnb4LY vw+ZpiqegVyt5x0nMYDGk3sQzyYW3QTr452ZI4Ju9vvTLNNbVsKH5KiqDfFSMQ== X-Migadu-Spam-Score: -1.73 X-Spam-Score: -1.73 X-Migadu-Queue-Id: 798E639713 X-Migadu-Scanner: scn1.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=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"; dmarc=pass (policy=none) header.from=gnu.org X-TUID: e23Vpl+ORynP --- guix/import/juliahub.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm index 2ea461b72a..b646f93295 100644 --- a/guix/import/juliahub.scm +++ b/guix/import/juliahub.scm @@ -233,14 +233,12 @@ (define (make-julia-sexp name source home-page synopsis description ((license) (license->symbol license)) (_ `(list ,@(map license->symbol licenses))))))) -;; TODO handle subdir case properly. - (define* (juliahub->guix-package package-name #:key version #:allow-other-keys) "Fetch the metadata for PACKAGE-NAME from juliahub.org, and return the `package' s-expression corresponding to that package, or #f on failure. Optionally include a VERSION string to fetch a specific version juliahub." - (let* ((package-toml (ini-fetch (general-url name "Package.toml"))) + (let* ((package-toml (ini-fetch (general-url package-name "Package.toml"))) (subdir (assoc-ref package-toml 'subdir)) (tag (latest-git-tag (assoc-ref package-toml 'repo))) (package (if version @@ -264,7 +262,11 @@ (define* (juliahub->guix-package package-name (licenses (map spdx-string->license (list (juliahub-package-license package)))) - (test-dependencies-names (parse-test-dependencies directory))) + (test-dependencies-names + (if subdir + (parse-test-dependencies + (string-append subdir "/" directory)) + (parse-test-dependencies directory)))) (values (make-julia-sexp package-name source -- 2.39.2