From patchwork Thu Feb 20 16:54:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Martin Becze X-Patchwork-Id: 20328 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 A25A627BBE4; Thu, 20 Feb 2020 16:55:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 40AE127BBEA for ; Thu, 20 Feb 2020 16:55:10 +0000 (GMT) Received: from localhost ([::1]:46056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4p6T-0000w1-RN for patchwork@mira.cbaines.net; Thu, 20 Feb 2020 11:55:09 -0500 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 X-Loop: help-debbugs@gnu.org Subject: [bug#38408] [PATCH v9 3/8] Added Guile-Semver as a dependency to guix Resent-From: Martin Becze Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 20 Feb 2020 16:55:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38408 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: 38408@debbugs.gnu.org, Efraim Flashner , jsoo1@asu.edu Received: via spool by 38408-submit@debbugs.gnu.org id=B38408.158221769427245 (code B ref 38408); Thu, 20 Feb 2020 16:55:01 +0000 Received: (at 38408) by debbugs.gnu.org; 20 Feb 2020 16:54:54 +0000 Received: from localhost ([127.0.0.1]:45752 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j4p6D-00075N-Oy for submit@debbugs.gnu.org; Thu, 20 Feb 2020 11:54:53 -0500 Received: from mx1.riseup.net ([198.252.153.129]:59580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j4p6C-00075F-87 for 38408@debbugs.gnu.org; Thu, 20 Feb 2020 11:54:52 -0500 Received: from bell.riseup.net (bell-pn.riseup.net [10.0.1.178]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "Sectigo RSA Domain Validation Secure Server CA" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 48NggH3DQ5zF0Ms; Thu, 20 Feb 2020 08:54:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1582217691; bh=p6cDgC+SNKIKYQTCi7MgMCbB/0JNKq/yHcGws9fEkNc=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=MCg/W3Bsl+NvBynVA2Z329kjqRlGpyGpp9taYEMWhlfqlOUuKS/N2fKf2r1m4gopO WHCv7cIGGtHfoyWPPQ+ULKP+c/6hhgut8iBpPzTGpaxRO2/MhvD8TsPdbT2A3DKr+J 2faD4Ru3Bo6B5DWj7/KoY0GLfpchLc2b3ozccHGA= X-Riseup-User-ID: 9D4EF3D4746B173E12A7C17F00F202EBA16440E37A3FBE305527A61234651AE7 Received: from [127.0.0.1] (localhost [127.0.0.1]) by bell.riseup.net (Postfix) with ESMTPSA id 48NggF6LCfzJnm9; Thu, 20 Feb 2020 08:54:49 -0800 (PST) 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-Language: en-US X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches 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 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