diff options
| author | Arun Isaac <arunisaac@systemreboot.net> | 2018-09-22 22:18:50 +0530 |
|---|---|---|
| committer | Arun Isaac <arunisaac@systemreboot.net> | 2018-10-28 13:51:20 +0530 |
| commit | 69b0a847fbeaa104e927e4fd2a231fb4fc98a40f (patch) | |
| tree | 9b00e6e15426f371ff9fe5b5e1981c4c4aa7fc9c /guix/import | |
| parent | 852a5692bbed1f2d23c0e47a7cdfb2a604a8f8b3 (diff) | |
| download | gnu-guix-69b0a847fbeaa104e927e4fd2a231fb4fc98a40f.tar gnu-guix-69b0a847fbeaa104e927e4fd2a231fb4fc98a40f.tar.gz | |
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.
Diffstat (limited to 'guix/import')
| -rw-r--r-- | guix/import/hackage.scm | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index 766a0b53f1..48db764b3c 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -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) |