From patchwork Mon Sep 18 18:03:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54039 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 E880B27BBF0; Mon, 18 Sep 2023 19:08:47 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS 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 AF26227BBEA for ; Mon, 18 Sep 2023 19:08:46 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiId9-0004ml-Tr; Mon, 18 Sep 2023 14:05:56 -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 1qiIcE-0003CX-Q2 for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:59 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qiIcE-0003Yy-9D for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiIcM-0002OM-Cy for guix-patches@gnu.org; Mon, 18 Sep 2023 14:05:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62202] [PATCH v2 14/23] DRAFT import: juliahub: Handle the case where we have a subdirectory. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Sep 2023 18:05:06 +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 moreinfo To: 62202@debbugs.gnu.org Cc: zimon.toutoune@gmail.com X-Debbugs-Original-Cc: Nicolas Graves via Guix-patches via , Simon Tournier Received: via spool by 62202-submit@debbugs.gnu.org id=B62202.16950602558868 (code B ref 62202); Mon, 18 Sep 2023 18:05:06 +0000 Received: (at 62202) by debbugs.gnu.org; 18 Sep 2023 18:04:15 +0000 Received: from localhost ([127.0.0.1]:54387 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbX-0002Ir-1g for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:15 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:38973) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbI-0002Er-HE for 62202@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:03 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-404800222d2so8773805e9.0 for <62202@debbugs.gnu.org>; Mon, 18 Sep 2023 11:03:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695060226; x=1695665026; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FsytTF8Caie6A56At2ZABSqNJEQNDhWP9sVMRnfj1cM=; b=jlf3HXk3uwMitxiwJ96vK1wlWUoRm1ZdkpT/ICUDS1yaFAzosgUTcQRpo3sZMbRbzX 2IuClWF0k3XUHoo2V9stZ6xoU1KovAhcEBLdUfA7P5QwmFzVSqPghmrfcilJAgaVXc81 CN8ghZSmZRqNCKoEXsRYMNkVduNfxFxtwC4gTyljR+7DNfIGHcWOnv3uhRSyHWFVD7+6 Dbfi2hU2CpA53s1ix9mc1345DArg+ww4CO+FzSvua5bSRVf3mmo1w50QU6x+Yo1PFdjK dz/jiLDRFy5TmtB7RGfWeFA1exGGP8nWQNwolGiAmU9ubFS9dWHoVrDciqQ/WQCfiojK i3Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695060226; x=1695665026; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FsytTF8Caie6A56At2ZABSqNJEQNDhWP9sVMRnfj1cM=; b=BwYBFBqT/5kAsn8/ZIvhn7y0sgHO1/fYT1DX79G+ukwA2lAj42rYZIqewL0BTud8ad 2fTpYN8tlkY3ahl+EG5WjjLWkAzHzVeQXFHFrLKP4B5UL0M6NyrGnEm7t+oIlYr4QmUw RyXQA0YDuOoCYF1yPe1A0Fe+jKJ2Yq1jtWTOwFO51w1iGJS2Co39VoQycU2pBNHHHCi+ /Hnhjc91mELG8kQ95k4eC/ZcqE3bRNNQnVMbQGw94himsULNCmNMQAzS6hjKkBwGcfLB rCyvMrg6nRAjU65D/J3GJ1ZEi00wdXY3sp0OG87nox6jUOKSVbcGZGXLnkXl2BOFGMF7 yEHQ== X-Gm-Message-State: AOJu0YzgwIxpzgldgkjctHHwtQQfEGA0Y/4QR6ivO727yuM750D9em/l 29tJ2I5LjvgfME/La7HHkhXlLG5VAp8= X-Google-Smtp-Source: AGHT+IHWp46vXEqDj1X35ItbaGVF4yPpvqV7RZ8HDNv0DesrujyiKzBnEIxlTBmsuDl8h80Kvv1jxA== X-Received: by 2002:a05:600c:5106:b0:3fe:d637:7b25 with SMTP id o6-20020a05600c510600b003fed6377b25mr9023230wms.0.1695060226474; Mon, 18 Sep 2023 11:03:46 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id z2-20020adfd0c2000000b0030ada01ca78sm2210465wrh.10.2023.09.18.11.03.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 11:03:46 -0700 (PDT) From: Simon Tournier Date: Mon, 18 Sep 2023 20:03:21 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Nicolas Graves via Guix-patches via Signed-off-by: Simon Tournier --- 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 2ea461b72aba..b646f9329562 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