diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-11-05 23:56:22 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-11-05 23:56:22 +0100 |
| commit | f4a5faa9dcadc698383e15743ac5f974ee0e3c8b (patch) | |
| tree | 96124567d5604c496cf8d2848ffe348de0b701ac /guix/import/hackage.scm | |
| parent | 16b89ecc1f2f1f9651d119518c0e752b01f0f07b (diff) | |
| parent | adde15186da7529b85097fdafffc2a13b0e60bdf (diff) | |
| download | guix-patches-f4a5faa9dcadc698383e15743ac5f974ee0e3c8b.tar guix-patches-f4a5faa9dcadc698383e15743ac5f974ee0e3c8b.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/import/hackage.scm')
| -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) |