From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 26 14:28:49 2019 Received: (at submit) by debbugs.gnu.org; 26 Sep 2019 18:28:49 +0000 Received: from localhost ([127.0.0.1]:45127 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iDYVU-00072x-PJ for submit@debbugs.gnu.org; Thu, 26 Sep 2019 14:28:48 -0400 Received: from lists.gnu.org ([209.51.188.17]:59449) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iDYVS-00072p-QX for submit@debbugs.gnu.org; Thu, 26 Sep 2019 14:28:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39498) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDYVQ-0004Nz-Ob for guix-patches@gnu.org; Thu, 26 Sep 2019 14:28:45 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iDYVP-0001RR-Ef for guix-patches@gnu.org; Thu, 26 Sep 2019 14:28:44 -0400 Received: from mx1.riseup.net ([198.252.153.129]:47048) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iDYVP-0001RD-56 for guix-patches@gnu.org; Thu, 26 Sep 2019 14:28:43 -0400 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 "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.riseup.net (Postfix) with ESMTPS id 46fNjQ2bPbzDyWS for ; Thu, 26 Sep 2019 11:28:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1569522522; bh=8PFkOK+DSyNaElr6ML06q+zf4iYX9MQ6p9N4g6ZydB8=; h=From:To:Cc:Subject:Date:From; b=s3T2xoEB9J/95GN25IhTElfl3fFYlacTN0Zc7YdIm46nk09O9RB23Ga280WCg+Z8b LREfLhZGzGDjhSgjhd0Y8VHl49+jNBiIZABZMDmDtDydsxIevP6SIUXD+YCQ1BhiSm cR+HIr++e4+sVjLVfkmhTQSr5sthOP+xs4sd8QXg= X-Riseup-User-ID: C126B9742C6C555F3A40B4ABC80F920817D3B427A7C260413EEC49BE605E163E Received: from [127.0.0.1] (localhost [127.0.0.1]) by bell.riseup.net (Postfix) with ESMTPSA id 46fNjP0wZjzJxhf; Thu, 26 Sep 2019 11:28:40 -0700 (PDT) From: Martin Becze To: guix-patches@gnu.org Subject: [PATCH 0/3] Recursive option for crate importer Date: Thu, 26 Sep 2019 14:28:12 -0400 Message-Id: <20190926182812.10566-1-mjbecze@riseup.net> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 198.252.153.129 X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Martin Becze X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) This add recursive functionalty for the crate importer. Currently it does= n't respect the versioning. To do that we will need to add semver functio= nality as well so that we can look up the correct version of dependencies= .=20 Martin Becze (3): added recusive import functionality to the crate importer updated the crate import script to accept recursive option updated docs for import crate doc/guix.texi | 7 +++++++ guix/import/crate.scm | 29 +++++++++++++++++++---------- guix/scripts/import/crate.scm | 35 +++++++++++++++++++++++++---------- 3 files changed, 51 insertions(+), 20 deletions(-) --=20 2.23.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 26 14:31:24 2019 Received: (at 37525) by debbugs.gnu.org; 26 Sep 2019 18:31:24 +0000 Received: from localhost ([127.0.0.1]:45139 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iDYY0-0008Uv-6I for submit@debbugs.gnu.org; Thu, 26 Sep 2019 14:31:24 -0400 Received: from mx1.riseup.net ([198.252.153.129]:44160) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iDYXy-0008T7-Ae for 37525@debbugs.gnu.org; Thu, 26 Sep 2019 14:31:22 -0400 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 "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.riseup.net (Postfix) with ESMTPS id 46fNmT4bKhzFbcn for <37525@debbugs.gnu.org>; Thu, 26 Sep 2019 11:31:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1569522681; bh=a4OZGMhL4X2Z2LYW2tcXrT1ZL8n/GNkAU9LOb+wMDus=; h=From:To:Cc:Subject:Date:From; b=Mteea/V4q82D0f5Voy+kV3KeNThF6lUOvZHW6sr7+q0A/C4uufgwCVPaVUCeVavU9 pLpvxghWshXC+CoVaCwuBGQbqK1sg8u4B0BWtjWCQn4qyaQyeqh2SbLdEvjBXMyszh vHD4TkkCKsjwm0IDPykhRZ5dqtCz5ggOtjZCDBGU= X-Riseup-User-ID: 065AAACFF59AC0523127A6ED5C9A1D21D9E3260C92EE3EEDA55A7B04E01C7C26 Received: from [127.0.0.1] (localhost [127.0.0.1]) by bell.riseup.net (Postfix) with ESMTPSA id 46fNmS5kkrzJxhV; Thu, 26 Sep 2019 11:31:20 -0700 (PDT) From: Martin Becze To: 37525@debbugs.gnu.org Subject: [PATCH 1/3] added recusive import functionality to the crate importer 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 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 37525 Cc: Martin Becze X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- 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 From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 26 14:31:32 2019 Received: (at 37525) by debbugs.gnu.org; 26 Sep 2019 18:31:32 +0000 Received: from localhost ([127.0.0.1]:45142 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iDYY7-0000B2-JG for submit@debbugs.gnu.org; Thu, 26 Sep 2019 14:31:32 -0400 Received: from mx1.riseup.net ([198.252.153.129]:44324) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iDYY4-00008Q-UQ for 37525@debbugs.gnu.org; Thu, 26 Sep 2019 14:31:30 -0400 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 "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.riseup.net (Postfix) with ESMTPS id 46fNmc3wklzDrl7 for <37525@debbugs.gnu.org>; Thu, 26 Sep 2019 11:31:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1569522688; bh=W7/TiRp0IgndAInXcaqD0GYBeEmuPwxSpMlTxjMW92s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aVPyecJq9QOuUs/wu6a24g94mrMjdFEkby2be+PtLEFlbDK7POQLPS0yU3WIA1kYS UIHq4aBVPkrKsOSOYbNnDXA1uma5mi/fVCmPNqkt9Qfd8Zc88SA7NQ5eDrJ+0l8E2i vLv/7iCinHhiVSywkVwqiuct+l3ufpFX/ImGqu98= X-Riseup-User-ID: D0F103132DC8D5E712C4C74C477A1164A1B229D89A92032D35E35930D34C14E8 Received: from [127.0.0.1] (localhost [127.0.0.1]) by bell.riseup.net (Postfix) with ESMTPSA id 46fNmb5hmZzJxhV; Thu, 26 Sep 2019 11:31:27 -0700 (PDT) From: Martin Becze To: 37525@debbugs.gnu.org Subject: [PATCH 2/3] updated the crate import script to accept recursive option Date: Thu, 26 Sep 2019 14:31:02 -0400 Message-Id: <20190926183103.10646-2-mjbecze@riseup.net> In-Reply-To: <20190926183103.10646-1-mjbecze@riseup.net> References: <20190926183103.10646-1-mjbecze@riseup.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 37525 Cc: Martin Becze X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- guix/scripts/import/crate.scm | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/guix/scripts/import/crate.scm b/guix/scripts/import/crate.scm index 7ae8638911..19c8277d14 100644 --- a/guix/scripts/import/crate.scm +++ b/guix/scripts/import/crate.scm @@ -28,6 +28,7 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) #:use-module (srfi srfi-37) + #:use-module (srfi srfi-41) #:use-module (ice-9 match) #:use-module (ice-9 format) #:export (guix-import-crate)) @@ -46,6 +47,8 @@ Import and convert the crate.io package for PACKAGE-NAME.\n")) (display (G_ " -h, --help display this help and exit")) (display (G_ " + -r, --recursive import packages recursively")) + (display (G_ " -V, --version display version information and exit")) (newline) (show-bug-report-information)) @@ -59,6 +62,9 @@ Import and convert the crate.io package for PACKAGE-NAME.\n")) (option '(#\V "version") #f #f (lambda args (show-version-and-exit "guix import crate"))) + (option '(#\r "recursive") #f #f + (lambda (opt name arg result) + (alist-cons 'recursive #t result))) %standard-import-options)) @@ -79,22 +85,31 @@ Import and convert the crate.io package for PACKAGE-NAME.\n")) (let* ((opts (parse-options)) (args (filter-map (match-lambda - (('argument . value) - value) - (_ #f)) + (('argument . value) + value) + (_ #f)) (reverse opts)))) (match args ((spec) (define-values (name version) (package-name->name+version spec)) - (let ((sexp (crate->guix-package name version))) - (unless sexp - (leave (G_ "failed to download meta-data for package '~a'~%") - (if version - (string-append name "@" version) - name))) - sexp)) + (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)))) + (let ((sexp (crate->guix-package name version))) + (unless sexp + (leave (G_ "failed to download meta-data for package '~a'~%") + (if version + (string-append name "@" version) + name))) + sexp))) (() (leave (G_ "too few arguments~%"))) ((many ...) -- 2.23.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 26 14:31:35 2019 Received: (at 37525) by debbugs.gnu.org; 26 Sep 2019 18:31:35 +0000 Received: from localhost ([127.0.0.1]:45145 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iDYYB-0000E7-4m for submit@debbugs.gnu.org; Thu, 26 Sep 2019 14:31:35 -0400 Received: from mx1.riseup.net ([198.252.153.129]:44364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iDYY7-0000At-K9 for 37525@debbugs.gnu.org; Thu, 26 Sep 2019 14:31:33 -0400 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 "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.riseup.net (Postfix) with ESMTPS id 46fNmg1hdWzDqjr for <37525@debbugs.gnu.org>; Thu, 26 Sep 2019 11:31:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1569522691; bh=qEIIIhwNaoab6kAU8fjVO0wD3Fv0spAVm9H+KOHQYXE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QOSrtSw/V4t8c9851Rx46h+lk6zhgdQCVU96AVBBBuFL4kpxMZ6RmSswyrGuYw8Hm 6GAQi8k5LMtatmzDrbiskLixwpoKdxSpyHVFcaoSc/kBnV2JgibarIiyQtyTz0FqSE qiu46Dk7XZ1+xU7pg6ZCz5pXhrIxSsnOCiTmQ6oU= X-Riseup-User-ID: 9A93518D18404139D476B22D471D206B8234E5D74CA17FFC8F493B2EF7B77C84 Received: from [127.0.0.1] (localhost [127.0.0.1]) by bell.riseup.net (Postfix) with ESMTPSA id 46fNmf37ZyzJxhV; Thu, 26 Sep 2019 11:31:30 -0700 (PDT) From: Martin Becze To: 37525@debbugs.gnu.org Subject: [PATCH 3/3] updated docs for import crate Date: Thu, 26 Sep 2019 14:31:03 -0400 Message-Id: <20190926183103.10646-3-mjbecze@riseup.net> In-Reply-To: <20190926183103.10646-1-mjbecze@riseup.net> References: <20190926183103.10646-1-mjbecze@riseup.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 37525 Cc: Martin Becze X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --- doc/guix.texi | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index 14c4514b31..3b3645b854 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -9054,6 +9054,13 @@ in Guix. Import metadata from the crates.io Rust package repository @uref{https://crates.io, crates.io}, as in this example: +@item --recursive +@itemx -r +Traverse the dependency graph of the given upstream package recursively +and generate package expressions for all those packages that are not yet +in Guix. +@end table + @example guix import crate blake2-rfc @end example -- 2.23.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 01 16:17:34 2019 Received: (at 37525) by debbugs.gnu.org; 1 Oct 2019 20:17:34 +0000 Received: from localhost ([127.0.0.1]:34892 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFOaR-0002u6-BW for submit@debbugs.gnu.org; Tue, 01 Oct 2019 16:17:31 -0400 Received: from mx1.riseup.net ([198.252.153.129]:58776) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFOaM-0002qm-Tw for 37525@debbugs.gnu.org; Tue, 01 Oct 2019 16:17:27 -0400 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 "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.riseup.net (Postfix) with ESMTPS id 46jVtZ2FGPzFbcv for <37525@debbugs.gnu.org>; Tue, 1 Oct 2019 13:17:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1569961046; bh=cM6v9X+9ckZnGm/AIfKc6gmORBu3wfBhLHt4fGS8jLs=; h=Date:From:To:Subject:From; b=CfNoeOcqusNcgzoSzI004mJsXTlV+azotbkrekRZ6FuuY0sbAUFSu26JIMluur4DV JY09Dwz3xoatsq/HRP7lJuVciZMLfXlFd20XY+YcAdor7Cgc8Y38YA99DkP3nmkZAl 0Dsyl0SOgP6KsjCQOqNMqhQjXo2DJFoMI2otyngk= X-Riseup-User-ID: F08809C92D9E75F3D54073AD26D8268C14BF3029CCB876B58816138245EFF8E1 Received: from [127.0.0.1] (localhost [127.0.0.1]) by bell.riseup.net (Postfix) with ESMTPSA id 46jVtZ15kbzJrcL for <37525@debbugs.gnu.org>; Tue, 1 Oct 2019 13:17:26 -0700 (PDT) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Date: Tue, 01 Oct 2019 13:17:25 -0700 From: Martin Becze To: 37525@debbugs.gnu.org Subject: previous patch had mistake in docs Message-ID: X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 37525 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hiy yall, the previous patch had mistake in docs. a new patch with change log incoming! From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 01 16:56:15 2019 Received: (at 37525) by debbugs.gnu.org; 1 Oct 2019 20:56:15 +0000 Received: from localhost ([127.0.0.1]:34959 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFPBv-0003yY-0C for submit@debbugs.gnu.org; Tue, 01 Oct 2019 16:56:15 -0400 Received: from mx1.riseup.net ([198.252.153.129]:55124) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFPBt-0003yF-Aq for 37525@debbugs.gnu.org; Tue, 01 Oct 2019 16:56:14 -0400 Received: from capuchin.riseup.net (capuchin-pn.riseup.net [10.0.1.176]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.riseup.net (Postfix) with ESMTPS id 46jWkf59hVzFbvV for <37525@debbugs.gnu.org>; Tue, 1 Oct 2019 13:55:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1569963372; bh=Hm6Fl8qRMkL17bTP4h+k14xa0q01gjr4DnBgx1rR3Qk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mF0df0n8TURMo18HbCW56EtivI/x6XY1BZsnhlO73uPEspLOjXbZ8EeL1nobokOrd 2HxMjEGnCdJxFiwDXtCW1zW8EJ2w6zFoG+0ztohYICoNWiltj+wIYpcL90h5QXwqKU UGKnk43NjWm2Vsj9zSWqTE4A2LaqiwvJX1XmOBW8= X-Riseup-User-ID: E6BD1B48896D7D0819F0E70995BE45B0D58AAB049C791F2B2A5A471C5E0A71D3 Received: from [127.0.0.1] (localhost [127.0.0.1]) by capuchin.riseup.net (Postfix) with ESMTPSA id 46jWkd6hmmz8tZ1; Tue, 1 Oct 2019 13:55:37 -0700 (PDT) From: Martin Becze To: 37525@debbugs.gnu.org Subject: [PATCH v2 3/3] updated docs for import crate Date: Tue, 1 Oct 2019 16:54:58 -0400 Message-Id: <20191001205458.20926-3-mjbecze@riseup.net> In-Reply-To: <20191001205458.20926-1-mjbecze@riseup.net> References: <20191001205458.20926-1-mjbecze@riseup.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 37525 Cc: Martin Becze X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * doc/guix.texi update docs --- This fixes a bug in the prevous patch. And adds better commits to the git log! doc/guix.texi | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/guix.texi b/doc/guix.texi index 14c4514b31..a49c9d2b26 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -9054,8 +9054,14 @@ in Guix. Import metadata from the crates.io Rust package repository @uref{https://crates.io, crates.io}, as in this example: +@item --recursive +@itemx -r +Traverse the dependency graph of the given upstream package recursively +and generate package expressions for all those packages that are not yet +in Guix. + @example -guix import crate blake2-rfc +guix import crate -r blake2-rfc @end example The crate importer also allows you to specify a version string: -- 2.23.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 01 16:56:15 2019 Received: (at 37525) by debbugs.gnu.org; 1 Oct 2019 20:56:15 +0000 Received: from localhost ([127.0.0.1]:34961 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFPBv-0003yc-An for submit@debbugs.gnu.org; Tue, 01 Oct 2019 16:56:15 -0400 Received: from mx1.riseup.net ([198.252.153.129]:55132) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFPBt-0003yG-Ds for 37525@debbugs.gnu.org; Tue, 01 Oct 2019 16:56:14 -0400 Received: from capuchin.riseup.net (capuchin-pn.riseup.net [10.0.1.176]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.riseup.net (Postfix) with ESMTPS id 46jWkc4qdmzFbty for <37525@debbugs.gnu.org>; Tue, 1 Oct 2019 13:55:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1569963372; bh=Fb9Kn3XYm5I1+oRkajQiJM8dfEoJXldQNd5HiP0FIo0=; h=From:To:Cc:Subject:Date:From; b=Xqx9L28oQ29z67N3FddXL+j6NlcEdQDYrDmrl6yeIF3FAOmqb/w7+iQRy2gU4FCq2 HA5B9B7F1YBEQJM/PxF/s7pRhlTxSnJaIUixAIaIkZeLAHwRpYHYLi2fd7v1nta3bT 97STSDLbCQWga6xGcQNxuIZqbYN8Bf/ecjXSGfGI= X-Riseup-User-ID: 9CEC29627EF4FCA62D9A45EB7D37F8A3584785488C8BBF4936CECD61CFA000A1 Received: from [127.0.0.1] (localhost [127.0.0.1]) by capuchin.riseup.net (Postfix) with ESMTPSA id 46jWkb5XHnz8tHS; Tue, 1 Oct 2019 13:55:35 -0700 (PDT) From: Martin Becze To: 37525@debbugs.gnu.org Subject: [PATCH v2 1/3] added recusive import functionality to the crate importer Date: Tue, 1 Oct 2019 16:54:56 -0400 Message-Id: <20191001205458.20926-1-mjbecze@riseup.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 37525 Cc: Martin Becze X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * /guix/import/crate.scm (crate-recursive-import crate-name): added recusive import proc * /guix/import/crate.scm (crate->guix-package): return inputs for use by the recurive importer --- 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 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 01 16:56:16 2019 Received: (at 37525) by debbugs.gnu.org; 1 Oct 2019 20:56:16 +0000 Received: from localhost ([127.0.0.1]:34963 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFPBv-0003yi-LR for submit@debbugs.gnu.org; Tue, 01 Oct 2019 16:56:15 -0400 Received: from mx1.riseup.net ([198.252.153.129]:55116) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFPBt-0003yD-DZ for 37525@debbugs.gnu.org; Tue, 01 Oct 2019 16:56:14 -0400 Received: from capuchin.riseup.net (capuchin-pn.riseup.net [10.0.1.176]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.riseup.net (Postfix) with ESMTPS id 46jWkd54nWzFbv1 for <37525@debbugs.gnu.org>; Tue, 1 Oct 2019 13:55:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1569963372; bh=zTdXVPN0/rcugbU7D9GNyKCpKPEYgOhZcOXCpfb2xVo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DVPpnMZt1pjpSZQf9TluABhjNk9BSo7EGZpZ70xpkUof0RlXDv12min75dHwz0Y80 6lcOLKZOZWlmNytk3m4bobBbHN1yeNyadyu9sktAH9f9h+0gG7jqQd2ErZFPVqUS5i 9lLQ7TQeQYHlvNYMY8tNSa7SusJ+omz8WlXfFhfQ= X-Riseup-User-ID: 087231C3026A856F793F9FF5909DFDD20E986E19B8A76F587E7F289B29E4B112 Received: from [127.0.0.1] (localhost [127.0.0.1]) by capuchin.riseup.net (Postfix) with ESMTPSA id 46jWkc6HFNz8tYN; Tue, 1 Oct 2019 13:55:36 -0700 (PDT) From: Martin Becze To: 37525@debbugs.gnu.org Subject: [PATCH v2 2/3] updated the crate import script to accept recursive option Date: Tue, 1 Oct 2019 16:54:57 -0400 Message-Id: <20191001205458.20926-2-mjbecze@riseup.net> In-Reply-To: <20191001205458.20926-1-mjbecze@riseup.net> References: <20191001205458.20926-1-mjbecze@riseup.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 37525 Cc: Martin Becze X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * guix/scripts/import/crate.scm (show-help, guix-import-crate): added recursive option --- guix/scripts/import/crate.scm | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/guix/scripts/import/crate.scm b/guix/scripts/import/crate.scm index 7ae8638911..19c8277d14 100644 --- a/guix/scripts/import/crate.scm +++ b/guix/scripts/import/crate.scm @@ -28,6 +28,7 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) #:use-module (srfi srfi-37) + #:use-module (srfi srfi-41) #:use-module (ice-9 match) #:use-module (ice-9 format) #:export (guix-import-crate)) @@ -46,6 +47,8 @@ Import and convert the crate.io package for PACKAGE-NAME.\n")) (display (G_ " -h, --help display this help and exit")) (display (G_ " + -r, --recursive import packages recursively")) + (display (G_ " -V, --version display version information and exit")) (newline) (show-bug-report-information)) @@ -59,6 +62,9 @@ Import and convert the crate.io package for PACKAGE-NAME.\n")) (option '(#\V "version") #f #f (lambda args (show-version-and-exit "guix import crate"))) + (option '(#\r "recursive") #f #f + (lambda (opt name arg result) + (alist-cons 'recursive #t result))) %standard-import-options)) @@ -79,22 +85,31 @@ Import and convert the crate.io package for PACKAGE-NAME.\n")) (let* ((opts (parse-options)) (args (filter-map (match-lambda - (('argument . value) - value) - (_ #f)) + (('argument . value) + value) + (_ #f)) (reverse opts)))) (match args ((spec) (define-values (name version) (package-name->name+version spec)) - (let ((sexp (crate->guix-package name version))) - (unless sexp - (leave (G_ "failed to download meta-data for package '~a'~%") - (if version - (string-append name "@" version) - name))) - sexp)) + (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)))) + (let ((sexp (crate->guix-package name version))) + (unless sexp + (leave (G_ "failed to download meta-data for package '~a'~%") + (if version + (string-append name "@" version) + name))) + sexp))) (() (leave (G_ "too few arguments~%"))) ((many ...) -- 2.23.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 01 17:33:13 2019 Received: (at 37525-done) by debbugs.gnu.org; 1 Oct 2019 21:33:13 +0000 Received: from localhost ([127.0.0.1]:35005 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFPlh-00072C-F0 for submit@debbugs.gnu.org; Tue, 01 Oct 2019 17:33:13 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:56062) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFPlf-000722-BA for 37525-done@debbugs.gnu.org; Tue, 01 Oct 2019 17:33:11 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 97DFAC124D; Tue, 1 Oct 2019 23:33:09 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AUzfaeslV5qD; Tue, 1 Oct 2019 23:33:08 +0200 (CEST) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 98046C117D; Tue, 1 Oct 2019 23:33:08 +0200 (CEST) From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Martin Becze Subject: Re: [bug#37525] [PATCH v2 1/3] added recusive import functionality to the crate importer References: <20190926182812.10566-1-mjbecze@riseup.net> <20191001205458.20926-1-mjbecze@riseup.net> Date: Tue, 01 Oct 2019 23:33:07 +0200 In-Reply-To: <20191001205458.20926-1-mjbecze@riseup.net> (Martin Becze's message of "Tue, 1 Oct 2019 16:54:56 -0400") Message-ID: <87r23wjgmk.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 37525-done Cc: 37525-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Hi, Applied! Note that I merged patches #2 and #3, because we usually document features as we add them, not separately. I had to fix up the Texinfo markup so that =E2=80=98--recursive=E2=80=99 is described under =E2=80=98cr= ate=E2=80=99. Anyway it seems to work well, thanks for the patches! Ludo=E2=80=99. From debbugs-submit-bounces@debbugs.gnu.org Tue Oct 01 17:52:51 2019 Received: (at 37525-done) by debbugs.gnu.org; 1 Oct 2019 21:52:51 +0000 Received: from localhost ([127.0.0.1]:35127 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFQ4g-0007fv-Pf for submit@debbugs.gnu.org; Tue, 01 Oct 2019 17:52:50 -0400 Received: from mx1.riseup.net ([198.252.153.129]:60618) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFQ4e-0007fn-J2 for 37525-done@debbugs.gnu.org; Tue, 01 Oct 2019 17:52:49 -0400 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 "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.riseup.net (Postfix) with ESMTPS id 46jY0b5VsFzDw2s; Tue, 1 Oct 2019 14:52:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1569966767; bh=vMTEooHO1hfM8MjezOrkFicT4Dlxn56lN1P3QoW5Mr0=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=e2f4N6aH33A84kpR56GKHhyJDl4Xa+MAlpuyZPw03zHGZsBL0J7YNIAB/hRoJV1+p ++/WGO+NnRyn8cHaNmGv6g4ASCTmMTXWG59BesmsAIgkGWe/Dmlt37nzNMjBKnALfB FlOZGzW5iLX13OPFpDBg8Gyfz6XwSrpLihRW+L4Q= X-Riseup-User-ID: 22023798CC1FF52D40C1B8D253375D14C3D246DBA6FDE124F3DF9616B0F70090 Received: from [127.0.0.1] (localhost [127.0.0.1]) by bell.riseup.net (Postfix) with ESMTPSA id 46jY0b3t8mzJsC3; Tue, 1 Oct 2019 14:52:47 -0700 (PDT) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Date: Tue, 01 Oct 2019 14:52:47 -0700 From: Martin Becze To: =?UTF-8?Q?Ludovic_Court=C3=A8s?= Subject: Re: [bug#37525] [PATCH v2 1/3] added recusive import functionality to the crate importer In-Reply-To: <87r23wjgmk.fsf@gnu.org> References: <20190926182812.10566-1-mjbecze@riseup.net> <20191001205458.20926-1-mjbecze@riseup.net> <87r23wjgmk.fsf@gnu.org> Message-ID: <844562e2d2fba3cc2f5b0c563635777d@riseup.net> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 37525-done Cc: 37525-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) On 2019-10-01 21:33, Ludovic Courtès wrote: > Hi, > > Applied! > > Note that I merged patches #2 and #3, because we usually document > features as we add them, not separately. I had to fix up the Texinfo > markup so that ‘--recursive’ is described under ‘crate’. > > Anyway it seems to work well, thanks for the patches! > > Ludo’. Awesome thanks! > features as we add them, not separately. Do you mean in the same commit that makes the changes to the code? or when you apply patches to master? From debbugs-submit-bounces@debbugs.gnu.org Wed Oct 02 10:28:10 2019 Received: (at 37525-done) by debbugs.gnu.org; 2 Oct 2019 14:28:10 +0000 Received: from localhost ([127.0.0.1]:38085 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFfbu-0007X1-2E for submit@debbugs.gnu.org; Wed, 02 Oct 2019 10:28:10 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:39720) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iFfbr-0007Ws-P3 for 37525-done@debbugs.gnu.org; Wed, 02 Oct 2019 10:28:08 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 06898AE11A; Wed, 2 Oct 2019 16:28:06 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 14FOaRVzQPfF; Wed, 2 Oct 2019 16:28:05 +0200 (CEST) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 09BEEAE0D1; Wed, 2 Oct 2019 16:28:04 +0200 (CEST) From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Martin Becze Subject: Re: [bug#37525] [PATCH v2 1/3] added recusive import functionality to the crate importer References: <20190926182812.10566-1-mjbecze@riseup.net> <20191001205458.20926-1-mjbecze@riseup.net> <87r23wjgmk.fsf@gnu.org> <844562e2d2fba3cc2f5b0c563635777d@riseup.net> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 11 =?utf-8?Q?Vend=C3=A9miaire?= an 228 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Wed, 02 Oct 2019 16:28:04 +0200 In-Reply-To: <844562e2d2fba3cc2f5b0c563635777d@riseup.net> (Martin Becze's message of "Tue, 01 Oct 2019 14:52:47 -0700") Message-ID: <875zl7gr2j.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 37525-done Cc: 37525-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Martin Becze skribis: > On 2019-10-01 21:33, Ludovic Court=C3=A8s wrote: [...] >> features as we add them, not separately. > > Do you mean in the same commit that makes the changes to the code? or > when you apply patches to master? I mean that when we add a user-visible change, such as a new command-line option, we should document it in the same commit that actually adds the feature. Thanks, Ludo=E2=80=99. From unknown Sat Jun 14 18:05:30 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 31 Oct 2019 11:24:05 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator