From 127586adfb4228576d124ad5fa5cb6eacc29ea0f Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Tue, 28 Aug 2018 09:45:36 -0400 Subject: [PATCH] guix: import: stackage: Fix JSON accessors. * guix/import/stackage.scm (lts-info-ghc-version, lst-info-packages): Use assoc-ref for accessing parsed JSON. --- guix/import/stackage.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/guix/import/stackage.scm b/guix/import/stackage.scm index afd5d997ae..1c1e73a723 100644 --- a/guix/import/stackage.scm +++ b/guix/import/stackage.scm @@ -43,15 +43,12 @@ (define (lts-info-ghc-version lts-info) "Retruns the version of the GHC compiler contained in LTS-INFO." - (match lts-info - ((("snapshot" ("ghc" . version) _ _) _) version) - (_ #f))) + (and=> (assoc-ref lts-info "snapshot") + (cut assoc-ref <> "ghc"))) (define (lts-info-packages lts-info) - "Returns the alist of packages contained in LTS-INFO." - (match lts-info - ((("packages" pkg ...) . _) pkg) - (_ '()))) + "Retruns the alist of packages contained in LTS-INFO." + (or (assoc-ref lts-info "packages") '())) (define (leave-with-message fmt . args) (raise (condition (&message (message (apply format #f fmt args))))))