08/13: import: hackage: Return multiple values for unknown packages.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 6bb92098b4d8df2ba0714806c1b1e46cc29c9edc
Author: zimoun <zimon.toutoune@gmail.com>
AuthorDate: Tue Jan 19 16:47:18 2021 +0100

    import: hackage: Return multiple values for unknown packages.
    
    Partly fixes <https://bugs.gnu.org/44115>.
    
    * guix/import/hackage.scm (hackage->guix-package): Return 'values'.
    
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 guix/import/hackage.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm
index b94f4169d4..75def99574 100644
--- a/guix/import/hackage.scm
+++ b/guix/import/hackage.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2019 Robert Vollmert <rob@vllmrt.net>
 ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz>
 ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
+;;; Copyright © 2019 Simon Tournier <zimon.toutoune@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -337,10 +338,13 @@ respectively."
                 (if port
                     (read-cabal-and-hash port)
                     (hackage-fetch-and-hash package-name))))
-    (and=> cabal-meta (compose (cut hackage-module->sexp <> cabal-hash
-                                    #:include-test-dependencies?
-                                    include-test-dependencies?)
-                               (cut eval-cabal <> cabal-environment)))))
+    (if cabal-meta
+        ((compose (cut hackage-module->sexp <> cabal-hash
+                       #:include-test-dependencies?
+                       include-test-dependencies?)
+                  (cut eval-cabal <> cabal-environment))
+         cabal-meta)
+        (values #f '()))))
 
 (define hackage->guix-package/m                   ;memoized variant
   (memoize hackage->guix-package))