From unknown Sun Jun 22 08:02:03 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#66084] [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:06:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66084 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62202@debbugs.gnu.org Cc: 66084@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.16950603279390 (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]:54471 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIcg-0002RI-Q3 for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:05:27 -0400 Received: from lists.gnu.org ([2001:470:142::17]:58318) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiIbk-0002Js-7h for submit@debbugs.gnu.org; Mon, 18 Sep 2023 14:04:28 -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-0002Ph-8n for guix-patches@gnu.org; Mon, 18 Sep 2023 14:04:00 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qiIb9-0003Po-Ty for guix-patches@gnu.org; Mon, 18 Sep 2023 14:03:54 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-404800222d2so8773815e9.0 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=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=FsytTF8Caie6A56At2ZABSqNJEQNDhWP9sVMRnfj1cM=; b=IWNuAZK3JI8SjedS/x+s/e+Y7z5b9ObnrWtj/MIulM+oSQ7AgV522tz5RGfUsp6lwj wCzqk5EmuoEaaHKjxclPqxtC9wOL8f0Q9mE0JOUHfz/7hpBqDJCZVy05NTGbgYuLmslS +PRrhcLUs0oX51lI9nYYZTMQvo1ESWqwTKRPyqYrzF3lR3WareozypGjHsNLTfSQUvmi K5f54NgM85bHENdo7Y6MgvYv2TFKBpeTpL4cQV6XCWD8oBwGBaW1xnriOKTw30uQ1hsl sKMwjTN+RZ2VF/8SAch0IIKgifYti4Y9UGrRcNIGmTqzzFB/uPUIj3LYc4kLrflOrbXa pQfg== 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=oJh9C598at1tKntqfKjiZ9VBibYoH/qCCNRvArC0QVZkjwYDKOMyzXQT0RK5AUv0cx LNdX5Sy+oXQZfV1HHUNzVGd2Tw6IGbXGkSohcccW36kwcK2iLP3W4x+XeDNR2V0bY9ct DTAflooXDAR3/oof8gQWhqQc99dNIL7ytcyTV+QEzC8mmjx8tkwGQttZS4bbMcx1YvsD 3r9G0kKK8+mZIoRu9esWqseSSr7kyKUJomv7rjxokOh7Z3XaH+YRsQ3R4xkChPMpGjJ6 fDh6RKpQhm9t3VN1GBXJukgJ28FHkSNuNJ3pibY7qy+9AKaIug+KMKplJkkqFC2O/KEd Sing== X-Gm-Message-State: AOJu0Yxu6N/QCsgo8+SXv4F/+mRWRAJXfcSbqiulz7CO/gdlih1pyo5I Ytr5k+lNBSalvVEcybScEl0= 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 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=zimon.toutoune@gmail.com; helo=mail-wm1-x32d.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-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) 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 -- 2.38.1 From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 18 17:00:51 2023 Received: (at control) by debbugs.gnu.org; 18 Sep 2023 21:00:51 +0000 Received: from localhost ([127.0.0.1]:54681 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiLMR-0007FF-4o for submit@debbugs.gnu.org; Mon, 18 Sep 2023 17:00:51 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:39014) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiLLm-00079l-CO for control@debbugs.gnu.org; Mon, 18 Sep 2023 17:00:10 -0400 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-31ffc8ead75so346381f8f.0 for ; Mon, 18 Sep 2023 14:00:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695070796; x=1695675596; darn=debbugs.gnu.org; h=subject:from:to:message-id:date:from:to:cc:subject:date:message-id :reply-to; bh=0px1UGfX9Qr0DhaRe8z3KKiwrGh3WhCus4Kprkquqyk=; b=QHd09xEf0P/Ljq/wkVp9e5KR+ATgIxzlOj+oPavVT9EqXD6ezJRYBgksH+tnyqJYP2 eniRqoxIlXdBtwEwTDs6qDftPhz32FJwg1x1Ve+YU/UTDq5IuHmhyX0r0BXCYQ1Jtjuy 9JeY2prYBIbKsQ624J2MdNM5hmw4LYYhvUuCoaZI35vxArPlGayDLm03gqzuMtsbyYAA mwcHC4Pb2DrzJ51gSwfr2r6NmkIVPkrA75clCaZWwM45YNFL6p2xylb13dp1gQsz1oFE b8CiawgqnMIY9KWRUPM/+ryd1TbCihb9lAuhEVch2bx4jXL8w1vVW3kTsDmDvK3UkZIz GuDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695070796; x=1695675596; h=subject:from:to:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0px1UGfX9Qr0DhaRe8z3KKiwrGh3WhCus4Kprkquqyk=; b=A6lcVv0MOc8OxeHhzYq7qS7ODhuMYl8rCEO9NTcmKeTMLOAngnR5s/DOdeGJm3os6J XSfkeDuxMciCoSu3okgfzs9kimJMCXYgYO6cQ90rw7yvGCfPnZNykJigSMn/8x+5J27j NV7Z70Z2+Xw8Ht2QwBxexKn0cAvraYmAadhZWAHQ6RlweM82tPgDH9KG6SCUxo7oyn+V b4RZwr/D8AnrnVto06EyZHiQN3M/SFvObTwLE4dkAHK0kDdUrxNbHhMOUx6PanQ3BpWp U3JYF1yVs0IfHMNGgTCo0P3PqauyP/rEco1HB2ZUPzItuOfDhnpQ6wle2i08RKnZQU8y hsOQ== X-Gm-Message-State: AOJu0YzGF8Ra7/doMfYMH25vXhAsiIK3Qpibsd4ksPvIsGbrrwc8SMRp okLcXK9V8HkL28U9p5OTt8yXDucq0aU= X-Google-Smtp-Source: AGHT+IEziZTOkzTHFWXN/gxv6Ir3q9JV4nptS/1z00t0qgB8/rE+Dp+SqaSg07o3vBdQPfYb/vnyIQ== X-Received: by 2002:a05:6000:1f9c:b0:320:b1e:7e6c with SMTP id bw28-20020a0560001f9c00b003200b1e7e6cmr4712142wrb.3.1695070795884; Mon, 18 Sep 2023 13:59:55 -0700 (PDT) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id o9-20020a5d62c9000000b00317afc7949csm13611736wrv.50.2023.09.18.13.59.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 13:59:55 -0700 (PDT) Date: Mon, 18 Sep 2023 22:56:53 +0200 Message-Id: <86wmwnmc8a.fsf@gmail.com> To: control@debbugs.gnu.org From: Simon Tournier Subject: control message for bug #66084 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) close 66084 quit From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 18 17:00:54 2023 Received: (at control) by debbugs.gnu.org; 18 Sep 2023 21:00:54 +0000 Received: from localhost ([127.0.0.1]:54703 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiLMU-0007HM-9Z for submit@debbugs.gnu.org; Mon, 18 Sep 2023 17:00:54 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:41226) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiLM8-0007Dl-On for control@debbugs.gnu.org; Mon, 18 Sep 2023 17:00:33 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-405101a02bcso2969635e9.1 for ; Mon, 18 Sep 2023 14:00:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695070818; x=1695675618; darn=debbugs.gnu.org; h=subject:from:to:message-id:date:from:to:cc:subject:date:message-id :reply-to; bh=m57A3szCnksvrffy4NlJ5WMP3vPJBrhPZRodBpSWgDk=; b=gXlItlIGc6pCxHviBF22qXyo3LK6bvyZggSbaDD6EN2hAl+U/XZ6HkbncUSzG/+rx5 HJj+8UQIeGk4oSG9hveaLW9YejSEzqpkTjUdnehYq3JV5OhWnyVXkG2LD8/3iMqFZjHH 9wy4iFjMg1J0p95IZXxjoTs1joTIyZ1t+CwVVKc8/7XhNWILERkcjluu/JOLIdJ7XepV o6ey7Rhk2bqZz7G91SUs98xMGnpEu6/7VjwoA5qu78MsgAq1hXzMNBZSvYtzHDu+GP/5 0Bo6BODJCR+mAWZwAyoVHS1IVim5VwHXDODRZ7jKnYLrRIGuIFg8azc0E8sV1T6iCpZw W5mQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695070818; x=1695675618; h=subject:from:to:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m57A3szCnksvrffy4NlJ5WMP3vPJBrhPZRodBpSWgDk=; b=hDmEAVwme2hWG3nrt0SSnEWTrqAdIFMFh9xxZYO3Rxjmy2D5Ia1YflkQFDexGctmR2 qUdoDac8LpEhB8aqMRBhzGhknKrePI56EFZO86Iz9p5hk1kABsPIhxL/1vzPKpZDaSbW 2AlZofLuiSu0riCHKvoI1/GxrnVrI67yuNtqVwclHfLK902j+iqDSjEOuFEwQMYfJDz+ V1+z+Gi5RaTx/enhRVFUwgmmXQggcjWFbalkkYGuza+35Io0R53cgXce2BQrtl2xwPAM NGW2Lhx7zk64I98BvY9Xa7oGXKkLA0VTjVFSje5IfMXn864hZPoi1HmPAZBBKp24O3YQ er9w== X-Gm-Message-State: AOJu0YxTIZ87ff3l9lOQ/yGjesi1XRsbSEi49VQsgcLzbD9cK02o0Ps/ 91erNUepLWHaDS52PcR+BAnQS95yDY4= X-Google-Smtp-Source: AGHT+IGommOo9jok3bbHqC6ihxsjeKkeE9hhS1lcVszmJ5AlK2zV3WtVUTV6VLKNjBJ1Rp5xr2uLcQ== X-Received: by 2002:a05:600c:3b9d:b0:3ff:c342:f296 with SMTP id n29-20020a05600c3b9d00b003ffc342f296mr9059424wms.1.1695070818652; Mon, 18 Sep 2023 14:00:18 -0700 (PDT) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id p14-20020a1c740e000000b003fe407ca05bsm16279205wmc.37.2023.09.18.14.00.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 14:00:18 -0700 (PDT) Date: Mon, 18 Sep 2023 22:59:03 +0200 Message-Id: <86a5tjmc4o.fsf@gmail.com> To: control@debbugs.gnu.org From: Simon Tournier Subject: control message for bug #66075 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) merge 66075 66089 66088 66087 66086 66085 66084 66083 66082 quit From debbugs-submit-bounces@debbugs.gnu.org Mon Sep 18 17:00:54 2023 Received: (at control) by debbugs.gnu.org; 18 Sep 2023 21:00:55 +0000 Received: from localhost ([127.0.0.1]:54705 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiLMU-0007HT-Lg for submit@debbugs.gnu.org; Mon, 18 Sep 2023 17:00:54 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:38288) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiLMA-0007Dx-AK for control@debbugs.gnu.org; Mon, 18 Sep 2023 17:00:34 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-4047ef37f55so7257355e9.1 for ; Mon, 18 Sep 2023 14:00:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1695070820; x=1695675620; darn=debbugs.gnu.org; h=subject:from:to:message-id:date:from:to:cc:subject:date:message-id :reply-to; bh=QH/exOl6xrUuGBHi4UjqUPhTsuroD7YlX9uwedY0EhA=; b=nXRmQ4P0wlOnIXMFtu+WVWefvJyXsUn+6WxCanCy6CZRjEAF8KYQXCpNaq22KiSzif 3cjISIfkt154IieI+LwF1D0G7RPzgDx+ilfmiqhkO+ZFi6cHiKGyu1WKgiyjKXG9WNQP K6D8h0kB+PntWTU+dkoH/kVdJ0fsasiu2x8CHCQRMm4r30n0oWqFFQ0Ib7h3C34vbzCB T27ZlkDu77CnXTtec94+QHhIGPIh/HUfnZN0UzbBed+lcx+4mYlq3c08OCcXhHuu+7ok LtT6ElyaGwCkaN2TpssB8aFG/j1N1MvWSJuIGBrw8KHmnDrsWEDoGzXEha1jOoN+59xX fAQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695070820; x=1695675620; h=subject:from:to:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QH/exOl6xrUuGBHi4UjqUPhTsuroD7YlX9uwedY0EhA=; b=mdBQTh35Ae8LVSgF6ztZqf+sOxiiinX2lJ8jbxuYU5fqcG079fypjHTxs3xaR4/RSg ETR5mtlXQbuLZWEj+Wtt0l/8R04G9oQvZnwP+C+ON5AM/73L2YKKzwI8jZZuYQtqv0xG GcVEl8bplVEAMl/hi7uF4KVBpjfGbmpPditf9pVh10hki0pqJWabzFiiSIrFzlw5rZ5M z8uFAhgp07yM/bavteLkycdezSyW6UWwPYUlWP1FoXstGmNP0mDZqVM7uI8j8NUa2T+8 9mCwuFQe1GgeQSRQULKhlxWzkXkmLfDs2ZxfVGDjvgs4xwKlZj/zKSrzGuzIr4Vdgn/N axsQ== X-Gm-Message-State: AOJu0YxZ2nLzuJGOTN0GpXpHBGerw6UiUyjf2MjZZYXRFs0l2iel41M5 ah4Orgpvnc2vJxB/YhyBhk2OIqWgS4w= X-Google-Smtp-Source: AGHT+IHkrM3adk3SkuJsAie12SApabOI2xrBgD90W1B8L8rXSki+avRhsWe+7ePs0vViz7kWK8Ogjw== X-Received: by 2002:a7b:cd91:0:b0:3fe:d46a:ef4b with SMTP id y17-20020a7bcd91000000b003fed46aef4bmr8789429wmj.1.1695070820192; Mon, 18 Sep 2023 14:00:20 -0700 (PDT) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id z7-20020a05600c220700b00403038d7652sm13403353wml.39.2023.09.18.14.00.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 14:00:19 -0700 (PDT) Date: Mon, 18 Sep 2023 22:59:31 +0200 Message-Id: <868r93mc3w.fsf@gmail.com> To: control@debbugs.gnu.org From: Simon Tournier Subject: control message for bug #66075 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) merge 66075 66092 66091 66090 quit