From patchwork Thu Feb 15 08:50:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 60339 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 779DC27BBEC; Thu, 15 Feb 2024 08:52:34 +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,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, 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 D028C27BBE9 for ; Thu, 15 Feb 2024 08:52:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raXTH-0000Wc-6d; Thu, 15 Feb 2024 03:51:55 -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 1raXTF-0000VH-JM for guix-patches@gnu.org; Thu, 15 Feb 2024 03:51:53 -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 1raXTF-00046h-AY for guix-patches@gnu.org; Thu, 15 Feb 2024 03:51:53 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1raXTX-0001Ae-Q0; Thu, 15 Feb 2024 03:52:11 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67921] [PATCH v2 23/23] gnu: ghc: Update to version 9.6.4 Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, guix-patches@gnu.org Resent-Date: Thu, 15 Feb 2024 08:52:11 +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-To: guix-patches@gnu.org, 67921@debbugs.gnu.org X-Debbugs-Original-Xcc: Lars-Dominik Braun Received: via spool by 67921-submit@debbugs.gnu.org id=B67921.17079871064292 (code B ref 67921); Thu, 15 Feb 2024 08:52:11 +0000 Received: (at 67921) by debbugs.gnu.org; 15 Feb 2024 08:51:46 +0000 Received: from localhost ([127.0.0.1]:54046 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raXT8-000174-1k for submit@debbugs.gnu.org; Thu, 15 Feb 2024 03:51:46 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101]:55060 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raXSa-000122-RD for 67921@debbugs.gnu.org; Thu, 15 Feb 2024 03:51:13 -0500 Received: from X-kone.org.aalto.fi (unknown [130.233.144.187]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 07E29343682; Thu, 15 Feb 2024 09:51:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1707987092; bh=T1qfTsfi4bfI9Xk3tT9sJyMg23oNIm0VoxLuJ61mwmo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=T4G818orhwkCXRnqS3MIOHTu9PmPxjLPKKPuKFbdr9+I+b1hOCMwbqHnT9gb9xThF Mtdq5Hc12dJV6pE8oULAGxA5jeQl+B9Ev8HoNI6Yd4geTfx7kzCDH9aWl1jOev0mHT VH9Il9fNYEuX4saFoyKMlNCKSHLK3bulndWxMAIU= Date: Thu, 15 Feb 2024 10:50:04 +0200 Message-ID: <64d0be34c74b765c544e16a1f9115a774357f183.1707827100.git.saku@laesvuori.fi> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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): Update to ghc-9.6 Change-Id: I40da6cacc4d260902cd66d7d626375038fba4346 --- gnu/packages/haskell.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index e316fc860e..3944d8f15f 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1393,12 +1393,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) @@ -1462,7 +1456,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) @@ -2061,7 +2055,7 @@ (define-public ghc-9.6 (let ((base ghc-9.4)) (package (inherit base) - (name "ghc-next") + (name "ghc") (version "9.6.4") (source (origin (inherit (package-source base)) @@ -2162,4 +2156,10 @@ (define-public ghc-9.6 (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.6) + ;;; haskell.scm ends here