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))))