From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:34843) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4p6M-0000vm-Qo for guix-patches@gnu.org; Thu, 20 Feb 2020 11:55:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4p6L-00030A-NW for guix-patches@gnu.org; Thu, 20 Feb 2020 11:55:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39779) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j4p6L-000306-K1 for guix-patches@gnu.org; Thu, 20 Feb 2020 11:55:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j4p6L-00075m-JW for guix-patches@gnu.org; Thu, 20 Feb 2020 11:55:01 -0500 Subject: [bug#38408] [PATCH v9 3/8] Added Guile-Semver as a dependency to guix Resent-Message-ID: References: <8a86631d201313b1da427a5ceb2ca5f201e6546c.1580817140.git.mjbecze@riseup.net> <20200217100345.GI1968@E5400> <87wo8l702y.fsf@gnu.org> <874kvld2bl.fsf@gnu.org> From: Martin Becze Message-ID: Date: Thu, 20 Feb 2020 11:54:47 -0500 MIME-Version: 1.0 In-Reply-To: <874kvld2bl.fsf@gnu.org> Content-Type: multipart/mixed; boundary="------------71DD4D4BF11F0CDD680CB736" Content-Language: en-US List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 38408@debbugs.gnu.org, Efraim Flashner , jsoo1@asu.edu This is a multi-part message in MIME format. --------------71DD4D4BF11F0CDD680CB736 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Ok cool! I have tested it now. Attached is a patch that adds that behavior. Please drop the first patch and apply this one at the end. On 2/20/20 4:40 AM, Ludovic Courtès wrote: > exactly. The thing is, Guile-Charting is not used at all unless > one passes --------------71DD4D4BF11F0CDD680CB736 Content-Type: text/x-patch; charset=UTF-8; name="v9-0009-guix-import-crate-Added-guile-semver-as-a-soft-de.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="v9-0009-guix-import-crate-Added-guile-semver-as-a-soft-de.pa"; filename*1="tch" >From ef8f1a6365c321662248885d4c97c949c5c0a167 Mon Sep 17 00:00:00 2001 From: Martin Becze Date: Thu, 20 Feb 2020 11:49:11 -0500 Subject: [PATCH v9] guix: import: crate: Added guile-semver as a soft dep * guix/import/crate.scm Added guile-semver as a soft dep --- guix/import/crate.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/guix/import/crate.scm b/guix/import/crate.scm index a370fddffe..91e38839bd 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -36,8 +36,6 @@ #:use-module (ice-9 match) #:use-module (ice-9 regex) #:use-module (json) - #:use-module (semver) - #:use-module (semver ranges) #:use-module (srfi srfi-1) #:use-module (srfi srfi-2) #:use-module (srfi srfi-26) @@ -94,6 +92,11 @@ string->symbol) (requirement crate-dependency-requirement "req")) ;string +(module-autoload! (current-module) + '(semver) '(string->semver)) +(module-autoload! (current-module) + '(semver ranges) '(string->semver-range semver-range-contains?)) + (define (lookup-crate name) "Look up NAME on https://crates.io and return the corresopnding record or #f if it was not found." -- 2.25.1 --------------71DD4D4BF11F0CDD680CB736--