From patchwork Sat Nov 30 16:36:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Becze X-Patchwork-Id: 16319 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 14D871781C; Sat, 30 Nov 2019 16:37:52 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 7CC2F177D3 for ; Sat, 30 Nov 2019 16:37:49 +0000 (GMT) Received: from localhost ([::1]:41564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ib5kP-0006nj-Hi for patchwork@mira.cbaines.net; Sat, 30 Nov 2019 11:37:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58001) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ib5k5-0006bG-4g for guix-patches@gnu.org; Sat, 30 Nov 2019 11:37:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ib5jy-0005fs-Mh for guix-patches@gnu.org; Sat, 30 Nov 2019 11:37:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57375) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ib5jy-0005fL-BB for guix-patches@gnu.org; Sat, 30 Nov 2019 11:37:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ib5jy-0005VJ-88 for guix-patches@gnu.org; Sat, 30 Nov 2019 11:37:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38408] [PATCH 3/3] Rewrote some of guix/import/crate.scm to use recursive-import-semver and updated script and test. Resent-From: Martin Becze Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Nov 2019 16:37:02 +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: 38408@debbugs.gnu.org Cc: efraim@flashner.co.il Received: via spool by 38408-submit@debbugs.gnu.org id=B38408.157513179521117 (code B ref 38408); Sat, 30 Nov 2019 16:37:02 +0000 Received: (at 38408) by debbugs.gnu.org; 30 Nov 2019 16:36:35 +0000 Received: from localhost ([127.0.0.1]:35115 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ib5jX-0005UW-56 for submit@debbugs.gnu.org; Sat, 30 Nov 2019 11:36:35 -0500 Received: from mx1.riseup.net ([198.252.153.129]:35160) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ib5jU-0005UN-CN for 38408@debbugs.gnu.org; Sat, 30 Nov 2019 11:36:33 -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 47QH7n3JGBzFcZg; Sat, 30 Nov 2019 08:36:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1575131789; bh=Ng/dnjtmgmzntb9qsEYR/gj5xsbZRen9lhXzmsA/4+8=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=QU4k6p9z6nskzS7V7qKRMGNBxiz+tQcNxCZHav37KE3yTVOQ9DFoXfjMTG95FdD1W Wz9f83849DXHiM6SL6MWRUSzavB14JsNEfloODXKWgwZtrRNRDzAj8lsyn+QNouwnE ZqT63uCHFLwVww7qh57+owI0WOImKV7fkREex+4o= X-Riseup-User-ID: 3405103775FDF4E0649D3C7E4DFA91AE2E781FC7F5962D0F2978852E5653DD9E Received: from [127.0.0.1] (localhost [127.0.0.1]) by bell.riseup.net (Postfix) with ESMTPSA id 47QH7n29B5zJqZw; Sat, 30 Nov 2019 08:36:21 -0800 (PST) MIME-Version: 1.0 Date: Sat, 30 Nov 2019 08:36:20 -0800 From: Martin Becze In-Reply-To: <052524339786cd4c0db5fda81547239c8bee6003.1574897905.git.mjbecze@riseup.net> References: <052524339786cd4c0db5fda81547239c8bee6003.1574897905.git.mjbecze@riseup.net> Message-ID: <42cb010759c8355943b9e2cb71a66b93@riseup.net> 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 On 2019-11-28 00:16, Martin Becze wrote: > * guix/import/crate.scm (make-crate-sexp): Use as args > * guix/import/crate.scm (crate->crate-version): New Procedure > * guix/import/crate.scm (crate->versions): New Procedure > * guix/import/crate.scm (crate-recursive-import): Updated to user > recursive-import-semver > * guix/scripts/import/crate.scm (guix-import-crate): Remove > `define-public` generation from UI > * guix/tests/crate.scm: Updated tests > --- > guix/import/crate.scm | 165 ++++++++++++++++++---------------- > guix/scripts/import/crate.scm | 9 +- > tests/crate.scm | 2 +- > 3 files changed, 91 insertions(+), 85 deletions(-) > > diff --git a/guix/import/crate.scm b/guix/import/crate.scm > index 8dc014d232..da92c43b8c 100644 > --- a/guix/import/crate.scm > +++ b/guix/import/crate.scm > @@ -38,6 +38,7 @@ > #:use-module (srfi srfi-1) > #:use-module (srfi srfi-2) > #:use-module (srfi srfi-26) > + #:use-module (srfi srfi-71) > #:export (crate->guix-package > guix-package->crate-name > crate-recursive-import > @@ -85,7 +86,7 @@ > crate-dependency? > json->crate-dependency > (id crate-dependency-id "crate_id") ;string > - (kind crate-dependency-kind "kind" ;'normal | 'dev > + (kind crate-dependency-kind "kind" ;'normal | 'dev | 'build > string->symbol) > (requirement crate-dependency-requirement "req")) ;string > > @@ -111,7 +112,9 @@ record or #f if it was not found." > (url (string-append (%crate-base-url) path))) > (match (assoc-ref (or (json-fetch url) '()) "dependencies") > ((? vector? vector) > - (map json->crate-dependency (vector->list vector))) > + (filter (lambda (dep) > + (not (eq? (crate-dependency-kind dep) 'dev))) > + (map json->crate-dependency (vector->list vector)))) > (_ > '())))) > > @@ -141,62 +144,84 @@ record or #f if it was not found." > ((args ...) > `((arguments (,'quasiquote ,args)))))) > > -(define* (make-crate-sexp #:key name version cargo-inputs > cargo-development-inputs > - home-page synopsis description license > - #:allow-other-keys) > - "Return the `package' s-expression for a rust package with the given NAME, > -VERSION, CARGO-INPUTS, CARGO-DEVELOPMENT-INPUTS, HOME-PAGE, SYNOPSIS, > DESCRIPTION, > -and LICENSE." > - (let* ((port (http-fetch (crate-uri name version))) > +(define (make-crate-sexp crate version* dependencies) > + "Return the `package' s-expression for a rust package given , > + and a list of " > + (define normal-dependency? > + (match-lambda ((_ dep) (not (eq? (crate-dependency-kind dep) 'dev))))) > + > + (define (string->license string) > + (match (regexp-exec %dual-license-rx string) > + (#f (list (spdx-string->license string))) > + (m (list (spdx-string->license (match:substring m 1)) > + (spdx-string->license (match:substring m 2)))))) > + > + (let* ((dep-crates dev-dep-crates (partition normal-dependency? > dependencies)) > + (cargo-inputs (sort (unzip1 dep-crates) > + string-ci + (cargo-development-inputs > + (sort (unzip1 dev-dep-crates) > + string-ci + (name (crate-name crate)) > + (version (crate-version-number version*)) > + (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)) > + (port (http-fetch (crate-uri name version)) ) > (guix-name (crate-name->package-name name)) > - (cargo-inputs (map crate-name->package-name cargo-inputs)) > - (cargo-development-inputs (map crate-name->package-name > - cargo-development-inputs)) > (pkg `(package > - (name ,guix-name) > - (version ,version) > - (source (origin > - (method url-fetch) > - (uri (crate-uri ,name version)) > - (file-name (string-append name "-" > version ".tar.gz")) > - (sha256 > - (base32 > - ,(bytevector->nix-base32-string > (port-sha256 port)))))) > - (build-system cargo-build-system) > - ,@(maybe-arguments (append (maybe-cargo-inputs cargo-inputs) > - (maybe-cargo-development-inputs > - cargo-development-inputs))) > - (home-page ,(match home-page > - (() "") > - (_ home-page))) > - (synopsis ,synopsis) > - (description ,(beautify-description description)) > - (license ,(match license > - (() #f) > - ((license) license) > - (_ `(list ,@license))))))) > - (close-port port) > - pkg)) > + (name ,guix-name) > + (version ,version) > + (source (origin > + (method url-fetch) > + (uri (crate-uri ,name version)) > + (file-name (string-append name "-" version > ".crate")) > + (sha256 > + (base32 > + ,(bytevector->nix-base32-string > (port-sha256 port)))))) > + (build-system cargo-build-system) > + ,@(maybe-arguments (append (maybe-cargo-inputs cargo-inputs) > + (maybe-cargo-development-inputs > + cargo-development-inputs))) > + (home-page ,(match home-page > + (() "") > + (_ home-page))) > + (synopsis ,synopsis) > + (description ,(beautify-description description)) > + (license ,(match license > + (() #f) > + ((license) license) > + (_ `(list ,@license))))))) > + > + (close-port port) > + pkg)) > > (define %dual-license-rx > ;; Dual licensing is represented by a string such as "MIT OR Apache-2.0". > ;; This regexp matches that. > (make-regexp "^(.*) OR (.*)$")) > > +(define (crate->crate-version crate version-number) > + "returns the for a given CRATE and VERSION-NUMBER" > + (find (lambda (version) > + (string=? (crate-version-number version) > + version-number)) > + (crate-versions crate))) > + > +(define (crate->versions crate) > + "Returns a list of versions for a given CRATE" > + (map (lambda (version) > + (crate-version-number version)) > + (crate-versions crate))) > + > (define* (crate->guix-package crate-name #:optional version) > "Fetch the metadata for CRATE-NAME from crates.io, and return the > `package' s-expression corresponding to that package, or #f on failure. > When VERSION is specified, attempt to fetch that version; otherwise fetch the > latest version of CRATE-NAME." > - (define (string->license string) > - (match (regexp-exec %dual-license-rx string) > - (#f (list (spdx-string->license string))) > - (m (list (spdx-string->license (match:substring m 1)) > - (spdx-string->license (match:substring m 2)))))) > - > - (define (normal-dependency? dependency) > - (eq? (crate-dependency-kind dependency) 'normal)) > - > (define crate > (lookup-crate crate-name)) > > @@ -205,38 +230,27 @@ latest version of CRATE-NAME." > (crate-latest-version crate))) > > (define version* > - (find (lambda (version) > - (string=? (crate-version-number version) > - version-number)) > - (crate-versions crate))) > + (crate->crate-version crate version-number)) > > - (and crate version* > - (let* ((dependencies (crate-version-dependencies version*)) > - (dep-crates (filter normal-dependency? dependencies)) > - (dev-dep-crates (remove normal-dependency? dependencies)) > - (cargo-inputs (sort (map crate-dependency-id dep-crates) > - string-ci - (cargo-development-inputs > - (sort (map crate-dependency-id dev-dep-crates) > - string-ci - (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 dependencies (map > + (lambda (dep) > + (list (crate-name->package-name > + (crate-dependency-id dep)) dep)) > + (crate-version-dependencies version*))) > + (make-crate-sexp crate version* dependencies)) > > -(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* (crate-recursive-import name #:optional version) > + (recursive-import-semver > + #:name name > + #:version version > + #:name->metadata lookup-crate > + #:metadata->package crate->crate-version > + #:metadata-versions crate->versions > + #:package-dependencies crate-version-dependencies > + #:dependency-name crate-dependency-id > + #:dependency-range crate-dependency-requirement > + #:guix-name crate-name->package-name > + #:make-sexp make-crate-sexp)) > > (define (guix-package->crate-name package) > "Return the crate name of PACKAGE." > @@ -285,4 +299,3 @@ latest version of CRATE-NAME." > (description "Updater for crates.io packages") > (pred crate-package?) > (latest latest-release))) > - > diff --git a/guix/scripts/import/crate.scm b/guix/scripts/import/crate.scm > index 4690cceb4d..85ae6fbe59 100644 > --- a/guix/scripts/import/crate.scm > +++ b/guix/scripts/import/crate.scm > @@ -96,14 +96,7 @@ Import and convert the crate.io package for > PACKAGE-NAME.\n")) > (package-name->name+version spec)) > > (if (assoc-ref opts 'recursive) > - (map (match-lambda > - ((and ('package ('name name) . rest) pkg) > - `(define-public ,(string->symbol name) > - ,pkg)) > - (_ #f)) > - (reverse > - (stream->list > - (crate-recursive-import name)))) > + (stream->list (crate-recursive-import name version)) > (let ((sexp (crate->guix-package name version))) > (unless sexp > (leave (G_ "failed to download meta-data for package '~a'~%") > diff --git a/tests/crate.scm b/tests/crate.scm > index c14862ad9f..b77cbb08c6 100644 > --- a/tests/crate.scm > +++ b/tests/crate.scm > @@ -95,7 +95,7 @@ > ('source ('origin > ('method 'url-fetch) > ('uri ('crate-uri "foo" 'version)) > - ('file-name ('string-append 'name "-" 'version ".tar.gz")) > + ('file-name ('string-append 'name "-" 'version ".crate")) > ('sha256 > ('base32 > (? string? hash))))) I'm added a patch that will skips the building of libraries which I would assume most of the packages being imported are. This could be parametrized in the future. From 3f2ff3b4dc4cdf8b0282316b9c2426291da8a6c7 Mon Sep 17 00:00:00 2001 From: Martin Becze Date: Sat, 30 Nov 2019 11:27:05 -0500 Subject: [PATCH] added "#:skip-build? #t" to the output of (make-crate-sexp). Most the the packages imported will be libaries and won't need to build. The top level package will build them though. * guix/import/crate.scm (make-crate-sexp): added "#:skip-build? #t" to the output --- guix/import/crate.scm | 3 ++- tests/crate.scm | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/guix/import/crate.scm b/guix/import/crate.scm index da92c43b8c..5683369b7a 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -183,7 +183,8 @@ record or #f if it was not found." (base32 ,(bytevector->nix-base32-string (port-sha256 port)))))) (build-system cargo-build-system) - ,@(maybe-arguments (append (maybe-cargo-inputs cargo-inputs) + ,@(maybe-arguments (append `(#:skip-build? #t) + (maybe-cargo-inputs cargo-inputs) (maybe-cargo-development-inputs cargo-development-inputs))) (home-page ,(match home-page diff --git a/tests/crate.scm b/tests/crate.scm index b77cbb08c6..64e5b6932e 100644 --- a/tests/crate.scm +++ b/tests/crate.scm @@ -102,7 +102,8 @@ ('build-system 'cargo-build-system) ('arguments ('quasiquote - ('#:cargo-inputs (("rust-bar" ('unquote rust-bar)))))) + ('#:skip-build? #t + #:cargo-inputs (("rust-bar" ('unquote rust-bar)))))) ('home-page "http://example.com") ('synopsis "summary") ('description "summary") -- 2.24.0