aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--guix/import/hackage.scm21
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)
ass='msg-avail'>...Mathieu Othacehe 2019-01-17gnu: Add graphical installer support....Mathieu Othacehe 2019-01-09build: Require Guile 2.2....Ludovic Courtès 2018-12-02Make Guile-JSON a required dependency....Eric Bavier 2018-10-12build: Fine-tune the forbidden M4 patterns....Ludovic Courtès 2018-10-12build: Remove obsolete reference to 'GUIX_ASSERT_LIBGCRYPT_USABLE'....Ludovic Courtès 2018-09-04Switch to Guile-Gcrypt....Ludovic Courtès 2018-06-18build: Remove checks for 'nix-instantiate'....Ludovic Courtès 2018-06-14build: Require Guile-SQLite3....Ludovic Courtès 2018-06-01build: Check for Guile-SQLite3....Ludovic Courtès 2018-04-19gnu: doc: Allow documentation to be translated....Julien Lepiller 2018-02-26build: Require Guile >= 2.0.13....Ludovic Courtès 2018-02-07etc: Add SELinux policy for the daemon....Ricardo Wurmus 2018-01-23build: Expand ‘scripts/guix’ at Make time....Mathieu Lirzin 2018-01-16etc: Add completions for fish....ng0 2018-01-06build: Detect broken 'equal?' in Guile 2.2.1....Ludovic Courtès