diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2019-08-28 16:48:55 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2019-08-29 08:06:54 +0200 |
| commit | 54ddd852209a0bd8500dc7dd5775d5dd87a9a017 (patch) | |
| tree | 9e981a21b4ec33790aff7e866805601758a9ac68 | |
| parent | 3b4eb3ba15db248959f66777a036784ae0afa5f9 (diff) | |
| download | guix-54ddd852209a0bd8500dc7dd5775d5dd87a9a017.tar.gz guix-54ddd852209a0bd8500dc7dd5775d5dd87a9a017.zip | |
import: cran: guix-import-cran: Use (guix import utils).
* guix/scripts/import/cran.scm (guix-import-cran): Use PACKAGE->DEFINITION
from (guix import utils) instead of custom procedure.
| -rw-r--r-- | guix/scripts/import/cran.scm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/guix/scripts/import/cran.scm b/guix/scripts/import/cran.scm index 794fb710cd..b6592f78a9 100644 --- a/guix/scripts/import/cran.scm +++ b/guix/scripts/import/cran.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org> -;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2015, 2017, 2019 Ricardo Wurmus <rekado@elephly.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,6 +22,7 @@ #:use-module (guix utils) #:use-module (guix scripts) #:use-module (guix import cran) + #:use-module (guix import utils) #:use-module (guix scripts import) #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) @@ -96,11 +97,7 @@ Import and convert the CRAN package for PACKAGE-NAME.\n")) ((package-name) (if (assoc-ref opts 'recursive) ;; Recursive import - (map (match-lambda - ((and ('package ('name name) . rest) pkg) - `(define-public ,(string->symbol name) - ,pkg)) - (_ #f)) + (map package->definition (reverse (stream->list (cran-recursive-import package-name |