diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-12-11 22:18:05 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-12-11 22:18:05 +0100 |
| commit | b03e4fd5269897448124a7b61a737802b2c638ee (patch) | |
| tree | e4eaab1d3076e335c57eea462ff7fda7919f0831 /guix/import/hackage.scm | |
| parent | da3c6a7f19ef1243af725f63c16c8fd92fde33b4 (diff) | |
| parent | 99aad42138e0895df51e64e1261984f277952516 (diff) | |
| download | gnu-guix-b03e4fd5269897448124a7b61a737802b2c638ee.tar gnu-guix-b03e4fd5269897448124a7b61a737802b2c638ee.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) |