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