nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

import: hackage: Do not repeat inputs in native-inputs. 

* guix/import/hackage.scm (hackage-module->sexp): Do not repeat inputs again
in native-inputs. native-inputs should only contain packages that are not
already listed in inputs.
This commit is contained in:
Arun Isaac 2018-09-22 22:18:50 +05:30
parent 852a5692bb
commit 69b0a847fb
No known key found for this signature in database
GPG Key ID: 2E25EE8B61802BB3
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
guix/import/hackage.scm
View File

@ -215,15 +215,18 @@ representation of a Cabal file as produced by 'read-cabal'."
cabal))
(define hackage-native-dependencies
((compose (cut filter-dependencies <>
(cabal-package-name cabal))
;; FIXME: Check include-test-dependencies?
(lambda (cabal)
(append (if include-test-dependencies?
(cabal-test-dependencies->names cabal)
'())
(cabal-custom-setup-dependencies->names cabal))))
cabal))
(lset-difference
equal?
((compose (cut filter-dependencies <>
(cabal-package-name cabal))
;; FIXME: Check include-test-dependencies?
(lambda (cabal)
(append (if include-test-dependencies?
(cabal-test-dependencies->names cabal)
'())
(cabal-custom-setup-dependencies->names cabal))))
cabal)
hackage-dependencies))
(define dependencies
(map (lambda (name)