From patchwork Wed Dec 20 07:13:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 57923 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DEF5127BBEA; Wed, 20 Dec 2023 07:15:40 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5A29427BBE2 for ; Wed, 20 Dec 2023 07:15:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFqnM-0005Od-Hp; Wed, 20 Dec 2023 02:15:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rFqnF-0005LL-C9 for guix-patches@gnu.org; Wed, 20 Dec 2023 02:15:02 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rFqnD-0002gJ-Eg for guix-patches@gnu.org; Wed, 20 Dec 2023 02:15:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rFqnF-0007Nc-R8; Wed, 20 Dec 2023 02:15:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67921] [PATCH haskell-team 2/3] gnu: ghc: Use version 9.4.8 as the default Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, guix-patches@gnu.org Resent-Date: Wed, 20 Dec 2023 07:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67921 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67921@debbugs.gnu.org Cc: Saku Laesvuori , Lars-Dominik Braun X-Debbugs-Original-Xcc: Lars-Dominik Braun Received: via spool by 67921-submit@debbugs.gnu.org id=B67921.170305645228277 (code B ref 67921); Wed, 20 Dec 2023 07:15:01 +0000 Received: (at 67921) by debbugs.gnu.org; 20 Dec 2023 07:14:12 +0000 Received: from localhost ([127.0.0.1]:38505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFqmR-0007M0-Ve for submit@debbugs.gnu.org; Wed, 20 Dec 2023 02:14:12 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101]:34506 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFqmP-0007Ls-NI for 67921@debbugs.gnu.org; Wed, 20 Dec 2023 02:14:10 -0500 Received: from X-kone.org.aalto.fi (unknown [130.233.144.71]) by mail.laesvuori.fi (Postfix) with ESMTPSA id F3DE9342FF8; Wed, 20 Dec 2023 08:14:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1703056453; bh=g1gfZoGqKcop/o0dpKOpUWzX6UBtyOsPjLdt1nWcmZo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WabzRbKqwUrpQ5ZGIzRP1ZzqX7AwY773eEjRh8gWELS+3yZGRQmT3dP33hW8ramgC d0/EMyBuhvYFQ7ZsRxQIj82JZ6OC8gTcN+1EUQNsH+XNCsJLzKq33ntzFnKwNWy6zA XJPGUfaSWYnNK81ze45xNbmZNHS+c0O1vF+zCiz4= Date: Wed, 20 Dec 2023 09:13:48 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <5cdfcf3aadfbe42655b941764d5a700b6d4bca88.1703056111.git.saku@laesvuori.fi> References: <5cdfcf3aadfbe42655b941764d5a700b6d4bca88.1703056111.git.saku@laesvuori.fi> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Saku Laesvuori X-ACL-Warn: , Saku Laesvuori via Guix-patches X-Patchwork-Original-From: Saku Laesvuori via Guix-patches via From: Saku Laesvuori Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/haskell.scm (ghc-9.4): Rename from ghc-next to ghc. (ghc): Redefine as ghc-9.4 instead of ghc-9.2. Change-Id: I5696907ea6e2fac656d21d68c2ac89d549767ec2 --- gnu/packages/haskell.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 88826fb31f..ebe5bc6dc8 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1392,12 +1392,6 @@ (define-public ghc-9.2 (file-pattern ".*\\.conf\\.d$") (file-type 'directory))))))) -;; Versions newer than ghc defined below (i.e. the compiler -;; haskell-build-system uses) should use ghc-next as their name to -;; ensure ghc (without version specification) and ghc-* packages are -;; always compatible. See https://issues.guix.gnu.org/issue/47335. -(define-public ghc ghc-9.2) - ;; 9.4 is the last version to support the make-based build system, ;; but it boot with 9.2, only 9.0 is supported. (define ghc-bootstrap-for-9.4 ghc-9.0) @@ -1461,7 +1455,7 @@ (define-public ghc-9.4 (let ((base ghc-9.2)) (package (inherit base) - (name "ghc-next") + (name "ghc") (version "9.4.8") (source (origin (method url-fetch) @@ -1503,4 +1497,10 @@ (define-public ghc-9.4 (file-pattern ".*\\.conf\\.d$") (file-type 'directory))))))) +;; Versions newer than ghc defined below (i.e. the compiler +;; haskell-build-system uses) should use ghc-next as their name to +;; ensure ghc (without version specification) and ghc-* packages are +;; always compatible. See https://issues.guix.gnu.org/issue/47335. +(define-public ghc ghc-9.4) + ;;; haskell.scm ends here