From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:41045) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hmkLu-0006yK-Nj for guix-patches@gnu.org; Sun, 14 Jul 2019 15:40:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hmkLt-0003S7-Eu for guix-patches@gnu.org; Sun, 14 Jul 2019 15:40:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37178) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hmkLt-0003S1-Bj for guix-patches@gnu.org; Sun, 14 Jul 2019 15:40:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hmkLt-0005eX-4I for guix-patches@gnu.org; Sun, 14 Jul 2019 15:40:05 -0400 Subject: [bug#36653] [PATCH] guix import stackage: default to a LTS release compatible with GHC 8.4 Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:40810) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hmkKt-0006vI-3H for guix-patches@gnu.org; Sun, 14 Jul 2019 15:39:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hmkKr-0002wh-TT for guix-patches@gnu.org; Sun, 14 Jul 2019 15:39:03 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:10598) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hmkKr-0002vT-N8 for guix-patches@gnu.org; Sun, 14 Jul 2019 15:39:01 -0400 From: Robert Vollmert Date: Sun, 14 Jul 2019 21:38:43 +0200 Message-Id: <20190714193843.23405-1-rob@vllmrt.net> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 36653@debbugs.gnu.org Cc: Robert Vollmert In particular, this means that guix lint won't warn to update to versions that won't necessarily fit our package set well. Also some minor clean-up tweaks. * guix/import/stackage.scm (%stackage-url): Change to https, avoiding redirect log messages. (%default-lts-version): New field. (stackage->guix-package, latest-lts-release): Use it. (lts-info-ghc-version): Remove unused function. (lts-info-packages, latest-lts-release): Fix documentation typos. --- guix/import/stackage.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/guix/import/stackage.scm b/guix/import/stackage.scm index 1c1e73a723..de12ae4cb9 100644 --- a/guix/import/stackage.scm +++ b/guix/import/stackage.scm @@ -39,15 +39,13 @@ ;;; Stackage info fetcher and access functions ;;; =20 -(define %stackage-url "http://www.stackage.org") +(define %stackage-url "https://www.stackage.org") =20 -(define (lts-info-ghc-version lts-info) - "Retruns the version of the GHC compiler contained in LTS-INFO." - (and=3D> (assoc-ref lts-info "snapshot") - (cut assoc-ref <> "ghc"))) +;;; Latest LTS version compatible with bundled ghc version. +(define %default-lts-version "12.26") =20 (define (lts-info-packages lts-info) - "Retruns the alist of packages contained in LTS-INFO." + "Returns the alist of packages contained in LTS-INFO." (or (assoc-ref lts-info "packages") '())) =20 (define (leave-with-message fmt . args) @@ -90,7 +88,7 @@ (lambda* (package-name ; upstream name #:key (include-test-dependencies? #t) - (lts-version "") + (lts-version %default-lts-version) (packages-info (lts-info-packages (stackage-lts-info-fetch lts-version)))) @@ -119,10 +117,12 @@ included in the Stackage LTS release." ;;; =20 (define latest-lts-release - (let ((pkgs-info (mlambda () (lts-info-packages (stackage-lts-info-fet= ch))))) + (let ((pkgs-info + (mlambda () (lts-info-packages + (stackage-lts-info-fetch %default-lts-version))))) (lambda* (package) "Return an for the latest Stackage LTS release o= f -PACKAGE or #f it the package is not inlucded in the Stackage LTS release= ." +PACKAGE or #f it the package is not included in the Stackage LTS release= ." (let* ((hackage-name (guix-package->hackage-name package)) (version (lts-package-version (pkgs-info) hackage-name)) (name-version (hackage-name-version hackage-name version))) --=20 2.20.1 (Apple Git-117)