From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:40030) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDYYf-0006Hi-Or for guix-patches@gnu.org; Thu, 26 Sep 2019 14:32:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iDYYd-0003Qi-OL for guix-patches@gnu.org; Thu, 26 Sep 2019 14:32:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36329) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iDYYc-0003QG-L3 for guix-patches@gnu.org; Thu, 26 Sep 2019 14:32:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iDYYc-0000bE-EH for guix-patches@gnu.org; Thu, 26 Sep 2019 14:32:02 -0400 Subject: [bug#37525] [PATCH 1/3] added recusive import functionality to the crate importer References: <20190926182812.10566-1-mjbecze@riseup.net> In-Reply-To: <20190926182812.10566-1-mjbecze@riseup.net> Resent-Message-ID: From: Martin Becze Date: Thu, 26 Sep 2019 14:31:01 -0400 Message-Id: <20190926183103.10646-1-mjbecze@riseup.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: 37525@debbugs.gnu.org Cc: Martin Becze --- guix/import/crate.scm | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/guix/import/crate.scm b/guix/import/crate.scm index fd1974eae8..8dc014d232 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -40,6 +40,7 @@ #:use-module (srfi srfi-26) #:export (crate->guix-package guix-package->crate-name + crate-recursive-import %crate-updater)) @@ -218,16 +219,24 @@ latest version of CRATE-NAME." (cargo-development-inputs (sort (map crate-dependency-id dev-dep-crates) string-ci (crate-version-license version*) - string->license))))) + (values + (make-crate-sexp #:name crate-name + #:version (crate-version-number version*) + #:cargo-inputs cargo-inputs + #:cargo-development-inputs cargo-development-inputs + #:home-page (or (crate-home-page crate) + (crate-repository crate)) + #:synopsis (crate-description crate) + #:description (crate-description crate) + #:license (and=> (crate-version-license version*) + string->license)) + (append cargo-inputs cargo-development-inputs))))) + +(define (crate-recursive-import crate-name) + (recursive-import crate-name #f + #:repo->guix-package (lambda (name repo) + (crate->guix-package name)) + #:guix-name crate-name->package-name)) (define (guix-package->crate-name package) "Return the crate name of PACKAGE." -- 2.23.0