diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-08-10 15:32:51 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-08-10 15:32:51 +0200 |
| commit | 7b38f045c04fe69001ff5c2f04486cc51a69ae82 (patch) | |
| tree | bd839f1f635dc114c84d67c1db09b74f613ec315 /guix/import/hackage.scm | |
| parent | 369d15674c8bb251c45a45466031a2da1640df9f (diff) | |
| parent | 256d5c6e339d59287284bb83f35c594f13bd08f9 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/import/hackage.scm')
| -rw-r--r-- | guix/import/hackage.scm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index 6f80d84b70..3b138f8c98 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch> ;;; Copyright © 2016 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2016 Nils Gillmann <ng0@n0.is> +;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -178,8 +179,9 @@ object." (define (cabal-custom-setup-dependencies->names cabal) "Return the list of custom-setup dependencies from the CABAL package object." - (let* ((custom-setup-dependencies (and=> (cabal-package-custom-setup cabal) - cabal-custom-setup-dependencies))) + (let* ((custom-setup-dependencies (or (and=> (cabal-package-custom-setup cabal) + cabal-custom-setup-dependencies) + '()))) (map cabal-dependency-name custom-setup-dependencies))) (define (filter-dependencies dependencies own-name) |