From d8c66da7c1566f0fb9156ebfe0f4108282fd4a10 Mon Sep 17 00:00:00 2001 From: Federico Beffa Date: Wed, 25 Nov 2015 14:47:16 +0100 Subject: [PATCH] import: hackage: Assume current 'ghc' package version. * guix/scripts/import/hackage.scm (%default-options): Do it. (ghc-default-version): New variable. --- guix/scripts/import/hackage.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/guix/scripts/import/hackage.scm b/guix/scripts/import/hackage.scm index 97d042be3e..4e84278a78 100644 --- a/guix/scripts/import/hackage.scm +++ b/guix/scripts/import/hackage.scm @@ -19,6 +19,7 @@ (define-module (guix scripts import hackage) #:use-module (guix ui) #:use-module (guix utils) + #:use-module (guix packages) #:use-module (guix scripts) #:use-module (guix import hackage) #:use-module (guix scripts import) @@ -34,10 +35,13 @@ (define-module (guix scripts import hackage) ;;; Command-line options. ;;; +(define ghc-default-version + (string-append "ghc-" (package-version (@ (gnu packages haskell) ghc)))) + (define %default-options - '((include-test-dependencies? . #t) + `((include-test-dependencies? . #t) (read-from-stdin? . #f) - ('cabal-environment . '()))) + (cabal-environment . ,`(("impl" . ,ghc-default-version))))) (define (show-help) (display (_ "Usage: guix import hackage PACKAGE-NAME