From patchwork Mon Sep 18 18:03:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54044 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 8628227BBE9; Mon, 18 Sep 2023 19:10:15 +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=unavailable 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 6D96927BBE2 for ; Mon, 18 Sep 2023 19:10:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiId7-0004Sp-Fx; Mon, 18 Sep 2023 14:05:53 -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 1qiIcA-000391-JU for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:55 -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 1qiIcA-0003Xw-Av for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiIcI-0002N3-3L for guix-patches@gnu.org; Mon, 18 Sep 2023 14:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62202] [PATCH v2 01/23] DRAFT guix: import: go: Add optional transform-version to vcs->origin. References: <871qlq89kz.fsf@ngraves.fr> In-Reply-To: <871qlq89kz.fsf@ngraves.fr> Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Sep 2023 18:05:02 +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: Simon Tournier Received: via spool by 62202-submit@debbugs.gnu.org id=B62202.16950602428693 (code B ref 62202); Mon, 18 Sep 2023 18:05:02 +0000 Received: (at 62202) by debbugs.gnu.org; 18 Sep 2023 18:04:02 +0000 Received: from localhost ([127.0.0.1]:54353 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbH-0002FL-H5 for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:02 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:37999) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbB-0002EX-Lf for 62202@debbugs.gnu.org; Mon, 18 Sep 2023 14:03:58 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-40472fef044so9656235e9.0 for <62202@debbugs.gnu.org>; Mon, 18 Sep 2023 11:03:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695060219; x=1695665019; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=xQSsVdSHcM3gwZqis4JCNsrNGnIhomgqrJxYnYdIMwE=; b=IpqtXwjB0v2QIpnxx37e5315sU7ktUbEFMW1BRrpDNpIP5tlichxzKalXnriUAA13Z JgTBEnibi+YoIyDnfoCBNMcUGAGggj27WIXfxN7e/3fXWGKOjReztf+wgnQG/S1Fz/PK cycxg/oVu6DwU73FTkfyMB+1MUbFgTJMNMFKpTMDaBm07jvF41jENJ58WW06bdTZhuU5 0gX34HwwF1fjAncNwDrtlF0H4do98vhirNwl+3OyyDZ9SRvdht4s69mLPyJSb515tgCm P/3VG08GE1uDdJZB/MwnhGBnFOYrKj++euxJRDCQg9uhJd7OTLt/SvgI3pLc/kStNP2p 7CUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695060219; x=1695665019; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=xQSsVdSHcM3gwZqis4JCNsrNGnIhomgqrJxYnYdIMwE=; b=RQYbdTtDoHXR3e4KSrYTAdkHcSgZV2H+gAYRfm90xso1Qjqztax9ybP0/aBZDybfDm MIwZovswliashh2mGGRyeAWmgiVTTEeugdCWV5tts546375Hf271THW+OjxQxjBQeUdu x8Rh7WVNw9svF3k7I3HuO8TqGwTZH0CqypQoUk/OheLZvAQLcg9/Y9cUO15bkF4VDS+P QJU6EadaMbn4SjL9Zauj7kfZZfeix4lsw2HoVyZ1FdstSejY4eiG5MevQ+L8eQXFbmjY f/QTLDFG/NEB1dBNcHQiSlrAvR0r0zr+QAEtxxWhOTLHp5W3nO6yjZArDcaBRUGijoax OZeA== X-Gm-Message-State: AOJu0YwwPRDHzdbNxrrcGp9fchC6YQpx/Yvo7JO2RqVUVR4hSuBEEagQ Gxb/6Yf6k13TH0wsyZWhDhORb9jjdBI= X-Google-Smtp-Source: AGHT+IEauQnItXNdOc2/qfBvH/IzvwxEwW0I8XNocueB1YuJeDtDzN+AUBT+opNTebdneMMpuue89g== X-Received: by 2002:adf:ec4f:0:b0:31f:a717:f1cc with SMTP id w15-20020adfec4f000000b0031fa717f1ccmr7643716wrn.5.1695060219326; Mon, 18 Sep 2023 11:03:39 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 11:03:38 -0700 (PDT) From: Simon Tournier Date: Mon, 18 Sep 2023 20:03:08 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 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 --- guix/import/go.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) base-commit: 3d9ebc7b2ed24312fd6a0916c203f7b86d57753d diff --git a/guix/import/go.scm b/guix/import/go.scm index 0357e6a1ebe7..d1c6f68d9c9a 100644 --- a/guix/import/go.scm +++ b/guix/import/go.scm @@ -513,7 +513,8 @@ (define* (git-checkout-hash url reference algorithm) `(tag-or-commit . ,reference))))) (file-hash* checkout #:algorithm algorithm #:recursive? #true))) -(define (vcs->origin vcs-type vcs-repo-url version) +(define* (vcs->origin vcs-type vcs-repo-url version + #:optional transform-version) "Generate the `origin' block of a package depending on what type of source control system is being used." (case vcs-type From patchwork Mon Sep 18 18:03:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54024 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 074AB27BBE9; Mon, 18 Sep 2023 19:06:23 +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=unavailable 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 39EAA27BBE2 for ; Mon, 18 Sep 2023 19:06:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiIcK-0003Oy-BI; Mon, 18 Sep 2023 14:05:04 -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 1qiIcA-00039E-L9 for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:55 -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 1qiIcA-0003Xy-DQ for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiIcI-0002NB-Hz for guix-patches@gnu.org; Mon, 18 Sep 2023 14:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62202] [PATCH v2 02/23] DRAFT TODO guix: import: utils: Add git->origin+dir. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Sep 2023 18:05:02 +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: Simon Tournier Received: via spool by 62202-submit@debbugs.gnu.org id=B62202.16950602498787 (code B ref 62202); Mon, 18 Sep 2023 18:05:02 +0000 Received: (at 62202) by debbugs.gnu.org; 18 Sep 2023 18:04:09 +0000 Received: from localhost ([127.0.0.1]:54367 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbR-0002He-DI for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:09 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:38287) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbC-0002EY-BZ for 62202@debbugs.gnu.org; Mon, 18 Sep 2023 14:03:58 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-3159b524c56so939530f8f.1 for <62202@debbugs.gnu.org>; Mon, 18 Sep 2023 11:03:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695060220; x=1695665020; 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=wYlltEDgnbWojzXh8dw9khKqud4ng1Mj5GHvY71RTVI=; b=RC3nzPwahtrWNhALKMFyqOCtw53cTbRh4rHCUx8rlzgOvLFDDk5oLdYfcxHXQgy4CR RoxGgz5uz536sffysdSud7AsvO+QYt5PPdiYw7jEhL9L9V22v8rj4NDw2CoPirxaFqBj bjOCGdci1b+ZGYHyvpUISdyOfl3bD8PjKj7mVGVQXr9NpP1wElO+04LfTLk5qxGmHBaq k52sts8SoFVkp02IyXYdk8WPmsNevYbA1elRamBL1hP1N2r15JqIZ//P8DJa8KK/V41n kzwOCHAaLYXS3q8Xz2sNaxhkYBh2G2DcXfucOq5WG8T4nPQ3vgiWc4K0RDSTlSTduzi2 viNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695060220; x=1695665020; 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=wYlltEDgnbWojzXh8dw9khKqud4ng1Mj5GHvY71RTVI=; b=Y80ANGT5sPbN9z5wTnqlKpbJpypDMZ2PUxrGuCenHX3Iwfo38ASrpXCJ1hA4HG+qih TsmNa2p07CIEBNndr9Q+Tj2CkHqL6P/Mafj4KucvP0EtwyayQQHFAe5Dgxa/kpKvplf0 ihhd904N/0Qoj8GdtHkBPun05x7ySdCnz+uaTIJIb1VuLXwe8nVrL4IaSRBx2xhO8amt 9/zjqRcFKaUREcEceBKQDKmxL3yuBHGoW1thyBeaoX1X9WS5bzoOkR/yAQldcinWlX6L 2sTxYFzMUmDF41uVkWAeU+J/NmSx9Ke5fIvcS3RerJr9n+yg8umapYF7OSTQeKo2j15A PKfA== X-Gm-Message-State: AOJu0YwyeuHypK8cQ+AxjkZ2hSN9ZDptQAjSwDghRTrF7Ylmb2WsTtFt krDx0IYIvs2gwZ3vQ38Uqu5bvBWgIZ0= X-Google-Smtp-Source: AGHT+IHZqOmHEGMR2x3+mqFJk3XcUy1A5NIb1Saygl9gL2siFDQQa9t58J7gkylRjw2mRt80tMcn5A== X-Received: by 2002:adf:e184:0:b0:321:547b:f060 with SMTP id az4-20020adfe184000000b00321547bf060mr2589325wrb.1.1695060219823; Mon, 18 Sep 2023 11:03:39 -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.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 11:03:39 -0700 (PDT) From: Simon Tournier Date: Mon, 18 Sep 2023 20:03:09 +0200 Message-Id: <119a9c3cf93b5b5df0daf917bdddde9863051d09.1695060058.git.zimon.toutoune@gmail.com> 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 --- guix/import/utils.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 0cf52cdbde73..189facfcf823 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -63,6 +63,8 @@ (define-module (guix import utils) url-fetch guix-hash-url + git->origin+dir + ;; git->origin package-names->package-inputs maybe-inputs From patchwork Mon Sep 18 18:03:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54042 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 C00C327BBEA; Mon, 18 Sep 2023 19:09:08 +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 AD90F27BBE2 for ; Mon, 18 Sep 2023 19:09:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiIcI-0003LO-JG; Mon, 18 Sep 2023 14:05:03 -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 1qiIcA-00039H-TT for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:55 -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 1qiIcA-0003Y7-LE for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiIcI-0002NI-V6 for guix-patches@gnu.org; Mon, 18 Sep 2023 14:05:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62202] [PATCH v2 03/23] DRAFT TODO: guix: import: utils: Fix corner cases beautify-descritption. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Sep 2023 18:05:02 +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: Simon Tournier Received: via spool by 62202-submit@debbugs.gnu.org id=B62202.16950602508795 (code B ref 62202); Mon, 18 Sep 2023 18:05:02 +0000 Received: (at 62202) by debbugs.gnu.org; 18 Sep 2023 18:04:10 +0000 Received: from localhost ([127.0.0.1]:54369 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbR-0002Hg-Mk for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:09 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:40125) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbC-0002EZ-JG for 62202@debbugs.gnu.org; Mon, 18 Sep 2023 14:03:59 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-40471c054f9so14350245e9.0 for <62202@debbugs.gnu.org>; Mon, 18 Sep 2023 11:03:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695060220; x=1695665020; 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=ueh5ikMbN0g6E70JfTC3OyqsVG5FrnI5fdWXn/Jwc+8=; b=CZaCVTSaocLHlgN7snCvziyRVk/1OQKNwWLsusfHeE10lw22ts0e0etihCexsAPyrH 3/f9FdarWRwmPQgIxkwT3VB7gU83XNcwbQ/biBAqoNF7fgElMC1b5UpFsOENZ6yKpe8/ ZU3odyq88kjvWY1nlIJQ5cvfcG2O4J3/HTriWuPXhoet5ghkyAdi9ob4SyPG6mM5G3bX dn55FLFHAXE7MA5NKy2E9xGtE/4WleukmDt/7FNGZn4JdwJHWbmNb8LzgkYUduQDxLBH 2RM8vT7Ki3cAh23iGjz4ysCzao4Vzy/1jtBrtEJ04YrRyLuZ0Qhek4f0zqboNAHJ/pmO MHsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695060220; x=1695665020; 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=ueh5ikMbN0g6E70JfTC3OyqsVG5FrnI5fdWXn/Jwc+8=; b=P0HOmuMe2cGubAO6YdkqnegKd2l8rIZQxt8PRrY0Z9CigG6iKyVYm3YBvGeTH1YGeg BA1VRSJH3KjeL8tDhCJoJMfkiWIllaeBzDpGZNP8J84yYCt6C1u8KBZ2fAwHDHcS4mXU bLrG7s/CQBHC3iWkqAx3ve2pnd9BOUykq94KbINwLTdsZfJq0i6j5jqKLW9id1rND5+s GE4XdBzR0WoYTuTJvD9WGOO9/zrPxAeTlUzT5Ax8nqrydEpZeDVpO9EYKvoyWPZKw0IT FU88LQgfTIZQhlPl+OOJn3q0hxoH6nvub14LVucvrtlmEF7ByF78kmrdfw0EGdu/4LXO /Bsg== X-Gm-Message-State: AOJu0Yxf5sIgK3g0pd4g/AYyMX0Tk5xT7/hh3cTGT1LeELDgaIweRJB+ Uvan7gyBMeeOJa+362ApcjM8YhkK2os= X-Google-Smtp-Source: AGHT+IFm9wA6MmOUqTtG/G0JKVS977NG4S/TtFi6QFz2AHOsCr9Rm40m5kn9e0+Pmt1F/qmOvB5r1g== X-Received: by 2002:adf:ecc7:0:b0:31f:899b:a47 with SMTP id s7-20020adfecc7000000b0031f899b0a47mr7943771wro.4.1695060220470; Mon, 18 Sep 2023 11:03:40 -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.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 11:03:40 -0700 (PDT) From: Simon Tournier Date: Mon, 18 Sep 2023 20:03:10 +0200 Message-Id: <58ed3520a130805887d797300094637ba16ef0a7.1695060058.git.zimon.toutoune@gmail.com> 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 * guix/import/utils.scm (beautify-descritption): Fix. --- guix/import/utils.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 189facfcf823..01d9861f279c 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -339,6 +339,16 @@ (define* (beautify-description description #:optional (length 80)) ;; Escape single @ to prevent it from being understood as ;; invalid Texinfo syntax. (cut regexp-substitute/global #f "@" <> 'pre "@@" 'post) + + ;; Remove cut above + ;; (lambda (word) + ;; (if + ;; (member word '("@itemize" "@item" "@end" "@quotation" + ;; "@enumerate" "@code" "@code{")) + ;; word + ;; ((cut regexp-substitute/global + ;; #f "@" <> 'pre "@@" 'post) word))))))) + ;; Wrap camelCase or PascalCase words in @code{...}. (lambda (word) (let ((pattern (make-regexp "([A-Z][a-z]+[A-Z]|[a-z]+[A-Z])"))) From patchwork Mon Sep 18 18:03:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54040 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 41D5027BBE2; Mon, 18 Sep 2023 19:08:51 +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,URIBL_BLOCKED autolearn=unavailable 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 C804527BBE9 for ; Mon, 18 Sep 2023 19:08:45 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiIcl-0003xS-VR; Mon, 18 Sep 2023 14:05:33 -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 1qiIcD-0003Aq-D9 for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:58 -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 1qiIcD-0003Ye-4q for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiIcL-0002O0-9T for guix-patches@gnu.org; Mon, 18 Sep 2023 14:05:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62202] [PATCH v2 04/23] DRAFT import: Add julia. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Sep 2023 18:05: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 moreinfo To: 62202@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 62202-submit@debbugs.gnu.org id=B62202.16950602548844 (code B ref 62202); Mon, 18 Sep 2023 18:05:05 +0000 Received: (at 62202) by debbugs.gnu.org; 18 Sep 2023 18:04:14 +0000 Received: from localhost ([127.0.0.1]:54381 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbV-0002IR-2G for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:14 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:41340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbD-0002Eb-9C for 62202@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:01 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-405101a02bcso2535315e9.1 for <62202@debbugs.gnu.org>; Mon, 18 Sep 2023 11:03:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695060221; x=1695665021; 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=OtMvS4o2GJtrUNPCHXTF/xY25oPgYVlB7vGaIpQ+6eY=; b=Ly8lD1fOUE3hVcrCZItwWKBZuELc9P4XmZ2ISUgToDnolnf8NxLWExX2BxtaGAdQoD uEB+6wjSdZpXVixZpXIgvetMtKZFCdi8XuSLpicvstQ9f4RtHcjfMOTyUCl11Kqintaq ADFsRO6QRP8Dl1oAoOkf9hJsC+hjx4xhsAhMEmpjy+R75nx/nlRIbpDfyMnrjXJapaai v3muAv5QF9dmDPyStVzi5MxxD3e8tew+3Kl+oh5mhr/rxtzlJtt9NVsHepvEpeASprS4 KK6W8CSleUgncnX+QDh5h1/lYXgNGZhXdL9vctbnq8P2TN18Z5AfybMH9EsjyzSSR/JB TfeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695060221; x=1695665021; 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=OtMvS4o2GJtrUNPCHXTF/xY25oPgYVlB7vGaIpQ+6eY=; b=X9OI7bboi9dE+vbrmnsfbqT41cOuDrsu6fFvQa7hZJMW3kWEhdOSQmXxFgQXtksFXo /t2UAkV575vUsBJjHSkPrcXNQqHEZJtuhjD145Wwk8ItUnGudfcRxCjMQ1ABK4GmofqB 3nm12gwDxhPmEcUDQqBx4pjBB10zAgCeRyEL5pjqKY8EW0wz7dQR7BjPxzNyxqbudBW+ 5SQzMQd2x9QRUnOsieRiBruARQSx2PZTwl1LOAE00oC+xx7yu7v662RHidPs4eaB164X ImqcKOJA0EIZanVy6vuedju+OK8gJpHIV9mC/x1wlB8jlxOpyeRlD2F7udhNuVT6daMs uw+w== X-Gm-Message-State: AOJu0Yx5AKbcF0oNh1T92d6neQkYZ5Rzjwa1EuE1XzUHohHG96tSjieA OEAJeiltcs67pL3mA52XFMVjlOB093M= X-Google-Smtp-Source: AGHT+IGsyIL6haThWtXtMy3gAFva9TAiiCi/dRlT88aurR35Dx3Gs+6xhguVGr1QoEPApmZrkDYHMg== X-Received: by 2002:adf:ec4f:0:b0:317:5f08:32a3 with SMTP id w15-20020adfec4f000000b003175f0832a3mr7672957wrn.6.1695060221038; Mon, 18 Sep 2023 11:03:41 -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.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 11:03:40 -0700 (PDT) From: Simon Tournier Date: Mon, 18 Sep 2023 20:03:11 +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 * guix/scripts/import.scm (importers): Add juliahub. * guix/import/juliahub.scm: New file. * guix/scripts/import/juliahub.scm: New file. * Makefile.am: Add them. --- Makefile.am | 2 + guix/import/juliahub.scm | 183 +++++++++++++++++++++++++++++++ guix/scripts/import.scm | 2 +- guix/scripts/import/juliahub.scm | 107 ++++++++++++++++++ 4 files changed, 293 insertions(+), 1 deletion(-) create mode 100644 guix/import/juliahub.scm create mode 100644 guix/scripts/import/juliahub.scm diff --git a/Makefile.am b/Makefile.am index 922913355c45..70b06c1a793f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -289,6 +289,7 @@ MODULES = \ guix/import/hackage.scm \ guix/import/hexpm.scm \ guix/import/json.scm \ + guix/import/juliahub.scm \ guix/import/kde.scm \ guix/import/launchpad.scm \ guix/import/minetest.scm \ @@ -344,6 +345,7 @@ MODULES = \ guix/scripts/import/hackage.scm \ guix/scripts/import/hexpm.scm \ guix/scripts/import/json.scm \ + guix/scripts/import/juliahub.scm \ guix/scripts/import/minetest.scm \ guix/scripts/import/opam.scm \ guix/scripts/import/pypi.scm \ diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm new file mode 100644 index 000000000000..efe6abbb2481 --- /dev/null +++ b/guix/import/juliahub.scm @@ -0,0 +1,183 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2023 Nicolas Graves +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix import juliahub) + #:use-module (ice-9 textual-ports) + #:use-module (ice-9 regex) + #:use-module (ice-9 match) + #:use-module (ice-9 string-fun) + #:use-module (srfi srfi-9) + #:use-module (srfi srfi-1) + #:use-module (guix http-client) + #:use-module (guix import utils) + #:use-module (guix import json) + #:use-module (guix base16) + #:use-module (guix base32) + #:use-module (guix packages) + #:use-module (guix upstream) + #:use-module (json) + #:use-module ((guix licenses) #:prefix license:) + + #:export (juliahub->guix-package)) + +(define (juliahub-uri name) + (let* ((url (string-append "https://docs.juliahub.com/" name "/")) + (port (http-fetch url #:text? #t)) + (_ (get-line port)) + (meta (get-line port)) + (regex "url=[a-zA-Z0-9]{5}\\/[0-9\\.]*") + (redirect (match:substring (string-match regex meta)))) + (close-port port) + (string-drop redirect 4))) + +(define (juliahub-url name) + (let* ((url (string-append "https://docs.juliahub.com/" name "/")) + (uri (juliahub-uri name))) + (string-append url uri "/"))) + +(define (juliahub-slug-version name) + (let* ((uri (juliahub-uri name)) + (slug (string-take uri 5)) + (latest-version (string-drop uri 6))) + `(,slug ,latest-version))) + +(define (json->juliahub-direct-dependencies vector) + (if (vector? vector) + (filter-map + (lambda (el) + (let ((dep (json->juliahub-dependency el))) + (if (juliahub-dependency-direct? dep) + dep + #f))) + (vector->list vector)))) + +;; Julia package. +(define-json-mapping make-juliahub-package juliahub-package? + json->juliahub-package + (homepage juliahub-package-homepage) ;string + (readme juliahub-package-readme) ;string + ;; (slug juliahub-package-slug) ;string + (version juliahub-package-version) ;string + (description juliahub-package-description) ;string + (dependencies + juliahub-package-dependencies "deps" + json->juliahub-direct-dependencies) ;list of + ;; (lambda (vector) + ;; (map json->juliahub-dependency (vector->list vector)))) + (url juliahub-package-url) ;string + (uuid juliahub-package-uuid) ;string + (license juliahub-package-license)) ;string + +(define-json-mapping + make-juliahub-dependency juliahub-dependency? + json->juliahub-dependency + (direct? juliahub-dependency-direct? "direct") ;boolean + (name juliahub-dependency-name) ;string + (uuid juliahub-dependency-uuid) ;string + (versions juliahub-dependency-versions "versions" vector->list)) ;list of strings + ;; (slug juliahub-dependency-slug) ;string + +(define (julia-name->guix-name name) + (string-append "julia-" (snake-case name))) + +(define* (juliahub-fetch name #:key (version #f)) + "Return a record for package NAME, or #f on failure." + (and=> (json-fetch (string-append (juliahub-url name) "pkg.json")) + json->juliahub-package)) + +(define (make-julia-sexp name version uri hash home-page synopsis description + dependencies licenses) + "Return the `package' s-expression for a Julia package with the given NAME, +VERSION, URI, HASH, HOME-PAGE, DESCRIPTION, DEPENDENCIES, and LICENSES." + `(package + (name ,(julia-name->guix-name name)) + (version ,version) + (source (origin + (method url-fetch) + (uri ,uri) + (sha256 + (base32 + "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5" + ;; ,(bytevector->nix-base32-string hash) + )))) + (build-system julia-build-system) + ,@(if (null? dependencies) + '() + `((inputs + (list ,@(map (compose julia-name->guix-name juliahub-dependency-name) + dependencies))))) + (synopsis ,synopsis) + (description ,description) + (home-page ,home-page) + (license ,(match licenses + (() #f) + ((license) (license->symbol license)) + (_ `(list ,@(map license->symbol licenses))))))) + +(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 (if version + (juliahub-fetch package-name version) + (juliahub-fetch package-name)))) + (if package + (let* ((dependencies-names + (map juliahub-dependency-name + (juliahub-package-dependencies package))) + (licenses + (map spdx-string->license + (list (juliahub-package-license package))))) + (values (make-julia-sexp + package-name + (juliahub-package-version package) + (juliahub-package-url package) + "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5" + (juliahub-package-homepage package) + (juliahub-package-description package) + (beautify-description (juliahub-package-readme package)) + (juliahub-package-dependencies package) + licenses) + dependencies-names)) + (values #f '())))) + +(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))) + (upstream-source + (package (package-name package)) + (version version) + (urls (list url))))) + +(define %juliahub-updater + (upstream-updater + (name 'juliahub) + (description "Updater for Juliahub packages") + (pred juliahub-package?) + (import import-release))) + +(define* (juliahub-recursive-import package-name #:optional version) + (recursive-import package-name + #:repo '() + #:repo->guix-package juliahub->guix-package + #:guix-name ruby-package-name + #:version version)) diff --git a/guix/scripts/import.scm b/guix/scripts/import.scm index 4ddd8d46a121..74c26e347335 100644 --- a/guix/scripts/import.scm +++ b/guix/scripts/import.scm @@ -47,7 +47,7 @@ (define %standard-import-options '()) (define importers '("gnu" "pypi" "cpan" "hackage" "stackage" "egg" "elpa" "gem" "go" "cran" "crate" "texlive" "json" "opam" - "minetest" "elm" "hexpm")) + "minetest" "elm" "hexpm" "juliahub")) (define (resolve-importer name) (let ((module (resolve-interface diff --git a/guix/scripts/import/juliahub.scm b/guix/scripts/import/juliahub.scm new file mode 100644 index 000000000000..1317c67aa342 --- /dev/null +++ b/guix/scripts/import/juliahub.scm @@ -0,0 +1,107 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2023 Nicolas Graves +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (guix scripts import juliahub) + #:use-module (guix ui) + #:use-module (guix utils) + #:use-module (guix scripts) + #:use-module (guix import juliahub) + #:use-module (guix scripts import) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-11) + #:use-module (srfi srfi-37) + #:use-module (ice-9 match) + #:use-module (ice-9 format) + #:use-module (ice-9 receive) + #:export (guix-import-juliahub)) + + +;;; +;;; Command-line options. +;;; + +(define %default-options + '()) + +(define (show-help) + (display (G_ "Usage: guix import juliahub PACKAGE-NAME[@VERSION] Import and +convert the Julia package for PACKAGE-NAME. Optionally, a version can be +specified after the at-sign (@) character.\n")) + (display (G_ " + -h, --help display this help and exit")) + (display (G_ " + -V, --version display version information and exit")) + (display (G_ " + -r, --recursive generate package expressions for all Gem packages\ + that are not yet in Guix")) + (newline) + (show-bug-report-information)) + +(define %options + ;; Specification of the command-line options. + (cons* (option '(#\h "help") #f #f + (lambda args + (show-help) + (exit 0))) + (option '(#\V "version") #f #f + (lambda args + (show-version-and-exit "guix import gem"))) + (option '(#\r "recursive") #f #f + (lambda (opt name arg result) + (alist-cons 'recursive #t result))) + %standard-import-options)) + + +;;; +;;; Entry point. +;;; + +(define (guix-import-juliahub . args) + (define (parse-options) + ;; Return the alist of option values. + (parse-command-line args %options (list %default-options) + #:build-options? #f)) + + (let* ((opts (parse-options)) + (args (filter-map (match-lambda + (('argument . value) + value) + (_ #f)) + (reverse opts)))) + (match args + ((spec) + (receive (package-name package-version) + (package-name->name+version spec) + (let ((code (if (assoc-ref opts 'recursive) + (map (match-lambda + ((and ('package ('name name) . rest) pkg) + `(define-public ,(string->symbol name) + ,pkg)) + (_ #f)) + (juliahub-recursive-import package-name package-version)) + (let ((sexp (juliahub->guix-package package-name #:version package-version))) + (if sexp sexp #f))))) + (match code + ((or #f '(#f)) + (leave (G_ "failed to download meta-data for package '~a'~%") + package-name)) + (_ code))))) + (() + (leave (G_ "too few arguments~%"))) + ((many ...) + (leave (G_ "too many arguments~%")))))) From patchwork Mon Sep 18 18:03:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54041 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 F096627BBE2; Mon, 18 Sep 2023 19:08:51 +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 73AF827BBED for ; Mon, 18 Sep 2023 19:08:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiIeG-00071b-7j; Mon, 18 Sep 2023 14:07:04 -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 1qiIdI-00059c-6X for guix-patches@gnu.org; Mon, 18 Sep 2023 14:06:06 -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 1qiIdH-00045G-Uu for guix-patches@gnu.org; Mon, 18 Sep 2023 14:06:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiIdQ-0002WG-4x for guix-patches@gnu.org; Mon, 18 Sep 2023 14:06:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66088] [PATCH v2 05/23] DRAFT import: juliahub: Add support for native-inputs. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Sep 2023 18:06:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66088 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62202@debbugs.gnu.org Cc: 66088@debbugs.gnu.org, zimon.toutoune@gmail.com X-Debbugs-Original-Cc: Nicolas Graves via Guix-patches via , Simon Tournier Received: via spool by submit@debbugs.gnu.org id=B.16950603639479 (code B ref -1); Mon, 18 Sep 2023 18:06:11 +0000 Received: (at submit) by debbugs.gnu.org; 18 Sep 2023 18:06:03 +0000 Received: from localhost ([127.0.0.1]:54479 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIdF-0002SW-TH for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:06:02 -0400 Received: from lists.gnu.org ([2001:470:142::17]:58286) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbc-0002JD-VI for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:21 -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 1qiIb4-0002JT-0E for guix-patches@gnu.org; Mon, 18 Sep 2023 14:03:54 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qiIb1-0003Ov-DT for guix-patches@gnu.org; Mon, 18 Sep 2023 14:03:45 -0400 Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-31ffc8ead75so316824f8f.0 for ; Mon, 18 Sep 2023 11:03:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695060222; x=1695665022; darn=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=pUwfyNhRnqWCM1lX3AZ3mporZaHjg2ab0aRjRiR2Z/4=; b=dDIyGhA7WDQqzLLragsvbGIZbwBe92X9Fmg9W9fjaZBagLzE0cr6+58567iqiGoaKO nbxwCF3mvRV0ME9mBtHmNDG31wBvlexWC/6m1bSh0XHyp6hNr9YYksYhkRnQ/7l8jGwX ZI+W64mkGruk4mU6/o8FTNExM5PMPdE/A2jZi5jr8YC3vJqj/OXSiGJrpFAiTlKo6+gE A4zNOtBuQbxqV9mP6Eb6DR1wa4Yyh+tcJ7OLRGfR7wYttmXK6qf+GZBoRXa3QlstIrKt V8ZlSZphpqYrtv7w8UDYKokjHGcXEhJ6z+nINhD/65qH7MwVqb17xa7GPT1aAGiFWhJw MfAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695060222; x=1695665022; 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=pUwfyNhRnqWCM1lX3AZ3mporZaHjg2ab0aRjRiR2Z/4=; b=GbcclDOqKywp296amw8/iJtcTgSLsgSqgsznn7af1a1mAZYox9Ki4+X5qD1kRwHcz9 WCUZXHwKs5pm7wX/9YGW2jSLudFe/GEU3iOKLBw7aFOmAQCm3G3dDvVp0vUU+GzB4w9f P2UMkutyVOuZwkXMeqdBrVtiDrV7Vw8uAPYFH+ALQkhtoH/gx9pb5DjlIHqvxsgvO3sQ LjxV/gDOQFEq2iYQ6D++vJTEPmUnl12SroYf976gbR1BiTmg6BuR4dlqx/FkCD9TElqa Sg2zfLjo9ceN/2/ZJvnhh6kVINy764Im/jKKPLKxH6kqWm3z5x2xO7lpL+jXiSjFQvPq DCqw== X-Gm-Message-State: AOJu0YxoR6t88xh60d0Hd/DTnYzwQKXbyGT7dfoQzU4k7YLDFzl14/yl 2J1IQT97sI3n3cnkZ5U3os0= X-Google-Smtp-Source: AGHT+IHA9dJxZsHSpnwzDPRlIQKYNbbfGVWrNDVIvKxhl6OZNa4uC/tz0qT2H1n/Gnx6HbKueQcLdQ== X-Received: by 2002:a05:6000:1f9c:b0:320:b1e:7e6c with SMTP id bw28-20020a0560001f9c00b003200b1e7e6cmr4411813wrb.3.1695060221715; Mon, 18 Sep 2023 11:03:41 -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.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 11:03:41 -0700 (PDT) From: Simon Tournier Date: Mon, 18 Sep 2023 20:03:12 +0200 Message-Id: <57feddb288135a1d5953340fcc5bfe9e3159e372.1695060058.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=zimon.toutoune@gmail.com; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 | 105 ++++++++++++++++++++++++--------------- 1 file changed, 64 insertions(+), 41 deletions(-) diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm index efe6abbb2481..4544dee98016 100644 --- a/guix/import/juliahub.scm +++ b/guix/import/juliahub.scm @@ -20,13 +20,14 @@ (define-module (guix import juliahub) #:use-module (ice-9 textual-ports) #:use-module (ice-9 regex) #:use-module (ice-9 match) + #:use-module (ice-9 streams) #:use-module (ice-9 string-fun) - #:use-module (srfi srfi-9) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-9) + #:use-module (srfi srfi-11) #:use-module (guix http-client) #:use-module (guix import utils) #:use-module (guix import json) - #:use-module (guix base16) #:use-module (guix base32) #:use-module (guix packages) #:use-module (guix upstream) @@ -66,19 +67,42 @@ (define (json->juliahub-direct-dependencies vector) #f))) (vector->list vector)))) +(define (ini-list->extra-dependencies lst) + (match lst + (('(extras) ooo ...) + (extra-list->extra-dependencies ooo)) + (((tag) ooo ...) + (ini-list->extra-dependencies ooo)) + ((attribute '= value ooo ...) + (ini-list->extra-dependencies ooo)) + ('() + '()))) + +(define (extra-list->extra-dependencies lst) + (match lst + ((attribute '= value ooo ...) + `(,(symbol->string attribute) ,@(extra-list->extra-dependencies ooo))) + (((tag) ooo ...) + '()) + ('() + '()))) + +(define (parse-extra-dependencies directory) + (let* ((port (open-input-file (string-append directory "/Project.toml"))) + (ini-list (stream->list (port->stream port read)))) + (close-port port) + (ini-list->extra-dependencies ini-list))) + ;; Julia package. (define-json-mapping make-juliahub-package juliahub-package? json->juliahub-package (homepage juliahub-package-homepage) ;string (readme juliahub-package-readme) ;string - ;; (slug juliahub-package-slug) ;string (version juliahub-package-version) ;string (description juliahub-package-description) ;string - (dependencies - juliahub-package-dependencies "deps" + (direct-dependencies + juliahub-package-direct-dependencies "deps" json->juliahub-direct-dependencies) ;list of - ;; (lambda (vector) - ;; (map json->juliahub-dependency (vector->list vector)))) (url juliahub-package-url) ;string (uuid juliahub-package-uuid) ;string (license juliahub-package-license)) ;string @@ -90,7 +114,6 @@ (define-json-mapping (name juliahub-dependency-name) ;string (uuid juliahub-dependency-uuid) ;string (versions juliahub-dependency-versions "versions" vector->list)) ;list of strings - ;; (slug juliahub-dependency-slug) ;string (define (julia-name->guix-name name) (string-append "julia-" (snake-case name))) @@ -100,27 +123,25 @@ (define* (juliahub-fetch name #:key (version #f)) (and=> (json-fetch (string-append (juliahub-url name) "pkg.json")) json->juliahub-package)) -(define (make-julia-sexp name version uri hash home-page synopsis description - dependencies licenses) +(define (make-julia-sexp name source home-page synopsis description + direct-dependencies test-dependencies-names licenses) "Return the `package' s-expression for a Julia package with the given NAME, -VERSION, URI, HASH, HOME-PAGE, DESCRIPTION, DEPENDENCIES, and LICENSES." +VERSION, URI, HASH, HOME-PAGE, DESCRIPTION, DEPENDENCIES, +TEST-DEPENDENCIES-NAMES and LICENSES." `(package (name ,(julia-name->guix-name name)) (version ,version) - (source (origin - (method url-fetch) - (uri ,uri) - (sha256 - (base32 - "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5" - ;; ,(bytevector->nix-base32-string hash) - )))) + (source ,source) (build-system julia-build-system) - ,@(if (null? dependencies) + ,@(if (null? direct-dependencies) '() - `((inputs + `((propagated-inputs (list ,@(map (compose julia-name->guix-name juliahub-dependency-name) - dependencies))))) + direct-dependencies))))) + ,@(if (null? test-dependencies-names) + '() + `((native-inputs + (list ,@(map julia-name->guix-name test-dependencies-names))))) (synopsis ,synopsis) (description ,description) (home-page ,home-page) @@ -135,26 +156,28 @@ (define* (juliahub->guix-package package-name `package' s-expression corresponding to that package, or #f on failure. Optionally include a VERSION string to fetch a specific version juliahub." (let ((package (if version - (juliahub-fetch package-name version) - (juliahub-fetch package-name)))) + (juliahub-fetch package-name version) + (juliahub-fetch package-name)))) (if package - (let* ((dependencies-names - (map juliahub-dependency-name - (juliahub-package-dependencies package))) - (licenses - (map spdx-string->license - (list (juliahub-package-license package))))) - (values (make-julia-sexp - package-name - (juliahub-package-version package) - (juliahub-package-url package) - "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5" - (juliahub-package-homepage package) - (juliahub-package-description package) - (beautify-description (juliahub-package-readme package)) - (juliahub-package-dependencies package) - licenses) - dependencies-names)) + (let-values (((source directory) + (git->origin+dir url `(tag-or-commit . ,package-version)))) + (let* ((dependencies-names + (map juliahub-dependency-name + (juliahub-package-direct-dependencies package))) + (licenses + (map spdx-string->license + (list (juliahub-package-license package)))) + (test-dependencies-names (parse-extra-dependencies directory))) + (values (make-julia-sexp + package-name + source + (juliahub-package-homepage package) + (juliahub-package-description package) + (beautify-description (juliahub-package-readme package)) + (juliahub-package-direct-dependencies package) + test-dependencies-names + licenses) + (append dependencies-names test-dependencies)))) (values #f '())))) (define* (import-release package #:key (version #f)) From patchwork Mon Sep 18 18:03:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54027 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 BFDE427BBF1; Mon, 18 Sep 2023 19:07:19 +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 CE91427BBED for ; Mon, 18 Sep 2023 19:07:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiIdQ-0005E7-1T; Mon, 18 Sep 2023 14:06:12 -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 1qiIdA-0004rU-E9 for guix-patches@gnu.org; Mon, 18 Sep 2023 14:05:56 -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 1qiIdA-00041z-5B for guix-patches@gnu.org; Mon, 18 Sep 2023 14:05:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiIdI-0002TR-Dk for guix-patches@gnu.org; Mon, 18 Sep 2023 14:06:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66077] [PATCH v2 06/23] DRAFT import: juliahub: Correct source parsing. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Sep 2023 18:06:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66077 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62202@debbugs.gnu.org Cc: 66077@debbugs.gnu.org, zimon.toutoune@gmail.com X-Debbugs-Original-Cc: Nicolas Graves via Guix-patches via , Simon Tournier Received: via spool by submit@debbugs.gnu.org id=B.16950603239336 (code B ref -1); Mon, 18 Sep 2023 18:06:04 +0000 Received: (at submit) by debbugs.gnu.org; 18 Sep 2023 18:05:23 +0000 Received: from localhost ([127.0.0.1]:54457 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIcd-0002QP-AW for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:05:23 -0400 Received: from lists.gnu.org ([2001:470:142::17]:58266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbg-0002Ii-EE for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:24 -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 1qiIb5-0002Jl-8q for guix-patches@gnu.org; Mon, 18 Sep 2023 14:03:58 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qiIb2-0003Oz-09 for guix-patches@gnu.org; Mon, 18 Sep 2023 14:03:46 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-32163c3ece5so66533f8f.1 for ; Mon, 18 Sep 2023 11:03:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695060222; x=1695665022; darn=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=eGZ8My+gyfK2zXtMMVyRPNUYXEnyXSsvJiEKKIH0DX4=; b=NBskL2p0FFRIibT+gkv+KV/WfyebMkoTGu4hQ7Ux+aE1wvIIZYJp9J7a6AY3vqLDQH 1g6b3S3mmWY1D9YdmMf8sUajzizNaxksFt3EqakvyEoPmvS83NxWrIWpIZK87++glLLi pgEUCuj/sK07K5pnVnY7RFfShrh6adJPHG7eD+MMYfNDP/mwhE998AyAD9KSs936pjo7 f1Bh9jm/ACeartt/He4L0oyrFmgY2ySUneyxcceViF5VnBgLKe/zfo+0uAfUZZI0JL4/ thUnAD+bJ0ti2GNs7cQcH6ywZHXh0fih6JTr1FcdLL3Sbn4ZTx0pE3mZQMk1eYuHqzYS yvvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695060222; x=1695665022; 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=eGZ8My+gyfK2zXtMMVyRPNUYXEnyXSsvJiEKKIH0DX4=; b=g1Z+cISCYzIwfbAnfGmIaUKWZ+WNHZFFNqbTTQ5InZ3QSE2IichxARfpNXAEioUMY3 T2xDjgJe5Xh0zcp2oZ3jVdvcVdJyZGTEFQTZGDwq5Gpjnt5I974TmQIHdZDQMyf46Do7 vayNrp/+Ti2VQ5gkO3EiE58i7yrObqLF1S4NxgITdGYr5CT0yGfYzyTazkm7thI0ekNB 2pHVhomCjBi+BO5uRFPmB4ybtjP/eAAOVIn0g0umM8XVMGxVQREK5cEE9X7yQS2zvexz uXAALsoZKAVdz65bhMjXjwon9C1Rar7xA+jskGajXGWzmCwvKmceEdaY2SzxioToFKqd 6KAw== X-Gm-Message-State: AOJu0Yy12T166v7qHkEVC67RGpbXgk5jrm55vMMYQH5kV3o/t4lG46bY 46eritG1wQcGiQbzn3+AvWg= X-Google-Smtp-Source: AGHT+IGEfBU8dRJ6U+GfCxlLTlTGfBsQtmVY8nkdbeT7jEB/UVGmuIdr/cuTXI11FSsloxZ5qSXUCQ== X-Received: by 2002:a5d:484a:0:b0:316:ef5f:7d8f with SMTP id n10-20020a5d484a000000b00316ef5f7d8fmr7767505wrs.3.1695060222245; Mon, 18 Sep 2023 11:03:42 -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.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 11:03:42 -0700 (PDT) From: Simon Tournier Date: Mon, 18 Sep 2023 20:03:13 +0200 Message-Id: <14e997a8b389bb18d62e00178a68fc5434869da2.1695060058.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=zimon.toutoune@gmail.com; helo=mail-wr1-x433.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm index 4544dee98016..4c3ceed10904 100644 --- a/guix/import/juliahub.scm +++ b/guix/import/juliahub.scm @@ -160,7 +160,11 @@ (define* (juliahub->guix-package package-name (juliahub-fetch package-name)))) (if package (let-values (((source directory) - (git->origin+dir url `(tag-or-commit . ,package-version)))) + (git->origin+dir + (juliahub-package-url package) + `(tag-or-commit + . ,(string-append + "v" (juliahub-package-version package)))))) (let* ((dependencies-names (map juliahub-dependency-name (juliahub-package-direct-dependencies package))) From patchwork Mon Sep 18 18:03:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54025 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 D4FAB27BBE9; Mon, 18 Sep 2023 19:06:25 +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=unavailable 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 B75A827BBE2 for ; Mon, 18 Sep 2023 19:06:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiIcT-0003bS-6h; Mon, 18 Sep 2023 14:05:13 -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 1qiIcC-0003Ac-3N for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:57 -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 1qiIcB-0003YJ-Rz for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiIcK-0002Ne-4k for guix-patches@gnu.org; Mon, 18 Sep 2023 14:05:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62202] [PATCH v2 07/23] DRAFT import: juliahub: Add indirect dependencies. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Sep 2023 18:05:04 +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.16950602528820 (code B ref 62202); Mon, 18 Sep 2023 18:05:04 +0000 Received: (at 62202) by debbugs.gnu.org; 18 Sep 2023 18:04:12 +0000 Received: from localhost ([127.0.0.1]:54375 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbT-0002I7-B5 for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:11 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:38091) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbE-0002Ef-UR for 62202@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:00 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-31f7c87353eso946119f8f.0 for <62202@debbugs.gnu.org>; Mon, 18 Sep 2023 11:03:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695060223; x=1695665023; 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=skJOf1DBllhMdwi8a7KPjGXvCMcceEa6MzsLzGA6xQM=; b=mJVEEKoAxG8tpyfS37GPP2In9AFj4K77MuRxkDjhTAkQRRR/LNlCeM9nugTNdE9vn9 SDTBVFCwsZkZru91dSE6KTDO6Z/OXgrFj5Wtb2zHAySvDKvi1dJqL7DfNAOc1ahUtKkL C11PWSQqratNENbQIVE3N7XOhzdWWyd0rwojUOvHlF3IuNxX3R+miSWkmzkY5tVMUhWZ J2mMaQ7SWzTf1DPyxPVKi2yGb+Xd8PHYPUmS2pZpDsS6q+dKl37EtKlWhQUz6oqnB5+S gPtecIAGYaVs+jBZRLNge2WsP+8Xn8JvbaIlsg1G5za1AAvoo32MdoqoATbUzu7WDjvm slug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695060223; x=1695665023; 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=skJOf1DBllhMdwi8a7KPjGXvCMcceEa6MzsLzGA6xQM=; b=GXJSRSEw8fIratO5tZiD0TYJTPgqRNdjxPO2F5BxuAiO9WIMlhnQkZlnYneTyR9Ynu wavdeqyC93nhARfA9m+5mVtgROktLcSegWDlImWa8z/7UrDWFIRbCiQYKFcqNSNiH+lw 8Xavo8WsFxS9cqmtbG0n0S2/KIZmuqP0gKPmaG1poCZHXV/OKtd9XuxKMEYjpoG4r1Wt P1JEWSQs4c80kLd/DdBgBa8eSlkF0Njpu68SEU75AA8OpFKLt91DFRuxCJMR/6NJjgWD Gwa5WRaGFA+pZqCip4CW2I0NGYEIz9wn2WFtQeQleCgAZdKRJ3C4VqECpdCUL8jktehg Kz1A== X-Gm-Message-State: AOJu0YyjAviTRPT3Jcljq2HuSGLAFtMflY0KhT5qwZdnCY/D7c+uzksi H1dfA+W8clVSUSDMky0bEI2qv1Ks08E= X-Google-Smtp-Source: AGHT+IG38G6yAu8JWH8NqVqdmdowLZTl4+N/W5o3WEMSCbWHIPWG6wU0Id90/z4csPst1GtZzn1Bfg== X-Received: by 2002:a5d:43c3:0:b0:31f:84c9:d75f with SMTP id v3-20020a5d43c3000000b0031f84c9d75fmr7786907wrr.4.1695060222784; Mon, 18 Sep 2023 11:03:42 -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.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 11:03:42 -0700 (PDT) From: Simon Tournier Date: Mon, 18 Sep 2023 20:03:14 +0200 Message-Id: <9582ebba5df585ec5c71e008e71aaefafc036753.1695060058.git.zimon.toutoune@gmail.com> 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 | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm index 4c3ceed10904..fb361a004435 100644 --- a/guix/import/juliahub.scm +++ b/guix/import/juliahub.scm @@ -67,6 +67,16 @@ (define (json->juliahub-direct-dependencies vector) #f))) (vector->list vector)))) +(define (json->juliahub-indirect-dependencies vector) + (if (vector? vector) + (filter-map + (lambda (el) + (let ((dep (json->juliahub-dependency el))) + (if (not (juliahub-dependency-direct? dep)) + dep + #f))) + (vector->list vector)))) + (define (ini-list->extra-dependencies lst) (match lst (('(extras) ooo ...) @@ -103,6 +113,9 @@ (define-json-mapping make-juliahub-package juliahub-package? (direct-dependencies juliahub-package-direct-dependencies "deps" json->juliahub-direct-dependencies) ;list of + (indirect-dependencies + juliahub-package-indirect-dependencies "deps" + json->juliahub-indirect-dependencies) ;list of (url juliahub-package-url) ;string (uuid juliahub-package-uuid) ;string (license juliahub-package-license)) ;string @@ -181,7 +194,7 @@ (define* (juliahub->guix-package package-name (juliahub-package-direct-dependencies package) test-dependencies-names licenses) - (append dependencies-names test-dependencies)))) + (append dependencies-names test-dependencies-names)))) (values #f '())))) (define* (import-release package #:key (version #f)) From patchwork Mon Sep 18 18:03:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54034 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 0765227BBE9; Mon, 18 Sep 2023 19:07:50 +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,URIBL_BLOCKED autolearn=unavailable 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 1B62F27BBE2 for ; Mon, 18 Sep 2023 19:07:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiIdY-0005NL-44; Mon, 18 Sep 2023 14:06:20 -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 1qiIdJ-00059e-J9 for guix-patches@gnu.org; Mon, 18 Sep 2023 14:06:06 -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 1qiIdJ-00045b-B4 for guix-patches@gnu.org; Mon, 18 Sep 2023 14:06:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiIdR-0002Wj-KV for guix-patches@gnu.org; Mon, 18 Sep 2023 14:06:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66090] [PATCH v2 08/23] DRAFT import: juliahub: Add updater and recursive-importer. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Sep 2023 18:06:13 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66090 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62202@debbugs.gnu.org Cc: 66090@debbugs.gnu.org, zimon.toutoune@gmail.com X-Debbugs-Original-Cc: Nicolas Graves via Guix-patches via , Simon Tournier Received: via spool by submit@debbugs.gnu.org id=B.16950603649508 (code B ref -1); Mon, 18 Sep 2023 18:06:13 +0000 Received: (at submit) by debbugs.gnu.org; 18 Sep 2023 18:06:04 +0000 Received: from localhost ([127.0.0.1]:54486 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIdH-0002T7-FE for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:06:03 -0400 Received: from lists.gnu.org ([2001:470:142::17]:58376) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbl-0002KT-Uu for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:30 -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 1qiIbK-0002T8-Dx for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:05 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qiIb4-0003PH-0U for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:02 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-40506bfca64so5345575e9.0 for ; Mon, 18 Sep 2023 11:03:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695060223; x=1695665023; darn=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=ztz1RPjEh+K0rOlxYL3bQHgKm/dUmaijlCwTDzOT3tM=; b=X1ShXj39hCyBsJd6+2cV67MfuASyfbsNoo102funRLeK1H7MRYE2yMdaf97UhIWglF LECrRCEb2VymOen+jm1AGP0FjZH+kOVfzhTJjLA1OBzVPFmqDvYFnAoSRzMyTShybDnO UDkgwRduWc952GhbF7SAA8RyB9D6uYQ5kCdwoNyM3+leBHdxWP1FJgYsx4FuxqzKFUME 3H25GBj2lBqECQ1yeVwR+F0LYd/119wcV3PvneZl/SBLR3ECkL/Bwdit9TtKs6JhPqjz EY7CDIx+V1EdTI7dBGPjX+zf0am9+knUNpRwrsEaJwXHZRLLblpdEr2VMmO8f0aSub7T jJvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695060223; x=1695665023; 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=ztz1RPjEh+K0rOlxYL3bQHgKm/dUmaijlCwTDzOT3tM=; b=r8CdWrzlBSPzL8FBkfABhTmw4i7KiOlBYzwVPHOJF7nng28gvoFYsQXkj3K9ifV93Z cRHg1gstIr7IyVpbdr8AtROTItzOKBf9f2hkcVgAvyQRs8UNmMOVF/WYOxopqVDScbvK oSCkh0jC28N7A9UIBha2MxrCVPLgzJtfjBwahXMFAVMu6F0zpakHjICJWmdkCsxfuWut YNR2jKTWOQBCj0/t3kxKcqHMkkjl/0DjkF1izXR/5JwQmxdIOGAxirT6ulf+WuAjEkH+ VoxJ9gl4VFeQnm5UmvGRhfXeaJrZbnOKzZNeOxA+lwlFg5ylMq6JEFHYHbJ8hOscqq9T hJpg== X-Gm-Message-State: AOJu0Yyzo/AUTwgktKeLbWxZ5UcqBzXcZFphhFERSsypUdNNWEx7qiAD rNcpmQCiGwOMhLBkrok68QeuDa5uuDQ= X-Google-Smtp-Source: AGHT+IGiFPozZpqXMIotFMG19AF6UYfY3K9JM2w+Vg5Ej5mTVBniW7i+weOKu/4Jhd2ju0ndIfcYSQ== X-Received: by 2002:a5d:420c:0:b0:317:8fd:f01a with SMTP id n12-20020a5d420c000000b0031708fdf01amr8214053wrq.7.1695060223343; Mon, 18 Sep 2023 11:03:43 -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.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 11:03:43 -0700 (PDT) From: Simon Tournier Date: Mon, 18 Sep 2023 20:03:15 +0200 Message-Id: <26c9a5ca41ad1697225de11b5513fcfe04d26f71.1695060058.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32f; envelope-from=zimon.toutoune@gmail.com; helo=mail-wm1-x32f.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm index fb361a004435..c38c830caaa0 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)) From patchwork Mon Sep 18 18:03:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54029 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 C671127BBEA; Mon, 18 Sep 2023 19:07:20 +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,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 CA15C27BBEC for ; Mon, 18 Sep 2023 19:07:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiId8-0004YP-2d; Mon, 18 Sep 2023 14:05:54 -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 1qiIcC-0003Ag-Q5 for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:57 -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 1qiIcC-0003YZ-IK for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiIcK-0002Nt-S0 for guix-patches@gnu.org; Mon, 18 Sep 2023 14:05:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62202] [PATCH v2 09/23] DRAFT import: juliahub: Filter out julia stdlibs. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Sep 2023 18:05:04 +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.16950602538835 (code B ref 62202); Mon, 18 Sep 2023 18:05:04 +0000 Received: (at 62202) by debbugs.gnu.org; 18 Sep 2023 18:04:13 +0000 Received: from localhost ([127.0.0.1]:54379 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbU-0002IK-Kc for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:13 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:41001) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbG-0002Ei-2v for 62202@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:01 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-3200b181b67so96155f8f.0 for <62202@debbugs.gnu.org>; Mon, 18 Sep 2023 11:03:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695060224; x=1695665024; 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=OaQN5db89UTvsdYmpAsDFBxhyD2sfWmK9wAwHYRwHzo=; b=GzICWzFLx9PgzRpDfKbj2Dq28uY8m+pkGhlt+p8h667HnYMAoCvtnW4Ahs3R+IVz4y 9Ac0Fj/0xYPTSJb7wB9TQzGe3nfqfWffIu95JJa9ouK+MxheCQudVvZS4LUoX+jiLIXa NiQfmPbJ1o59KoR7dXpxlF6l4wjKbVqPd9bnJirD2VEC6E6sYwX8W3AJGiJW1f0QfS7i 6//qrs6YUze9tnXGlVCEU0S4dwglp9CloELhaVdratZDT9Ug6Kbr/N/14iMJQagdZ5Op kE6wN0mU53GxCb+oanOcWbS/8VYZgdFRcKV1rvdjpRcAHuILyiO/rutgg3ZpxWHTjA38 OTAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695060224; x=1695665024; 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=OaQN5db89UTvsdYmpAsDFBxhyD2sfWmK9wAwHYRwHzo=; b=mRkXQOY423AGZ1okHBMTV9aoywA7qM7bRzV+H0rg2i26Zs307R6+rLsoe3pCgD7lN9 u9YXnRp/jEn5RmPz3+uTTykKMljULTXDzvMWyvxcJX29Cq1bRRWNd1wsIRQklda/2K6O EugmZcBRLrWIpN7dZXfzH/t82092/zGriDSv7+WBLnQtPvG3aapymueius8/wJVfSQnv /MCmRL1f/TE+LTSCnamRUsVklM++Q6jpoHswy9cjL8BA0zGiezpnGZ1W2foVLLTxliQ9 V9k/WdJBv7RzMcz9SS8TQS7Gw3eB2dDVeZy/m06bXUN7lmsJW/okyy0BU52+L6+YUdbE 2ajw== X-Gm-Message-State: AOJu0Yyc3cCV6EuuTMxYXJYpZi2U1Ru0BtXJQQ04R9LEExjm5u43xY74 ZduTHdCJ6L5H61J+lVMLLVhwvr455qY= X-Google-Smtp-Source: AGHT+IFoD4xvGhf9ebg6bcBiFQKTjEepHVoOVNrDiB/qnYg8QoTX8GybyanzjGfgABzALvQDv03DXQ== X-Received: by 2002:a5d:4451:0:b0:317:3a23:4855 with SMTP id x17-20020a5d4451000000b003173a234855mr7574455wrr.2.1695060223873; Mon, 18 Sep 2023 11:03:43 -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.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 11:03:43 -0700 (PDT) From: Simon Tournier Date: Mon, 18 Sep 2023 20:03:16 +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 | 49 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm index c38c830caaa0..af08f3d698d0 100644 --- a/guix/import/juliahub.scm +++ b/guix/import/juliahub.scm @@ -38,6 +38,47 @@ (define-module (guix import juliahub) %juliahub-updater juliahub-recursive-import)) +;; To update, see file sysimg.jl +(define %julia-stdlibs + (list "julia" + "ArgTools" + "Artifacts" + "Base64" + "CRC32c" + "FileWatching" + "Libdl" + "Logging" + "Mmap" + "NetworkOptions" + "SHA" + "Serialization" + "Sockets" + "Unicode" + "DelimitedFiles" + "LinearAlgebra" + "Markdown" + "Printf" + "Random" + "Tar" + "Dates" + "Distributed" + "Future" + "InteractiveUtils" + "LibGit2" + "Profile" + "SparseArrays" + "UUIDs" + "REPL" + "SharedArrays" + "Statistics" + "SuiteSparse" + "TOML" + "Test" + "LibCURL" + "Downloads" + "Pkg" + "LazyArtifacts")) + (define (juliahub-uri name) (let* ((url (string-append "https://docs.juliahub.com/" name "/")) (port (http-fetch url #:text? #t)) @@ -64,7 +105,9 @@ (define (json->juliahub-direct-dependencies vector) (filter-map (lambda (el) (let ((dep (json->juliahub-dependency el))) - (if (juliahub-dependency-direct? dep) + (if (and (juliahub-dependency-direct? dep) + (not (member (juliahub-dependency-name dep) + %julia-stdlibs))) dep #f))) (vector->list vector)))) @@ -74,7 +117,9 @@ (define (json->juliahub-indirect-dependencies vector) (filter-map (lambda (el) (let ((dep (json->juliahub-dependency el))) - (if (not (juliahub-dependency-direct? dep)) + (if (and (not (juliahub-dependency-direct? dep)) + (not (member (juliahub-dependency-name dep) + %julia-stdlibs))) dep #f))) (vector->list vector)))) From patchwork Mon Sep 18 18:03:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54026 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 7A22727BBE9; Mon, 18 Sep 2023 19:07:02 +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=unavailable 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 DB9E827BBE2 for ; Mon, 18 Sep 2023 19:07:00 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiIdO-0005DE-IP; Mon, 18 Sep 2023 14:06:12 -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 1qiId9-0004k8-88 for guix-patches@gnu.org; Mon, 18 Sep 2023 14:05:55 -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 1qiId8-00041p-VH for guix-patches@gnu.org; Mon, 18 Sep 2023 14:05:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiIdH-0002Sy-6V for guix-patches@gnu.org; Mon, 18 Sep 2023 14:06:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66076] [PATCH v2 10/23] DRAFT import: juliahub: Simplify juliahub dependency management. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Sep 2023 18:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66076 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62202@debbugs.gnu.org Cc: 66076@debbugs.gnu.org, zimon.toutoune@gmail.com X-Debbugs-Original-Cc: Nicolas Graves via Guix-patches via , Simon Tournier Received: via spool by submit@debbugs.gnu.org id=B.16950603239328 (code B ref -1); Mon, 18 Sep 2023 18:06:02 +0000 Received: (at submit) by debbugs.gnu.org; 18 Sep 2023 18:05:23 +0000 Received: from localhost ([127.0.0.1]:54455 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIcc-0002QI-QH for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:05:23 -0400 Received: from lists.gnu.org ([2001:470:142::17]:58302) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbe-0002Je-Nt for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:24 -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 1qiIbD-0002Pk-A2 for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:00 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qiIb5-0003PV-73 for guix-patches@gnu.org; Mon, 18 Sep 2023 14:03:53 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-321617ef967so108827f8f.0 for ; Mon, 18 Sep 2023 11:03:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695060225; x=1695665025; darn=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=11mUEohHcrH+QNTVAs5Uln5kD6Ej1y2o4Jf0is9mgJM=; b=OyuIcadu+5ocfxAq0kxvRE7Vo1zqGTMVHvRpTL8ueELQWwyiTFzMQasL28fuTeDEd8 +1n2OjMDCTCys+sxCfPSR95FcAW+S/hD9d6yiD0BYYIlXXwZplJKPE8Se6/rmA3StrTv ZhjqBKwAQk8D5cy5yBMTc3qDTcFFMxdMd4RSoIFIJFQ9foHfbQdHT6yG/WzqSN347DYM q3BED3Gw+/RuBP965JBS8iaJGdxxKS/CoAP0fttV5KCzvuS9nNF1HfC/olSfOLIsUQZl hTcE2FGSnNDBKw2ODWWBPOtvHB5SAmAdyNUzSC6EPkzjbjcrFP83JjwqRnnwzPflXwhQ KUnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695060225; x=1695665025; 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=11mUEohHcrH+QNTVAs5Uln5kD6Ej1y2o4Jf0is9mgJM=; b=F6GldQ77sxtLBo/fhjU9bt531h45jr9tvW+klIGENl4oJIvzX4lfeDTKSp8eAXiJQe MVnxxvS7Hz0uPUHv+Hvj2CG7vA97wbYPcl158r0amaarCV+KB1JSayj3o6rvA5/CG0X/ DJFIq5zX2GZ6jUCwoUFf62kze6GoYSd5QpAzVm5KShaEWryn3AWYPwmWq+oGWP9VwbQz UC9kmY7JZArjiJnNY7f6v72S+c/SedvjmG9R8oQWDUfZi4X0GOuyORcRXFm3hNlkA2Uc Sws+3dqkC9FjYM0eYI4tKNpfUitceO8+1rQY3HuiBy34rBO1OaEQxrqGLh6rgMwa0DI3 hUHA== X-Gm-Message-State: AOJu0YztV7afpj+3L8zLZTdsF1USKq7fhEpEYacFNzwqawjnMwK0S+XN kofFoTyc6AGTxwsz1mfFSno= X-Google-Smtp-Source: AGHT+IHOMZp0/QSXZeD+sEgNq/N/ASaY17Wre5gIqIlTpo7kpcUxjCIYWu6l8mCXVGDTnDzqqjAljQ== X-Received: by 2002:a05:6000:1047:b0:31f:a096:6e18 with SMTP id c7-20020a056000104700b0031fa0966e18mr7723857wrx.6.1695060224406; Mon, 18 Sep 2023 11:03:44 -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.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 11:03:44 -0700 (PDT) From: Simon Tournier Date: Mon, 18 Sep 2023 20:03:17 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=zimon.toutoune@gmail.com; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 | 42 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm index af08f3d698d0..b1eeb736a824 100644 --- a/guix/import/juliahub.scm +++ b/guix/import/juliahub.scm @@ -100,26 +100,13 @@ (define (juliahub-slug-version name) (latest-version (string-drop uri 6))) `(,slug ,latest-version))) -(define (json->juliahub-direct-dependencies vector) +(define (json->juliahub-dependencies vector) (if (vector? vector) (filter-map (lambda (el) (let ((dep (json->juliahub-dependency el))) - (if (and (juliahub-dependency-direct? dep) - (not (member (juliahub-dependency-name dep) - %julia-stdlibs))) - dep - #f))) - (vector->list vector)))) - -(define (json->juliahub-indirect-dependencies vector) - (if (vector? vector) - (filter-map - (lambda (el) - (let ((dep (json->juliahub-dependency el))) - (if (and (not (juliahub-dependency-direct? dep)) - (not (member (juliahub-dependency-name dep) - %julia-stdlibs))) + (if (not (member (juliahub-dependency-name dep) + %julia-stdlibs)) dep #f))) (vector->list vector)))) @@ -157,12 +144,9 @@ (define-json-mapping make-juliahub-package juliahub-package? (readme juliahub-package-readme) ;string (version juliahub-package-version) ;string (description juliahub-package-description) ;string - (direct-dependencies - juliahub-package-direct-dependencies "deps" - json->juliahub-direct-dependencies) ;list of - (indirect-dependencies - juliahub-package-indirect-dependencies "deps" - json->juliahub-indirect-dependencies) ;list of + (dependencies + juliahub-package-dependencies "deps" + json->juliahub-dependencies) ;list of (url juliahub-package-url) ;string (uuid juliahub-package-uuid) ;string (license juliahub-package-license)) ;string @@ -184,7 +168,7 @@ (define* (juliahub-fetch name #:key (version #f)) json->juliahub-package)) (define (make-julia-sexp name source home-page synopsis description - direct-dependencies test-dependencies-names licenses) + dependencies test-dependencies-names licenses) "Return the `package' s-expression for a Julia package with the given NAME, VERSION, URI, HASH, HOME-PAGE, DESCRIPTION, DEPENDENCIES, TEST-DEPENDENCIES-NAMES and LICENSES." @@ -193,11 +177,13 @@ (define (make-julia-sexp name source home-page synopsis description (version ,version) (source ,source) (build-system julia-build-system) - ,@(if (null? direct-dependencies) - '() - `((propagated-inputs - (list ,@(map (compose julia-name->guix-name juliahub-dependency-name) - direct-dependencies))))) + ,@(let ((direct-dependencies + (filter julia-dependency-direct? dependencies))) + (if (null? direct-dependencies) + '() + `((propagated-inputs + (list ,@(map (compose julia-name->guix-name juliahub-dependency-name) + direct-dependencies)))))) ,@(if (null? test-dependencies-names) '() `((native-inputs From patchwork Mon Sep 18 18:03:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54038 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 5B11427BBEA; Mon, 18 Sep 2023 19:08:42 +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=unavailable 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 00A8627BBE2 for ; Mon, 18 Sep 2023 19:08:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiIdZ-0005Qe-Na; Mon, 18 Sep 2023 14:06:23 -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 1qiIdL-0005DF-1N for guix-patches@gnu.org; Mon, 18 Sep 2023 14:06:08 -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 1qiIdK-000461-Pi for guix-patches@gnu.org; Mon, 18 Sep 2023 14:06:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiIdT-0002XD-0Y for guix-patches@gnu.org; Mon, 18 Sep 2023 14:06:15 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66092] [PATCH v2 11/23] DRAFT import: juliahub: Improve dependency management. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Sep 2023 18:06:14 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66092 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62202@debbugs.gnu.org Cc: 66092@debbugs.gnu.org, zimon.toutoune@gmail.com X-Debbugs-Original-Cc: Nicolas Graves via Guix-patches via , Simon Tournier Received: via spool by submit@debbugs.gnu.org id=B.16950603659536 (code B ref -1); Mon, 18 Sep 2023 18:06:14 +0000 Received: (at submit) by debbugs.gnu.org; 18 Sep 2023 18:06:05 +0000 Received: from localhost ([127.0.0.1]:54492 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIdI-0002TY-Hz for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:06:05 -0400 Received: from lists.gnu.org ([2001:470:142::17]:34906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbm-0002LH-2N for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:36 -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 1qiIbQ-0002Vw-Ln for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:10 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qiIbA-0003PX-LM for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:08 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-31ff6420f73so224684f8f.1 for ; Mon, 18 Sep 2023 11:03:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695060225; x=1695665025; darn=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=qM+SVoQB9toi6PC+m9jnwY9o5wFqpZW9jHiqrI8o5XA=; b=SYGEKYqyUmWmjuwnsfmaeF1ItlOLEzus7e7Xi9pvKtyM7L+BmhaAxORqFb7oDYwya2 yRfL7xr2lC7u3/nwvAxyxlv2sYq/J88RNeuAsjCAT3k+aAa1S02oNn2tNZ8UBgxGMNZZ mlvAislJ2o3CUrbsQrdLDWSgJgWbGPgSa1Ku7IKt28qF3Fv9aShh/ZKH3iN9r6UsvXmg B9SyFMsWpMd9dbAg5gA3veUxJjSvh14MnRMucRVuCHtJIhfPD/UWM5gmWMdbIu5Pretk 2LaHb7q4FrkpHljL/lfRysfWO6enzO1WV0LSQeZ2IT/1+hUHdNESXMu2U6EhYShJsLx+ SJDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695060225; x=1695665025; 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=qM+SVoQB9toi6PC+m9jnwY9o5wFqpZW9jHiqrI8o5XA=; b=PirBen2ifXSlAJWQhWCyUXw/8Da8u+EgIsqFE47h7TL4ODplbPCGaWoUVUVDSeV9Gg GAaCpSYLt28VlOm547+OrwXvIvPXlxIXy5MPCxkuTcgG+ODv7Nqp9Xu+JqhXb0olnO3l s3iLm55Be6XGuqtrhrfm4Jk9OrislVEfIHN10tUl1G8HcqoMrA1BtuzfUFFR0p/QJDTf i6YHg8MTYavAUsplAGJpQNop81LvnA71L0A/6hyRNN3Mm4IMw+B0pEagggHev0B1yUZk CVxFhZaPe43Pb3B50gZcpb7yCeE/sCuxpgVvwSK7xtbNjfmewbWZsoJCY/Okh1YixczT nPcQ== X-Gm-Message-State: AOJu0Yw1i2+7hmvOMnwE36YuqBxSOwkKmmxOhJMqUdTAVKVw0V/p309X s4c8MxMd1RkGFRBk3RV9D0c= X-Google-Smtp-Source: AGHT+IH4OIOewHKT4Nf9ssrE49TpirRUfigR1o2uHDImUBPu1yKTaCvO8fipQM4ypDeGNb9Oioqy4A== X-Received: by 2002:a5d:484a:0:b0:31a:ea18:c516 with SMTP id n10-20020a5d484a000000b0031aea18c516mr8306778wrs.3.1695060224905; Mon, 18 Sep 2023 11:03:44 -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.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 11:03:44 -0700 (PDT) From: Simon Tournier Date: Mon, 18 Sep 2023 20:03:18 +0200 Message-Id: <9c97220836376a2e6de87f52b4a7b842581225ed.1695060058.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=zimon.toutoune@gmail.com; helo=mail-wr1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm index b1eeb736a824..fc25ba1d4220 100644 --- a/guix/import/juliahub.scm +++ b/guix/import/juliahub.scm @@ -168,22 +168,20 @@ (define* (juliahub-fetch name #:key (version #f)) json->juliahub-package)) (define (make-julia-sexp name source home-page synopsis description - dependencies test-dependencies-names licenses) + direct-dependencies test-dependencies-names licenses) "Return the `package' s-expression for a Julia package with the given NAME, -VERSION, URI, HASH, HOME-PAGE, DESCRIPTION, DEPENDENCIES, +VERSION, URI, HASH, HOME-PAGE, DESCRIPTION, DIRECT-DEPENDENCIES, TEST-DEPENDENCIES-NAMES and LICENSES." `(package (name ,(julia-name->guix-name name)) (version ,version) (source ,source) (build-system julia-build-system) - ,@(let ((direct-dependencies - (filter julia-dependency-direct? dependencies))) - (if (null? direct-dependencies) - '() - `((propagated-inputs - (list ,@(map (compose julia-name->guix-name juliahub-dependency-name) - direct-dependencies)))))) + ,@(if (null? direct-dependencies) + '() + `((propagated-inputs + (list ,@(map (compose julia-name->guix-name juliahub-dependency-name) + direct-dependencies))))) ,@(if (null? test-dependencies-names) '() `((native-inputs @@ -211,9 +209,12 @@ (define* (juliahub->guix-package package-name `(tag-or-commit . ,(string-append "v" (juliahub-package-version package)))))) - (let* ((dependencies-names + (let* ((direct-dependencies + (filter juliahub-dependency-direct? + (juliahub-package-dependencies package))) + (dependencies-names (map juliahub-dependency-name - (juliahub-package-direct-dependencies package))) + direct-dependencies)) (licenses (map spdx-string->license (list (juliahub-package-license package)))) @@ -224,7 +225,7 @@ (define* (juliahub->guix-package package-name (juliahub-package-homepage package) (juliahub-package-description package) (beautify-description (juliahub-package-readme package)) - (juliahub-package-direct-dependencies package) + direct-dependencies test-dependencies-names licenses) (append dependencies-names test-dependencies-names)))) From patchwork Mon Sep 18 18:03:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54036 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 C79C627BBE9; Mon, 18 Sep 2023 19:08:12 +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,URIBL_BLOCKED autolearn=unavailable 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 B90B627BBE2 for ; Mon, 18 Sep 2023 19:08:09 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiIcx-0004AH-DX; Mon, 18 Sep 2023 14:05:45 -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 1qiIcF-0003DB-FW 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 1qiIcF-0003ZN-7Z for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiIcN-0002Oi-HY for guix-patches@gnu.org; Mon, 18 Sep 2023 14:05:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62202] [PATCH v2 12/23] DRAFT import: juliahub: Add functions to parse the git repo for a git tag. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Sep 2023 18:05: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 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.16950602568893 (code B ref 62202); Mon, 18 Sep 2023 18:05:07 +0000 Received: (at 62202) by debbugs.gnu.org; 18 Sep 2023 18:04:16 +0000 Received: from localhost ([127.0.0.1]:54393 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbY-0002JG-7r for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:16 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:40127) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbH-0002Eo-KZ for 62202@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:04 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-40471c054f9so14350515e9.0 for <62202@debbugs.gnu.org>; Mon, 18 Sep 2023 11:03:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695060225; x=1695665025; 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=naePonU76gTGTfpRR8tIbQvC/x6wxVESjDneXTICeZ0=; b=I9rp2BDaxnl+0HJPhzTE26DzMfHHf8FVuLl0xZPaa83Gki1f/6OkXzvLp+He9VMmip yWLm+AtSu1E/BglBzU1GqJuz4MqE3uQ6wSow6Pqk2h10zAr5jha6STUfynZSxgUF9r6p +E+Y4KTm8CZ+IuAgkR8g6cLRRMcibzoXHYiekMQIHZ8keoqk23lll6guwopRpZ7oz2YJ 0/Vzsbdhua7pUy9Q3v1TysjqxTBEAce9JXVXJJQ/QWz3WZBgkLLl+/STJonm/mKAUIFz FH7g0GrWmK+TRaXz/vfMOM0uWWpPIAbYI7VSEpboJ14juE4Lw4HZltCfW+gKGP2lXLES J44A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695060225; x=1695665025; 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=naePonU76gTGTfpRR8tIbQvC/x6wxVESjDneXTICeZ0=; b=UKhYf3Ys1jQ5eZF99EdV5VcI0EQSRhtUTBp2/MKmcftmQG4ezGBP2YJ9AXpTbJl4xt IfhIs+9c/DmB1edVSyJBOvSMyFm/Us+adMPxPXCg3z5/0lgr6LikH0HPbb/iiIhFCdio V5Zlu2Kr4seFkoiK24h+XCQZ3vgn8kTBTFTkylEKw1XZrRAI+M20eLv/rq0R8vFe8mm2 gRYVtImcRDCvaejtPINOqrgsAVNaXQAhnzdgBu3UvrUnzl7VtfJIXQJUBoNr5ev+dALK YFG7wAS6ZhJr2xiB+slWeVulVl4OVI0oheeH/kf2ZACSps9w6u8NcWrRAz7zLLHPoN1J QwMw== X-Gm-Message-State: AOJu0Yxii844+3THq0A1EsGChhnimi5sJtuXT65jzCgd24hFBsAVUts9 VBKXsFo9XDeeGOTCAOsUMqTptGMJNN4= X-Google-Smtp-Source: AGHT+IELLI9+EqhFGs/m2GoRd8GSftNhN7iYJqP9e6nqsk98K9forq+ChwIxCQuTWCWoxBiUiZXvKQ== X-Received: by 2002:adf:ecc7:0:b0:31f:899b:a47 with SMTP id s7-20020adfecc7000000b0031f899b0a47mr7943960wro.4.1695060225415; Mon, 18 Sep 2023 11:03:45 -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.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 11:03:45 -0700 (PDT) From: Simon Tournier Date: Mon, 18 Sep 2023 20:03:19 +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 | 62 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 56 insertions(+), 6 deletions(-) diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm index fc25ba1d4220..5327e923251d 100644 --- a/guix/import/juliahub.scm +++ b/guix/import/juliahub.scm @@ -26,6 +26,7 @@ (define-module (guix import juliahub) #:use-module (srfi srfi-9) #:use-module (srfi srfi-11) #:use-module (guix http-client) + #:use-module (guix git) #:use-module (guix import utils) #:use-module (guix import json) #:use-module (guix base32) @@ -38,6 +39,48 @@ (define-module (guix import juliahub) %juliahub-updater juliahub-recursive-import)) +;; Juliahub may be more up-to-date than the General registry or the actual git +;; tag (it seems around 6 hours pass between the time a commit is supplied to +;; JuliaRegistrator as a release, and the time Julia TagBot Github Action makes +;; the git tag). We have no simple way to get the commit of the latest-version. +;; Thus the best simple thing we can do is get the latest-git-version, and +;; import this version instead. We do this by parsing Package.toml in the General +;; registry, and then getting the refs of the git repo supplied by this +;; file. Parsing this file is also necessary if the package is in a subdir of a +;; git repository, because the information isn't present in Juliahub. +;; There's a last case where some Julia packages are not based on a particular +;; git tag, and where looking for the commit is tedious and artificial. In these +;; cases, we introduce the tree-commit which is available in the Versions.toml +;; file in the General repository. This is equivalent to a commit, since we have +;; a unique hash of the listing of files and directories, thus it can be used to +;; identify the state of a repository. + +(define %general-base-url + "https://raw.githubusercontent.com/JuliaRegistries/General/master/") + +(define (general-url package-name file) + (let ((folder (string-capitalize (string-take package-name 1)))) + (string-append + %general-base-url folder "/" package-name "/" file))) + +(define (ini-list->alist lst) + (match lst + ((attribute '= value ooo ...) + `((,attribute . ,value) ,@(ini-list->alist ooo))) + ('() + '()))) + +(define (ini-fetch url) + (let* ((port (http-fetch url #:text? #t)) + (ini-list (stream->list (port->stream port read)))) + (close-port port) + (ini-list->alist ini-list))) + +(define (latest-git-tag repo) + (let* ((last-ref (last (remote-refs repo #:tags? #t))) + (last-git-tag (last (string-split last-ref #\/)))) + (string-drop last-git-tag 1))) + ;; To update, see file sysimg.jl (define %julia-stdlibs (list "julia" @@ -194,14 +237,21 @@ (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 (if version - (juliahub-fetch package-name version) - (juliahub-fetch package-name)))) + (let* ((package-toml (ini-fetch (general-url name "Package.toml"))) + (subdir (assoc-ref package-toml 'subdir)) + (tag (latest-git-tag (assoc-ref package-toml 'repo))) + (package (if version + (juliahub-fetch package-name version) + (if tag + (juliahub-fetch package-name tag) + (juliahub-fetch package-name))))) (if package (let-values (((source directory) (git->origin+dir @@ -233,13 +283,13 @@ (define* (juliahub->guix-package package-name (define (guix-package->juliahub-name package) (let* ((url (juliahub-package-url package)) - (git-name (car (last-pair (string-split url #\/)))) + (git-name (last (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))) + (string-drop-right ungitted-name 4) + ungitted-name))) package-name)) (define* (import-release package #:key (version #f)) From patchwork Mon Sep 18 18:03:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54045 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 1EF4C27BBEA; Mon, 18 Sep 2023 19:10:24 +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 4742A27BBE2 for ; Mon, 18 Sep 2023 19:10:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiIeA-00067s-G2; Mon, 18 Sep 2023 14:06:58 -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 1qiIdJ-00059d-6U for guix-patches@gnu.org; Mon, 18 Sep 2023 14:06:06 -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 1qiIdI-00045R-Mn for guix-patches@gnu.org; Mon, 18 Sep 2023 14:06:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiIdQ-0002WV-WF for guix-patches@gnu.org; Mon, 18 Sep 2023 14:06:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66089] [PATCH v2 13/23] DRAFT import: juliahub: Improve test dependencies parsing. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Sep 2023 18:06:12 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66089 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62202@debbugs.gnu.org Cc: 66089@debbugs.gnu.org, zimon.toutoune@gmail.com X-Debbugs-Original-Cc: Nicolas Graves via Guix-patches via , Simon Tournier Received: via spool by submit@debbugs.gnu.org id=B.16950603639498 (code B ref -1); Mon, 18 Sep 2023 18:06:12 +0000 Received: (at submit) by debbugs.gnu.org; 18 Sep 2023 18:06:03 +0000 Received: from localhost ([127.0.0.1]:54483 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIdG-0002Sq-Pg for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:06:03 -0400 Received: from lists.gnu.org ([2001:470:142::17]:58294) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbe-0002Jd-Nn for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:23 -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 1qiIbD-0002Pj-9e for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:00 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qiIb9-0003Ph-TT for guix-patches@gnu.org; Mon, 18 Sep 2023 14:03:54 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-404800222d2so8773795e9.0 for ; Mon, 18 Sep 2023 11:03:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695060226; x=1695665026; darn=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=YXqL4K66ytKP24DRIGlGdAvLaLiYuD/871Y6ruKDXqQ=; b=LJO8igGzkryqy4xhMWVYAw3xVybkiADir25BKhGOdne981Bm1hrejD1GaNZVE+4W7Z COcYAfjBveynAPc31E53iHvuLPg4NHbtS9SOi/H89Km78NdgQn4B3q/nYxnU073A9t9O ZzPep+WPQBoFb7OsFPKJ/z7hP8xUioKILoM7MBLrHAIXT+DjM8cc99jHDup9vZOa8/Fx XYiedkuR3hJ2ERrceAuDNA/0cSvRq4sIZt781/262RnGAjCpbk/y8YvaTzZpg6orinAw 3BfFzQXAhSmU2DqalNKtPn/Cku5cp4DQQ1HV5q92KOQ4TIy7zGIW9kItasLNvPc0y0Kr Gsbw== 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=YXqL4K66ytKP24DRIGlGdAvLaLiYuD/871Y6ruKDXqQ=; b=hzgp6uSkRnnu8cYzmTS/B+q2Lze+Fqmxhw+bXgKWKL8eEce7YWU7KpvjWzWMGYCBkx sAg+zu6QyvJWUiEH+pHJv8B6pkBI/qcy26b3K4olWESLEUF/xNefMRqR9Z4l1/PbK7jT V5aooZ1GUEUeT0RBzcbdLAC2/R8gunFIDQ8lAG1sijQK3thN4Axr6wDxPeWMf4jYCyds esQo8hLI76A/NXwoqM/OKpKLc/1PfyKXqs1BRXnLEUFF6MuL5l7uBfFdlfg+9O9F+P7j Vrxocs0/LYHoN3VYOHTOp4AAdy7Wa/EiM673fXCcVohRGrMwPi3Xz0utV+0og4/hFU2u vONQ== X-Gm-Message-State: AOJu0Yzu3oqhWlnpo4FGgU5CAHvgDaERvuAu1JK3F3nv0PwJA8tnyozs sA+FHJvD2vDgOOt9TQKIg60= X-Google-Smtp-Source: AGHT+IEQ1arr7j2r1YrsSfB+aA/7qxSqZoaNVcdHY5PC+lM01DE8qRa8ZAwPXzkg5T0JiMuf3eQogg== X-Received: by 2002:a05:600c:3d89:b0:401:c717:ec69 with SMTP id bi9-20020a05600c3d8900b00401c717ec69mr8974386wmb.4.1695060225959; Mon, 18 Sep 2023 11:03:45 -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.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 11:03:45 -0700 (PDT) From: Simon Tournier Date: Mon, 18 Sep 2023 20:03:20 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=zimon.toutoune@gmail.com; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm index 5327e923251d..2ea461b72aba 100644 --- a/guix/import/juliahub.scm +++ b/guix/import/juliahub.scm @@ -154,31 +154,27 @@ (define (json->juliahub-dependencies vector) #f))) (vector->list vector)))) -(define (ini-list->extra-dependencies lst) +(define (ini-list->test-dependencies lst) (match lst - (('(extras) ooo ...) - (extra-list->extra-dependencies ooo)) - (((tag) ooo ...) - (ini-list->extra-dependencies ooo)) - ((attribute '= value ooo ...) - (ini-list->extra-dependencies ooo)) + (('test '= ooo ...) + `(,(caar ooo) ,@(test-list->test-dependencies (cdar ooo)))) + ((value ooo ...) + (ini-list->test-dependencies ooo)) ('() - '()))) + '()))) -(define (extra-list->extra-dependencies lst) +(define (test-list->test-dependencies lst) (match lst - ((attribute '= value ooo ...) - `(,(symbol->string attribute) ,@(extra-list->extra-dependencies ooo))) - (((tag) ooo ...) - '()) + ((('unquote value) ooo ...) + `(,value ,@(test-list->test-dependencies ooo))) ('() - '()))) + '()))) -(define (parse-extra-dependencies directory) +(define (parse-test-dependencies directory) (let* ((port (open-input-file (string-append directory "/Project.toml"))) (ini-list (stream->list (port->stream port read)))) (close-port port) - (ini-list->extra-dependencies ini-list))) + (ini-list->test-dependencies ini-list))) ;; Julia package. (define-json-mapping make-juliahub-package juliahub-package? @@ -268,7 +264,7 @@ (define* (juliahub->guix-package package-name (licenses (map spdx-string->license (list (juliahub-package-license package)))) - (test-dependencies-names (parse-extra-dependencies directory))) + (test-dependencies-names (parse-test-dependencies directory))) (values (make-julia-sexp package-name source 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 From patchwork Mon Sep 18 18:03:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54028 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 2181327BBED; Mon, 18 Sep 2023 19:07:20 +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,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 9D6A127BBEA for ; Mon, 18 Sep 2023 19:07:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiId6-0004MU-T4; Mon, 18 Sep 2023 14:05:52 -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 1qiIcG-0003FW-32 for guix-patches@gnu.org; Mon, 18 Sep 2023 14:05:00 -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 1qiIcF-0003ZT-QR for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiIcN-0002Or-TZ for guix-patches@gnu.org; Mon, 18 Sep 2023 14:05:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62202] [PATCH v2 15/23] DRAFT import: juliahub: Add support for versions for juliahub-fetch. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Sep 2023 18:05: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 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.16950602578900 (code B ref 62202); Mon, 18 Sep 2023 18:05:07 +0000 Received: (at 62202) by debbugs.gnu.org; 18 Sep 2023 18:04:17 +0000 Received: from localhost ([127.0.0.1]:54395 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbY-0002JO-RD for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:17 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:38975) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbJ-0002Es-3U for 62202@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:04 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-404800222d2so8773835e9.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=1695060227; x=1695665027; 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=X6y7F263pQ9DetoUxcmjgz6mDWXsO5xe8gxWGITXaR8=; b=HAaPW2nag7f0ZAhqk3i7vgGpj+96vICdiKpfjLSxmPaq8MLvdvsXpZSnXUZ1jsXoc1 rpFV/aRK8j/vRsjMBtT9p3MWhOaKrvH2FDX2h3g2H9xLkMgyK2hnK+OperGadkceLf+U JkJpmij8Jy+a5KF25rfLbbeq0Pp7gbzcTf8kHAQo2GnQ8GKmVlKptxRN71WbH4KJQUJM YsT8nmVp9nINQX8z/6oSKZxcTKl3wRt518U/Q2EKaHnlsu+JBH1w17J992jJb+16vxXL +dOz326OxnG/tOyiL2FJbn6bl4CKQQkeMSteed1sxu0hghkWaQva3EaGf08GyhCviPVX H0tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695060227; x=1695665027; 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=X6y7F263pQ9DetoUxcmjgz6mDWXsO5xe8gxWGITXaR8=; b=wOmUf/qgBDw6rsKvQXykNPIDVLLQWvK6OSMGyb+oHY1JKv5lo9IsTn+GjDmS6E7Fw7 sxBySXxj+sv9YwoPiGdEY57FM5S/x3kC32QM3l1E+PH/Qa6wy7/VlhBhbu6t0esHnybD qeS2WZfA5qTkLuKoQcNoK7LNPO7Y8VdKhSEcRRkxzNbBGyRimNbxmekKiNRHAXOVZj0F zch9SjTCDNpygCwI+9t21Sfl7/jgNib3b59AoNfgQRfP/qB586vlvaAZxibYb2ZtwS3z yBbSdjzV5H3wHbUz2D5MYPAw524fLQ/cNd+Gsfygs3lM1Hov4z+s3oVmMNJJDuzJQFDU 5+mA== X-Gm-Message-State: AOJu0YwWMVMMFhH7d0BSuubYudQkc1DfDHOs7x4G5QvWZhdtkCDSg9uJ 0zNCKhKkrpBFDzUR1PeYfUTRyvIH7uw= X-Google-Smtp-Source: AGHT+IEpycZYk8lE6bBUr+8ABxBDIacvi6yhbFtVuK87B/LXxq+PSX+xp5PdkARV4OKxZPgjUxpPzQ== X-Received: by 2002:a5d:508e:0:b0:317:73e3:cf41 with SMTP id a14-20020a5d508e000000b0031773e3cf41mr7498521wrt.1.1695060226980; 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:22 +0200 Message-Id: <1fef7a18856fd9670be3746e6f3579a8be39163e.1695060058.git.zimon.toutoune@gmail.com> 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 | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm index b646f9329562..6ce0487dba38 100644 --- a/guix/import/juliahub.scm +++ b/guix/import/juliahub.scm @@ -122,7 +122,7 @@ (define %julia-stdlibs "Pkg" "LazyArtifacts")) -(define (juliahub-uri name) +(define (juliahub-redirect-uri name) (let* ((url (string-append "https://docs.juliahub.com/" name "/")) (port (http-fetch url #:text? #t)) (_ (get-line port)) @@ -134,11 +134,11 @@ (define (juliahub-uri name) (define (juliahub-url name) (let* ((url (string-append "https://docs.juliahub.com/" name "/")) - (uri (juliahub-uri name))) + (uri (juliahub-redirect-uri name))) (string-append url uri "/"))) -(define (juliahub-slug-version name) - (let* ((uri (juliahub-uri name)) +(define (juliahub-slug+version name) + (let* ((uri (juliahub-redirect-uri name)) (slug (string-take uri 5)) (latest-version (string-drop uri 6))) `(,slug ,latest-version))) @@ -203,8 +203,12 @@ (define (julia-name->guix-name name) (define* (juliahub-fetch name #:key (version #f)) "Return a record for package NAME, or #f on failure." - (and=> (json-fetch (string-append (juliahub-url name) "pkg.json")) - json->juliahub-package)) + (let ((url (if version + (string-append "https://docs.juliahub.com/" name "/" + (car (juliahub-slug+version name)) "/" + version "/pkg.json") + (string-append (juliahub-url name) "pkg.json")))) + (and=> (json-fetch url) json->juliahub-package))) (define (make-julia-sexp name source home-page synopsis description direct-dependencies test-dependencies-names licenses) @@ -242,9 +246,9 @@ (define* (juliahub->guix-package package-name (subdir (assoc-ref package-toml 'subdir)) (tag (latest-git-tag (assoc-ref package-toml 'repo))) (package (if version - (juliahub-fetch package-name version) + (juliahub-fetch package-name #:version version) (if tag - (juliahub-fetch package-name tag) + (juliahub-fetch package-name #:version tag) (juliahub-fetch package-name))))) (if package (let-values (((source directory) From patchwork Mon Sep 18 18:03:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54032 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 547F127BBE9; Mon, 18 Sep 2023 19:07:24 +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=unavailable 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 2F1B527BBF2 for ; Mon, 18 Sep 2023 19:07:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiIcR-0003ac-2o; Mon, 18 Sep 2023 14:05:13 -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 1qiIcF-0003Cy-2Z 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-0003ZF-Qp 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 1qiIcN-0002Ob-4d for guix-patches@gnu.org; Mon, 18 Sep 2023 14:05:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62202] [PATCH v2 16/23] DRAFT import: juliahub: Filter out stdlibs from test-dependencies. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Sep 2023 18:05: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 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.16950602568885 (code B ref 62202); Mon, 18 Sep 2023 18:05:07 +0000 Received: (at 62202) by debbugs.gnu.org; 18 Sep 2023 18:04:16 +0000 Received: from localhost ([127.0.0.1]:54391 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbX-0002JA-U6 for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:16 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:40128) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbJ-0002Eu-KA for 62202@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:03 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-40471c054f9so14350695e9.0 for <62202@debbugs.gnu.org>; Mon, 18 Sep 2023 11:03:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695060227; x=1695665027; 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=5zUYG2morKqu0VFKsEpv89xQiuk4D+IDiE55bHsZsr4=; b=MJd9LdcErLGKassUKkEZTuQFyL7d9VTh0xW7LhKkKkkI40oN/2WpAnVcw/lFJGmoAz FnQzSdxFrSzwkcMRCKN9U2lqxEo9e7RyWdL9OjxFOK5fWtmSQWh5dQ/Vo5mQZv3NKU3Z i43Usf55tuXs805A0fl5NPvtGEJaNPJz2F0s72uxav/KV3YparIW/wv9d+zvCKapVFu/ QDRvE50tQ+RRlO5C9wpPRqB9wLFoFsJDUoue4ceCJwPmtgCcfKREgcbS12LOJQz6PWf8 H64t87fLXtNPpLbR4Cd0W4MYZfvvaQkx1ORZQyzHl9A3TmS65otk/5llnyqYvVaGdpTE 7Y9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695060227; x=1695665027; 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=5zUYG2morKqu0VFKsEpv89xQiuk4D+IDiE55bHsZsr4=; b=S2XMemBacXQPh2SOflRsVIiXRmyHbMdhtxnAxYyXheYxwbgJjP4IdTQWo3bY13Icho +1jJ1XhnKDubJZuQGe6YpH4A3KnlnuHOdRMc7TSiMaHnqQ5e+834TpWs01JjtzClBN0q NdaHXvuxbUJ5WNLXJq7H/9ugAGWEV04FMRFYG+J4jEbyZX0uNoM16lal2Ya89d/XOf/P SJH46FW/8lyk94Jp2jNdXUxudp4S6bI6po9rw6K6kC3uN9KtJ83TCbVtz7zpdpcWHhCI MCqV8BPHH0u1vFzKpuJoHxLwWehN1jAsOH7jUrFmaS5zOI7cdUax+9GTapIs8U3XOnvk t4/w== X-Gm-Message-State: AOJu0YwB0ZWDdiZgKmc2CXnaLLCSSG4YItsa3Mt9rR7/ckVMl09hleFq LWZPDDgNZuorL+3bbSON0w+rqo2p18w= X-Google-Smtp-Source: AGHT+IFFItclXHmnd4APZirB6z60UYv3+2yKnHsqftrMBC4DaAGxkjRDYjtmhitrjxSJCX32ZMfgZA== X-Received: by 2002:a05:600c:1d04:b0:401:c07f:72bd with SMTP id l4-20020a05600c1d0400b00401c07f72bdmr9511481wms.4.1695060227502; Mon, 18 Sep 2023 11:03:47 -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.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 11:03:47 -0700 (PDT) From: Simon Tournier Date: Mon, 18 Sep 2023 20:03:23 +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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm index 6ce0487dba38..1c7b02929634 100644 --- a/guix/import/juliahub.scm +++ b/guix/import/juliahub.scm @@ -174,7 +174,8 @@ (define (parse-test-dependencies directory) (let* ((port (open-input-file (string-append directory "/Project.toml"))) (ini-list (stream->list (port->stream port read)))) (close-port port) - (ini-list->test-dependencies ini-list))) + (filter (lambda (x) (not (member x %julia-stdlibs))) + (ini-list->test-dependencies ini-list)))) ;; Julia package. (define-json-mapping make-juliahub-package juliahub-package? From patchwork Mon Sep 18 18:03:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54035 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 21D2027BBE9; Mon, 18 Sep 2023 19:08:02 +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=unavailable 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 E452627BBE2 for ; Mon, 18 Sep 2023 19:07:59 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiIdf-0005W7-Es; Mon, 18 Sep 2023 14:06:27 -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 1qiIdG-000550-UQ for guix-patches@gnu.org; Mon, 18 Sep 2023 14:06:06 -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 1qiIdG-00044k-JO for guix-patches@gnu.org; Mon, 18 Sep 2023 14:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiIdO-0002Vn-PD for guix-patches@gnu.org; Mon, 18 Sep 2023 14:06:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66086] [PATCH v2 17/23] DRAFT import: juliahub: More robust toml regex parser. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Sep 2023 18:06:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66086 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62202@debbugs.gnu.org Cc: 66086@debbugs.gnu.org, zimon.toutoune@gmail.com X-Debbugs-Original-Cc: Nicolas Graves via Guix-patches via , Simon Tournier Received: via spool by submit@debbugs.gnu.org id=B.16950603289404 (code B ref -1); Mon, 18 Sep 2023 18:06:10 +0000 Received: (at submit) by debbugs.gnu.org; 18 Sep 2023 18:05:28 +0000 Received: from localhost ([127.0.0.1]:54475 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIch-0002RW-K1 for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:05:28 -0400 Received: from lists.gnu.org ([2001:470:142::17]:58342) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbl-0002KH-Ff for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:30 -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 1qiIbD-0002Pl-AV for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:00 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qiIb9-0003QD-UD for guix-patches@gnu.org; Mon, 18 Sep 2023 14:03:54 -0400 Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-321617ef967so108851f8f.0 for ; Mon, 18 Sep 2023 11:03:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695060228; x=1695665028; darn=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=l6ds5f6DEk3FeZ0Lm1KcNpISCKwkAffzc7l5DbjMozE=; b=N19BfuXcGAe6EpQqQTm4CM8SZb9dgcjYlS7cTTfa5QwmtjS4wzIYmUaen0/QclB3Jr 0gUBlHBbEXEKSRF+oQ1JaZT5O6yqKPQhbHq2aRSPUBJzZq6LLfRX4Q5dR5/RCFaSJujC 6Ipekl4sEy6DPeIpWnbtsb/ll+ovXrIRT8+Ensy8iBSe5akZ5577208nbe4KfKhjGxNP fL/Cejr0Yfi9E6RODCLuMN0Zcg2gfcOhex9Dv7WQtT0Qi/qVGiizUE8IU8q01u0QD+7G o43CNRT2LjsbyLuUcer6YckB9CY3muulGxezT0PfErMAWlhkRJTHDzTIICbg9kyT3Gxw OoPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695060228; x=1695665028; 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=l6ds5f6DEk3FeZ0Lm1KcNpISCKwkAffzc7l5DbjMozE=; b=nbJxsAMj0X/aAJKDwtzqKGpU92WzWCMAY0mWvoRsLl6nDT40ogXRgwrJv/SwRyOP1N 4hAOROlU4cZxbQUxT89sNIqZdBJZbmRxdIjprxgwuDyuGenSPqb9Uad+cewSh1wg51hY DJDb4SfkIh6OhFmlfJXijIp9ZTXK17SaaveUfBbbKb39Yfx7WLF+SZty6Ye4gu+A9vnc BSGFInf0J/kDVJZhP52bHzE64AxCA06JrFXEsQsf0hNQWYc0RU+NZsNS5yaxrOlkiTUP 3ya2MpnyoSvDV2jyblWCOOO/5FAzC7qFYZuuC1Q6eojdd36LzbU51kwXKn5muoyacuiz A0iQ== X-Gm-Message-State: AOJu0YxFIoo3EjOR9bdOSEmmBdMB9309naCygU9dDrW54SAYpTdhKlKo JihHfAZoBBOCmO0sXsnC1YRJvxo2+p8= X-Google-Smtp-Source: AGHT+IF4kTuAJoABY54CyrdGUgJ47h498CDUG2y8c4+8rHho08nZ8YgHh4MiLdXUL93PNZTY+3oQ1w== X-Received: by 2002:adf:ef88:0:b0:317:3d36:b2c1 with SMTP id d8-20020adfef88000000b003173d36b2c1mr8050632wro.7.1695060228022; Mon, 18 Sep 2023 11:03:48 -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.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 11:03:47 -0700 (PDT) From: Simon Tournier Date: Mon, 18 Sep 2023 20:03:24 +0200 Message-Id: <2423ea8dafa29faa49e75da40a480873531e5126.1695060058.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42d; envelope-from=zimon.toutoune@gmail.com; helo=mail-wr1-x42d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm index 1c7b02929634..3985d8d0be44 100644 --- a/guix/import/juliahub.scm +++ b/guix/import/juliahub.scm @@ -154,28 +154,15 @@ (define (json->juliahub-dependencies vector) #f))) (vector->list vector)))) -(define (ini-list->test-dependencies lst) - (match lst - (('test '= ooo ...) - `(,(caar ooo) ,@(test-list->test-dependencies (cdar ooo)))) - ((value ooo ...) - (ini-list->test-dependencies ooo)) - ('() - '()))) - -(define (test-list->test-dependencies lst) - (match lst - ((('unquote value) ooo ...) - `(,value ,@(test-list->test-dependencies ooo))) - ('() - '()))) - (define (parse-test-dependencies directory) (let* ((port (open-input-file (string-append directory "/Project.toml"))) - (ini-list (stream->list (port->stream port read)))) + (project.toml (get-string-all port)) + (regex "\ntest = \\[.*\\]") + (deps (match:substring (string-match regex project.toml))) + (pure (string-delete (list->char-set (list #\" #\ )) deps))) (close-port port) (filter (lambda (x) (not (member x %julia-stdlibs))) - (ini-list->test-dependencies ini-list)))) + (string-split (string-drop (string-drop-right pure 1) 7) #\,)))) ;; Julia package. (define-json-mapping make-juliahub-package juliahub-package? @@ -243,9 +230,9 @@ (define* (juliahub->guix-package package-name "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 package-name "Package.toml"))) - (subdir (assoc-ref package-toml 'subdir)) - (tag (latest-git-tag (assoc-ref package-toml 'repo))) + (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 (juliahub-fetch package-name #:version version) (if tag From patchwork Mon Sep 18 18:03:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54031 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 9340527BBE2; Mon, 18 Sep 2023 19:07:23 +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 38DF127BBF3 for ; Mon, 18 Sep 2023 19:07:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiIdS-0005Iv-Rx; Mon, 18 Sep 2023 14:06:17 -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 1qiIdC-00052Q-5h for guix-patches@gnu.org; Mon, 18 Sep 2023 14:05:58 -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 1qiIdB-00042D-SC for guix-patches@gnu.org; Mon, 18 Sep 2023 14:05:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiIdK-0002U8-2t for guix-patches@gnu.org; Mon, 18 Sep 2023 14:06:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66079] [PATCH v2 18/23] DRAFT import: juliahub: Beautify description. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Sep 2023 18:06:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66079 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62202@debbugs.gnu.org Cc: 66079@debbugs.gnu.org, zimon.toutoune@gmail.com X-Debbugs-Original-Cc: Nicolas Graves via Guix-patches via , Simon Tournier Received: via spool by submit@debbugs.gnu.org id=B.16950603249351 (code B ref -1); Mon, 18 Sep 2023 18:06:05 +0000 Received: (at submit) by debbugs.gnu.org; 18 Sep 2023 18:05:24 +0000 Received: from localhost ([127.0.0.1]:54461 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIce-0002Qe-2q for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:05:24 -0400 Received: from lists.gnu.org ([2001:470:142::17]:58312) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbe-0002Jg-Ny for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:25 -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 1qiIbD-0002Pg-88 for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:00 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qiIb9-0003QK-Tr for guix-patches@gnu.org; Mon, 18 Sep 2023 14:03:54 -0400 Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-32163c3ece5so66562f8f.1 for ; Mon, 18 Sep 2023 11:03:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695060229; x=1695665029; darn=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=+V8mAgQnV80VBwmubrhWWZdiRKsOpmwZCKgdLsNinEA=; b=PomADEewKMp+p8Zzli11DK+z/leh9Nv7xVXK2B4YztEtHZVZfdKMV2Bar287/ooAvy GShH3ubmkCbKvWvlIukU7LyBTfMIHiodXph29/qhladFLTfWmi4haof4XDGBt8Jkigh3 XhfDYZeWpalprwNPOVEbr+Jt8MSVFgMzpWZ5bYd72ds0y3cCIdq4H7CQXwgNmJ/IORJt xtegjvEYGVeMTiFSbbCQ7kLBTMgVAWVR8NAYIszkYFHO4Tg68ag2IFqGhS4mv8UjECAK aJCreBdfRf+sGbzE8pIi7T4r4kXMlbsuaDCW3Xt6ISyu8QMGjlllsPoCHkfMXTxbbGLG ARaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695060229; x=1695665029; 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=+V8mAgQnV80VBwmubrhWWZdiRKsOpmwZCKgdLsNinEA=; b=UR54BQTX3Ld6wFIhYYncSwwRo5YfZxjVYyZohbYCEGmUex1WD/7F0QttQUotUQgA5l kMNBFn5xkg1OA1H/dALOoJfdmZrYAvK2wPquKmt/LgrZixebs5velqPTO/PiTlGKoa42 AqFTLNFcYPqzl5u+NZuMGHk9MPGIBZuJ6dZWggrstsh4NLQKpaYh8IuykJhucfHB126H mTCBUgtVlBRxyoY23P4VxFicXaLkp2E4uJFZuv+MaAi5ec2oIVdhzy/7xgIkW/W/G30g rCqkG5jP/wL5Roiw6gY98tTZJOU1Gxju6yOxX56/u6E5x4q8cbG3OX6JZ8jHp7dvKwKn 8fgQ== X-Gm-Message-State: AOJu0YznxzNtyQ4MUId997OC09fl3euYUeOmXwzkUicZZ+tmGsxRFVY7 p0c/3bwuEdpzyjisbpjykhdqTSfcDx4= X-Google-Smtp-Source: AGHT+IHVRevR7p6J+iiE15IGIXyXC2TlCBoh6GqtOIb9L5A34ZcF7YTbO6C6qMezc72Zp+/3gdDxaQ== X-Received: by 2002:adf:e903:0:b0:31a:ed75:75e8 with SMTP id f3-20020adfe903000000b0031aed7575e8mr7681532wrm.2.1695060228730; Mon, 18 Sep 2023 11:03:48 -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.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 11:03:48 -0700 (PDT) From: Simon Tournier Date: Mon, 18 Sep 2023 20:03:25 +0200 Message-Id: <378987b3ca7040ffbc2f8f665651e8efee4238ae.1695060058.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=zimon.toutoune@gmail.com; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 | 60 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 56 insertions(+), 4 deletions(-) diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm index 3985d8d0be44..338f0424414c 100644 --- a/guix/import/juliahub.scm +++ b/guix/import/juliahub.scm @@ -32,8 +32,10 @@ (define-module (guix import juliahub) #:use-module (guix base32) #:use-module (guix packages) #:use-module (guix upstream) - #:use-module (json) #:use-module ((guix licenses) #:prefix license:) + #:use-module (json) + #:use-module (htmlprag) + #:use-module (sxml transform) #:export (juliahub->guix-package %juliahub-updater @@ -164,6 +166,53 @@ (define (parse-test-dependencies directory) (filter (lambda (x) (not (member x %julia-stdlibs))) (string-split (string-drop (string-drop-right pure 1) 7) #\,)))) +(define %juliahub-beautify-description-rules + `((h1 *preorder* . ,(lambda args #f)) + (h2 *preorder* . ,(lambda args #f)) + (h3 *preorder* . ,(lambda args #f)) + (h4 *preorder* . ,(lambda args #f)) + (hr *preorder* . ,(lambda args #f)) + (span *preorder* . ,(lambda args #f)) + (img *preorder* . ,(lambda args #f)) + (pre *preorder* . ,(lambda args #f)) + (div *preorder* . ,(lambda args #f)) + (table *preorder* . ,(lambda args #f)) + (imgalt *preorder* . ,(lambda args #f)) + (@ *preorder* . ,(lambda args #f)) + (*TOP* . ,(lambda args (cdr args))) + (p . ,(lambda args (cdr args))) + (em . ,(lambda args (cdr args))) + (strong . ,(lambda args (cdr args))) + (a . ,(lambda args + (match args + ((tag link ref) + (if ref ref #f)) + (_ #f)))) + (ul . ,(lambda args + `("@itemize" ,@(cdr args) "\n@end itemize"))) + (ol . ,(lambda args + `("@enumerate" ,@(cdr args) "@end enumerate"))) + (blockquote . ,(lambda args + `("@quotation" ,@(cdr args) "@end quotation"))) + (li . ,(lambda args + `("\n@item" ,@(cdr args)))) + (code . ,(lambda args + (string-append + "@code{" + (string-join (cdr args) " ") + "}"))) + (*text* . ,(lambda (tag x) x)) + (*default* . ,(lambda (tag . body) + (cons tag body))))) + +(define (juliahub-beautify-description description) + (string-join + (filter (lambda (x) (if (equal? x " ") #f x)) + (flatten + (pre-post-order (html->sxml description) + %juliahub-beautify-description-rules))) + " ")) + ;; Julia package. (define-json-mapping make-juliahub-package juliahub-package? json->juliahub-package @@ -211,8 +260,9 @@ (define (make-julia-sexp name source home-page synopsis description ,@(if (null? direct-dependencies) '() `((propagated-inputs - (list ,@(map (compose julia-name->guix-name juliahub-dependency-name) - direct-dependencies))))) + (list + ,@(map (compose julia-name->guix-name juliahub-dependency-name) + direct-dependencies))))) ,@(if (null? test-dependencies-names) '() `((native-inputs @@ -264,7 +314,9 @@ (define* (juliahub->guix-package package-name source (juliahub-package-homepage package) (juliahub-package-description package) - (beautify-description (juliahub-package-readme package)) + ((compose beautify-description + juliahub-beautify-description) + (juliahub-package-readme package)) direct-dependencies test-dependencies-names licenses) From patchwork Mon Sep 18 18:03:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54037 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 1F12F27BBEA; Mon, 18 Sep 2023 19:08:19 +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 34DB927BBE9 for ; Mon, 18 Sep 2023 19:08:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiIdY-0005NX-61; Mon, 18 Sep 2023 14:06:20 -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 1qiIdD-00052x-3L for guix-patches@gnu.org; Mon, 18 Sep 2023 14:06:01 -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 1qiIdC-00042e-J8 for guix-patches@gnu.org; Mon, 18 Sep 2023 14:05:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiIdK-0002UM-S9 for guix-patches@gnu.org; Mon, 18 Sep 2023 14:06:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66080] [PATCH v2 19/23] DRAFT import: juliahub: Fix license management. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Sep 2023 18:06:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66080 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62202@debbugs.gnu.org Cc: 66080@debbugs.gnu.org, zimon.toutoune@gmail.com X-Debbugs-Original-Cc: Nicolas Graves via Guix-patches via , Simon Tournier Received: via spool by submit@debbugs.gnu.org id=B.16950603259358 (code B ref -1); Mon, 18 Sep 2023 18:06:06 +0000 Received: (at submit) by debbugs.gnu.org; 18 Sep 2023 18:05:25 +0000 Received: from localhost ([127.0.0.1]:54463 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIce-0002Qm-JW for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:05:25 -0400 Received: from lists.gnu.org ([2001:470:142::17]:58354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbg-0002KL-KQ for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:25 -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 1qiIbF-0002QN-RI for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:02 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qiIbC-0003QS-DU for guix-patches@gnu.org; Mon, 18 Sep 2023 14:03:56 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3159b524c56so939548f8f.1 for ; Mon, 18 Sep 2023 11:03:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695060229; x=1695665029; darn=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=YFCmO8dV8DFWrz0oxqL6li2rEi3rlUfKiz+4CsCSISY=; b=YOMafxtFbPiJaTQ8M4Bpsbzio3ELgW3QA+9pUIG8SPcFEno0RAxiMW6rBkv1t89XB0 Jy0ZwHzPJCQqqOqctQ3S1VB1SuDMoBbFj6/UMVVZ6FflFCt/uDilXN4YEDEKSY9yhxKG rD50TqWEoAgQz+wJu91XRB6KGejZUExIFprLQzRCHKiy/MCWxBO1tXpUnVC39OwsU8tU 3/ztKf2iiRIjd+uEvkJScOPiG4TfQfShUE0tPC+Toz7iNex67H+koyRVuPogB5aX/DUC vCYiX09JmhQM27j42tQWV5eOWZiL70Zz8v8RzwnDKGHt7KsNx0WQSV/VzaMJbRg91Z3d XyPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695060229; x=1695665029; 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=YFCmO8dV8DFWrz0oxqL6li2rEi3rlUfKiz+4CsCSISY=; b=MPINx1u1rozcVSm9FaLa63NvrMu5QCuCVnWTsjWD+6LpODpEJzhdA5w9ly+SKSn9kT LVXVE1924s8tEIT8d3426b4ybT/bT/2sCKB7dplBjCbGGJkZZVQChxaAwTEqP4wHsF26 dl5RQwF3sIkNv9uJ5fe5AGec8TSH1gUM02qKyvD8wesZ2FpZKkG1C69Ihtmtu+QuGXgr ymV5yprtSJaam+SU5ieS/LiFvnCzE/3EZiJ8/sjGDKeFsApLSAFF3WkrXfD44quQdJPj n194m6wdnuuVbAhlXCBaOFLFMyh38uBJz5ow80dJgzwX6TxnJG7zh6HKmwKxN1pHDXFM kaoA== X-Gm-Message-State: AOJu0YwHKY6NoeMF5+h+ZX7SDuPyYz5NidiFRQOS+siikSp8Q7zx8C0x YD2/7QwrqPvISwqu5euf3uNSVnywIF4= X-Google-Smtp-Source: AGHT+IGyQDYZ3LyqQwj0GzmXUwEWlYZdEhdNcs/M4KeZYC4ikYGJPYxR5NaSATkW3zJXvJxBjwhf+A== X-Received: by 2002:adf:f742:0:b0:31a:e29f:5eab with SMTP id z2-20020adff742000000b0031ae29f5eabmr7658707wrp.7.1695060229259; Mon, 18 Sep 2023 11:03:49 -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.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 11:03:49 -0700 (PDT) From: Simon Tournier Date: Mon, 18 Sep 2023 20:03:26 +0200 Message-Id: <80498439f6fb5e349b5e9fc643e6538a361983fd.1695060058.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=zimon.toutoune@gmail.com; helo=mail-wr1-x429.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm index 338f0424414c..e4b26bea340a 100644 --- a/guix/import/juliahub.scm +++ b/guix/import/juliahub.scm @@ -248,10 +248,10 @@ (define* (juliahub-fetch name #:key (version #f)) (and=> (json-fetch url) json->juliahub-package))) (define (make-julia-sexp name source home-page synopsis description - direct-dependencies test-dependencies-names licenses) + direct-dependencies test-dependencies-names license) "Return the `package' s-expression for a Julia package with the given NAME, VERSION, URI, HASH, HOME-PAGE, DESCRIPTION, DIRECT-DEPENDENCIES, -TEST-DEPENDENCIES-NAMES and LICENSES." +TEST-DEPENDENCIES-NAMES and LICENSE." `(package (name ,(julia-name->guix-name name)) (version ,version) @@ -270,10 +270,8 @@ (define (make-julia-sexp name source home-page synopsis description (synopsis ,synopsis) (description ,description) (home-page ,home-page) - (license ,(match licenses - (() #f) - ((license) (license->symbol license)) - (_ `(list ,@(map license->symbol licenses))))))) + (license + ,(if license (spdx-string->license license) #f)))) (define* (juliahub->guix-package package-name #:key version #:allow-other-keys) @@ -301,9 +299,6 @@ (define* (juliahub->guix-package package-name (dependencies-names (map juliahub-dependency-name direct-dependencies)) - (licenses - (map spdx-string->license - (list (juliahub-package-license package)))) (test-dependencies-names (if subdir (parse-test-dependencies @@ -319,7 +314,7 @@ (define* (juliahub->guix-package package-name (juliahub-package-readme package)) direct-dependencies test-dependencies-names - licenses) + (juliahub-package-license package)) (append dependencies-names test-dependencies-names)))) (values #f '())))) From patchwork Mon Sep 18 18:03:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54033 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 CD79F27BBEA; Mon, 18 Sep 2023 19:07:42 +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 3822227BBE2 for ; Mon, 18 Sep 2023 19:07:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiIcn-0003yL-BY; Mon, 18 Sep 2023 14:05:33 -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 1qiIcG-0003L8-Us for guix-patches@gnu.org; Mon, 18 Sep 2023 14:05:01 -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 1qiIcG-0003Zk-Gy for guix-patches@gnu.org; Mon, 18 Sep 2023 14:05:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiIcO-0002P5-Rb for guix-patches@gnu.org; Mon, 18 Sep 2023 14:05:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62202] [PATCH v2 20/23] DRAFT import: juliahub: Fix version management. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Sep 2023 18:05:08 +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.16950602588918 (code B ref 62202); Mon, 18 Sep 2023 18:05:08 +0000 Received: (at 62202) by debbugs.gnu.org; 18 Sep 2023 18:04:18 +0000 Received: from localhost ([127.0.0.1]:54399 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbZ-0002Jf-Nh for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:18 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:40393) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbL-0002F8-S7 for 62202@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:05 -0400 Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-32163c3ece5so66565f8f.1 for <62202@debbugs.gnu.org>; Mon, 18 Sep 2023 11:03:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695060230; x=1695665030; 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=4N4QKA7RklXE6U1toUcmtASBk6gneV5LxZor47MdXFw=; b=Dwr9OJkldWerW+eKFLf2Is4s0EeKyyMLLw2UXntU2NqSgDhHA8dG905fvOFCUlXQVh GCLMvtiD7r24WbUuwBQwWWk5gQzUWMgSFBYuQfwmF1W/5KdlNH6fQtDXsEmts9hdEcDS VQt4JPR2Rmo+TI0aJyvgo+FWxjnFi5pJHyxRY2TpLiVcFnHbyII5pxb6Y9ppvU7B0zQO SPbq5C9z2WFxkF3AvVULHmNxsW7Bxxtq5uJGtoWtmkLTeqsa3p15AiJrYpLdEq2Dssz8 37g3B+WeD1RDE5pmYKdb693ZUwF8MPWwe/9XV5lX0L3Cg0/YFHGRFgM9elvGUR7tupFQ Pt/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695060230; x=1695665030; 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=4N4QKA7RklXE6U1toUcmtASBk6gneV5LxZor47MdXFw=; b=HlVMilKNBA8d75/a/GdQFjb9ljdtHacFqshqAPLogn0N+5fuVjE/e5vpzKyWC1Q+sQ WdBvS4onqcI0JWyq1V6H9aHcUYveOFATgR4YsYZU9w7O4HaWjtQUAbQYhdF+Sfka7pw5 neyjcaMuwvM6qV+7ewGRqfK9Ploafu9fouhV8dsnh8YDgfi2wsX4IOdbQLssmdtdqoCY eQZjdwKMDY7fUXND1ZSseonh2oJsahwF3GS9P+crMbv58iM7llyvqOpNmjSuwE6KpAvu JkzksSfuAijdy9qn6LP7d8QW3NY39iJeVCeKGhrSR5LNs87ko2w1qDJpIX+YTicHIaTt TAPA== X-Gm-Message-State: AOJu0Yz4o37dUdRG6JJ04UYt3tvU8kH5gZXCd5hzW8YKHVVBFg+IgGT9 j81KTUV/D3CjmGvxw/+AYu8hGxTkv6U= X-Google-Smtp-Source: AGHT+IFQRNV9GQyLvfnLjcsm5O5wESTlJe8zNCA4a0Qxzvt2oToKGCfN2V3DKeXG/h3NxPnIkS3hnw== X-Received: by 2002:adf:ecc7:0:b0:31f:899b:a47 with SMTP id s7-20020adfecc7000000b0031f899b0a47mr7944134wro.4.1695060229829; Mon, 18 Sep 2023 11:03:49 -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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 11:03:49 -0700 (PDT) From: Simon Tournier Date: Mon, 18 Sep 2023 20:03:27 +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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm index e4b26bea340a..94d4ae823334 100644 --- a/guix/import/juliahub.scm +++ b/guix/import/juliahub.scm @@ -247,10 +247,10 @@ (define* (juliahub-fetch name #:key (version #f)) (string-append (juliahub-url name) "pkg.json")))) (and=> (json-fetch url) json->juliahub-package))) -(define (make-julia-sexp name source home-page synopsis description +(define (make-julia-sexp name version source home-page synopsis description direct-dependencies test-dependencies-names license) "Return the `package' s-expression for a Julia package with the given NAME, -VERSION, URI, HASH, HOME-PAGE, DESCRIPTION, DIRECT-DEPENDENCIES, +VERSION, SOURCE, HOME-PAGE, DESCRIPTION, DIRECT-DEPENDENCIES, TEST-DEPENDENCIES-NAMES and LICENSE." `(package (name ,(julia-name->guix-name name)) @@ -306,6 +306,7 @@ (define* (juliahub->guix-package package-name (parse-test-dependencies directory)))) (values (make-julia-sexp package-name + (juliahub-package-version package) source (juliahub-package-homepage package) (juliahub-package-description package) From patchwork Mon Sep 18 18:03:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54043 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 A175927BBEA; Mon, 18 Sep 2023 19:09:33 +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 E573527BBE2 for ; Mon, 18 Sep 2023 19:09:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiIeA-000670-BQ; Mon, 18 Sep 2023 14:06:58 -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 1qiIdG-00054z-Sq for guix-patches@gnu.org; Mon, 18 Sep 2023 14:06:06 -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 1qiIdF-00044h-Q2 for guix-patches@gnu.org; Mon, 18 Sep 2023 14:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiIdO-0002VY-3l for guix-patches@gnu.org; Mon, 18 Sep 2023 14:06:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66085] [PATCH v2 21/23] DRAFT import: juliahub: Fix undefined homepages. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Sep 2023 18:06:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66085 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62202@debbugs.gnu.org Cc: 66085@debbugs.gnu.org, zimon.toutoune@gmail.com X-Debbugs-Original-Cc: Nicolas Graves via Guix-patches via , Simon Tournier Received: via spool by submit@debbugs.gnu.org id=B.16950603279397 (code B ref -1); Mon, 18 Sep 2023 18:06:09 +0000 Received: (at submit) by debbugs.gnu.org; 18 Sep 2023 18:05:27 +0000 Received: from localhost ([127.0.0.1]:54473 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIch-0002RP-7E for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:05:27 -0400 Received: from lists.gnu.org ([2001:470:142::17]:34888) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbk-0002Kr-BV for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:29 -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 1qiIbM-0002UZ-TJ for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:06 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qiIbA-0003Qd-LB for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:04 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-32163c3ece5so66567f8f.1 for ; Mon, 18 Sep 2023 11:03:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695060230; x=1695665030; darn=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=uYY/AJQQhuW7T2+fKC7eAUbXPlE/u76pG53r/cysRkw=; b=b6Lc4ta9oQWfLNVoYEpJhDTJw4hJGWAT0xeY8954ktOWULdSZd6A2oti6paQEgXbp9 Z6fVvGfnFTMEHYzJUAY+dRlQEz4aRr72m6CrCylCF/LkJkUpiDavMeDtAJDhJosKRtDw mO8/TtWfLcAybTqfaIrGOBGyKbXCUfUy2VSxhX52y42okZVlHXWDQsT0qDUYvfTEWULL udu/DutH3tQ9diGOBnJw4hTWSwyAqd0vGLSFiUEHq2CdxU5WNv41ozxHtW8kdKCQoPFe ZkXQkgefBGNgXrTCqeT8ul+iZHgSohURBlRUu1Lw82nH5kUnw3M6WM/EkGpMDHYkKFEi 2pqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695060230; x=1695665030; 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=uYY/AJQQhuW7T2+fKC7eAUbXPlE/u76pG53r/cysRkw=; b=lGULMi0xuvTDVnHdf4WCti128E/33TBQEkXGS+BIv1qA9otQxJAA7hOq6U5MrAGztd fH8zmxDEb9pinhuBG4XRet8WvWVNdJVLz+bHiQQFhAm6gn5BaEJDRBhn/X6+t7TsYFBS 3vO/Ak5II5mywRMbz4VtCtMsgcz3Vjs/P2oO1TO7M3BbJJTfziX3saa3/hYKjBi4RBNg L28NDd9gv+dZ0qb641STBzrTr8ifweeAFsy22f5Q6a8J79cwgG1o2zSmgmVIJQwirNy2 EUY6ZErfR33CcsksEKxX+Txpa1PAYJs5ChLCu+pp/p4uR/xxuR1Fnv3l+CZf56xJPJYs +xhg== X-Gm-Message-State: AOJu0YzPhyUSZwiwCkPIrtO0FCjVvHfHhfEMhgjMdFSN0kysFeYM9R94 N02AxrTAgw5p+JRt7RHth1w= X-Google-Smtp-Source: AGHT+IE6eQseNiqfFi/Ezv3j0C1Ycd3JlAzoZG9EyzKvCy56J/FK4ShX4i6We0w+oAHpac8K51qnUQ== X-Received: by 2002:a05:6000:1047:b0:31f:a096:6e18 with SMTP id c7-20020a056000104700b0031fa0966e18mr7724055wrx.6.1695060230342; Mon, 18 Sep 2023 11:03:50 -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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 11:03:50 -0700 (PDT) From: Simon Tournier Date: Mon, 18 Sep 2023 20:03:28 +0200 Message-Id: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=zimon.toutoune@gmail.com; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm index 94d4ae823334..06574db724fe 100644 --- a/guix/import/juliahub.scm +++ b/guix/import/juliahub.scm @@ -303,12 +303,16 @@ (define* (juliahub->guix-package package-name (if subdir (parse-test-dependencies (string-append subdir "/" directory)) - (parse-test-dependencies directory)))) + (parse-test-dependencies directory))) + (homepage (juliahub-package-homepage package))) (values (make-julia-sexp package-name (juliahub-package-version package) source - (juliahub-package-homepage package) + (match homepage + ("" (juliahub-package-url package)) + ((? string?) homepage) + (_ (juliahub-package-url package))) (juliahub-package-description package) ((compose beautify-description juliahub-beautify-description) From patchwork Mon Sep 18 18:03:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54030 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 6130A27BBEA; Mon, 18 Sep 2023 19:07:22 +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=unavailable 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 5F10A27BBE2 for ; Mon, 18 Sep 2023 19:07:17 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiIcz-0004Bn-6Q; Mon, 18 Sep 2023 14:05:47 -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 1qiIcI-0003NY-59 for guix-patches@gnu.org; Mon, 18 Sep 2023 14:05:02 -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 1qiIcH-0003aJ-Sd for guix-patches@gnu.org; Mon, 18 Sep 2023 14:05:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiIcQ-0002PU-6c for guix-patches@gnu.org; Mon, 18 Sep 2023 14:05:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62202] [PATCH v2 22/23] DRAFT import: juliahub: output package names as symbols. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Sep 2023 18:05:10 +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.16950602598942 (code B ref 62202); Mon, 18 Sep 2023 18:05:10 +0000 Received: (at 62202) by debbugs.gnu.org; 18 Sep 2023 18:04:19 +0000 Received: from localhost ([127.0.0.1]:54405 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIba-0002K4-Tc for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:19 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:40124) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbN-0002FO-7G for 62202@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:06 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-321617ef967so108857f8f.0 for <62202@debbugs.gnu.org>; Mon, 18 Sep 2023 11:03:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695060231; x=1695665031; 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=EqW3/WwMCH0YOOdn1Z/onLkIjwF1MHpLg5lKRPl0qXs=; b=Ac37X3TSoVlvocdDmuTvvFNRm+6tLyz4P+QYXlWEpVpwrGhxKdhOCpI33ynv5/6Ku3 SkKbYmTpLyOaXKPEwD8qFXSYl0iHamrWyAr/uZUElyWqf+p3nPSbIJIGt2KH/dd1KXh+ qRUyTpwfY5A1t+TwlZjYa03jeXnqQUPU+cDfFB/FASjtPoxRGwMgZQL1Kw2FZjkI+SWD q07s4ur92YZKEDYP6+KCvesjUo88OgHcEU7Grx7FaYksRkuUtn/YBiK77Iq9ej51fmLt cQF+89a+wVVNAshT4IT1sZPnN8H80RhQNDoeRwMeuWWoPNdlUE3ssFG3v1JDKU7C54EK Mhmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695060231; x=1695665031; 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=EqW3/WwMCH0YOOdn1Z/onLkIjwF1MHpLg5lKRPl0qXs=; b=Ks9OgYBSnd3vzOenNJW1pLiCwHcuurtqiPYGRWFx4ntpoLxSAi9wfjJsfl8pKcohEr 7dcEDKJWwmjv63+Jqh1TZdk8NDdtuF8vHm8X5ol7N695AFmmRPfhyfCfqRrl6pXVFH5K +rNLi5RAOY9TlVkJb1vJBuK894THN3bFNCgx9uGN6GtwpsPyl2ASUARG5VdizY+Sb7vG OlFR5bZB2R8pR3VHnmiltpO+0ezc0q1OQDjNE++TUQcSnAC2KfMxgnuXYJydB7vDwmiu 2538gkhGyMZ9KlExiXCiktnJpkgPT4f2ZhEarcA3SuWf5B6kSxKKsBDbHbyMAzJhV2M4 Ts6A== X-Gm-Message-State: AOJu0YyJgGGR/tNUdAZbGJ/Bbbsm76ME49nLbxaZNN+PEwUjbK8/Trua KM+Ew9ou+wqPhBPBJJokmUwCVkD9r7Y= X-Google-Smtp-Source: AGHT+IEmERH2UkzSS0XXO4igGuOToO9mXKhxU4gELLer+eSqSgOTThnyWyLMaxICs257lCBCpAFPbw== X-Received: by 2002:adf:e903:0:b0:31a:ed75:75e8 with SMTP id f3-20020adfe903000000b0031aed7575e8mr7681632wrm.2.1695060231116; Mon, 18 Sep 2023 11:03:51 -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.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 11:03:50 -0700 (PDT) From: Simon Tournier Date: Mon, 18 Sep 2023 20:03:29 +0200 Message-Id: <11807ccb1ff39f04a76a62e37556c9c5727b36a2.1695060058.git.zimon.toutoune@gmail.com> 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 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm index 06574db724fe..be874b193b28 100644 --- a/guix/import/juliahub.scm +++ b/guix/import/juliahub.scm @@ -261,12 +261,15 @@ (define (make-julia-sexp name version source home-page synopsis description '() `((propagated-inputs (list - ,@(map (compose julia-name->guix-name juliahub-dependency-name) + ,@(map (compose string->symbol + julia-name->guix-name + juliahub-dependency-name) direct-dependencies))))) ,@(if (null? test-dependencies-names) '() `((native-inputs - (list ,@(map julia-name->guix-name test-dependencies-names))))) + (list ,@(map (compose string->symbol julia-name->guix-name) + test-dependencies-names))))) (synopsis ,synopsis) (description ,description) (home-page ,home-page) From patchwork Mon Sep 18 18:03:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 54046 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 98D5527BBEA; Mon, 18 Sep 2023 19:10:51 +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 319B327BBE9 for ; Mon, 18 Sep 2023 19:10:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiId7-0004Nc-1a; Mon, 18 Sep 2023 14:05:53 -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 1qiIcI-0003OI-Ig for guix-patches@gnu.org; Mon, 18 Sep 2023 14:05:03 -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 1qiIcI-0003aP-AA for guix-patches@gnu.org; Mon, 18 Sep 2023 14:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiIcQ-0002Pb-JZ for guix-patches@gnu.org; Mon, 18 Sep 2023 14:05:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62202] [PATCH v2 23/23] DRAFT guix: import: julia: Fix beautify. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 18 Sep 2023 18:05:10 +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: Simon Tournier Received: via spool by 62202-submit@debbugs.gnu.org id=B62202.16950602598953 (code B ref 62202); Mon, 18 Sep 2023 18:05:10 +0000 Received: (at 62202) by debbugs.gnu.org; 18 Sep 2023 18:04:19 +0000 Received: from localhost ([127.0.0.1]:54407 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbb-0002KB-AP for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:19 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:41044) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbO-0002Fg-3o for 62202@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:06 -0400 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-40506bfca64so5345975e9.0 for <62202@debbugs.gnu.org>; Mon, 18 Sep 2023 11:03:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695060232; x=1695665032; 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=Ymgdk1wbzUZliB1FfAolo6a/xkod9pbMDcWo2fzsP0Y=; b=GGr7/rYfgVbCUxjaMI64ntr0DUiWEmhFP6/3GExDylfPVpvtqepy+Nt/mskmdsd+6p vP42S1UrZvQ105HyKYtrGNZ8FBedyGtXn4i+lqJ5MA3jMO+Kh/t8PyIlVncdhIchmhw/ TOo9cSTotwcDABBGwwlcG26WPRTU38jO6aMqSxijhaDsKG8eHQyGcPtgDnCXLNElD6St gqzI5eom8scIi0PlxlvXQLBvt66XCJSEtCSYH49kgrrabDlAr+lb0KHxORRo/SXIVXt3 hNb4lMa/vztm869xWgQw0Eo/sEaXiqbHW2EK38PLDAc4keTRlMbJCgfXhfAMno3BpfHT ctrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695060232; x=1695665032; 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=Ymgdk1wbzUZliB1FfAolo6a/xkod9pbMDcWo2fzsP0Y=; b=AxmjMO5rebl8+GftJVzjPkRcNCU4yq76GEQiNvLR1No67aELdmvqiU7evAlDCaeaCg iM15xf5uuLwTntMTJDnCS1mIlmkI/H87sR++ziroLbBi77pvd3sTjkzzC7nKoiAR243w 8OGs4ynCCZukASolZobkDimjHhaDNHkZUrxLnDy0RUz8XtcssVx0YunDMx9FgdDNpYtU VPTQHhyfM4uqlSr3MboOh5t5QHl3H3C1VOhfTOlqxN3WND26WcueKIhkhiV8Cvl8sFhY 8GYZwYdrGpYjY3gGzC45ijNKl0LkMRPWjYyCi8aFqROgGefeUBY05/jWdk/vVHoC1J63 pP5w== X-Gm-Message-State: AOJu0YyEwRX/0rFWuDUVQxT77+M4ez+sItqI9gNHm6uLBI3GGDdWXHEh TjHko0V8zmuOaU+aubmNjRM7R+2z3dY= X-Google-Smtp-Source: AGHT+IHVsNwTyNScu5FC13OK3Pmof+7+lgSQFMzt0rCjlh2PauKklRvZL7XaJkoTY4BKZbTNxAicew== X-Received: by 2002:a5d:484a:0:b0:31a:ea18:c516 with SMTP id n10-20020a5d484a000000b0031aea18c516mr8307066wrs.3.1695060231655; Mon, 18 Sep 2023 11:03:51 -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.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 11:03:51 -0700 (PDT) From: Simon Tournier Date: Mon, 18 Sep 2023 20:03:30 +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 --- guix/import/juliahub.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/guix/import/juliahub.scm b/guix/import/juliahub.scm index be874b193b28..3e5735b9503f 100644 --- a/guix/import/juliahub.scm +++ b/guix/import/juliahub.scm @@ -197,10 +197,7 @@ (define %juliahub-beautify-description-rules (li . ,(lambda args `("\n@item" ,@(cdr args)))) (code . ,(lambda args - (string-append - "@code{" - (string-join (cdr args) " ") - "}"))) + `("@code{" ,@(cdr args) "}"))) (*text* . ,(lambda (tag x) x)) (*default* . ,(lambda (tag . body) (cons tag body)))))