mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 13:58:15 -05:00
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:
parent
852a5692bb
commit
69b0a847fb
1 changed files with 12 additions and 9 deletions
|
@ -215,15 +215,18 @@ (define hackage-dependencies
|
|||
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)
|
||||
|
|
Loading…
Reference in a new issue