diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-07-31 14:28:56 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-07-31 14:28:56 +0200 |
commit | 6a2e54236e1b2c428c8fd478ee0f3bd8130703fa (patch) | |
tree | af70155a2f474d35d90d003f8584b2d9ee0bbaa8 /guix/import/utils.scm | |
parent | 2cf1e37c109c8d03fae75bc84f7012f3afa956e5 (diff) | |
parent | 3d88855dfdcc4c8ce11f494fdf9f0ac1d8eef530 (diff) | |
download | guix-patches-6a2e54236e1b2c428c8fd478ee0f3bd8130703fa.tar guix-patches-6a2e54236e1b2c428c8fd478ee0f3bd8130703fa.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/import/utils.scm')
-rw-r--r-- | guix/import/utils.scm | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 84503ab907..2a3b7341fb 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -45,7 +45,6 @@ #:use-module (srfi srfi-41) #:export (factorize-uri - hash-table->alist flatten assoc-ref* @@ -100,21 +99,6 @@ of the string VERSION is replaced by the symbol 'version." '() indices)))))) -(define (hash-table->alist table) - "Return an alist represenation of TABLE." - (map (match-lambda - ((key . (lst ...)) - (cons key - (map (lambda (x) - (if (hash-table? x) - (hash-table->alist x) - x)) - lst))) - ((key . (? hash-table? table)) - (cons key (hash-table->alist table))) - (pair pair)) - (hash-map->list cons table))) - (define (flatten lst) "Return a list that recursively concatenates all sub-lists of LST." (fold-right @@ -330,11 +314,14 @@ the expected fields of an <origin> object." (lookup-build-system-by-name (string->symbol (assoc-ref meta "build-system")))) (native-inputs - (specs->package-lists (or (assoc-ref meta "native-inputs") '()))) + (specs->package-lists + (vector->list (or (assoc-ref meta "native-inputs") '#())))) (inputs - (specs->package-lists (or (assoc-ref meta "inputs") '()))) + (specs->package-lists + (vector->list (or (assoc-ref meta "inputs") '#())))) (propagated-inputs - (specs->package-lists (or (assoc-ref meta "propagated-inputs") '()))) + (specs->package-lists + (vector->list (or (assoc-ref meta "propagated-inputs") '#())))) (home-page (assoc-ref meta "home-page")) (synopsis |