From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id IDv+LY8CzmX4OQEAqHPOHw:P1 (envelope-from ) for ; Thu, 15 Feb 2024 13:24:47 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id IDv+LY8CzmX4OQEAqHPOHw (envelope-from ) for ; Thu, 15 Feb 2024 13:24:47 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=laesvuori.fi header.s=mail header.b=qpWDeAbd; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1707999887; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=0Pq9DaBrtu4gIoq3lnkgL9Qd9wW/ldC/DL/528xUt5g=; b=aT/1twT81otWRMeCKEWuw0y5yUKOQgOGZlE8NV3IosGnSbocfy1O/vZY6c1R0YB+3uiRXL LyqBaSwPrSoWWEY+5v1X3QQ+6ufl5lKTR/RjGhqEKcuTpBKXuHwxQvxpSqzXHxuWnDiI4e uTeWMTVzx6QKpogBU1oMH/TKb0NUITCGVgGjWO69V1Tnx4OcilHLS10vpXgHtheFcfeyHP YDrgqwXb9ctQrokFG2pIUYipKkycbFj3/qJvh52bzUcQ0a5VCQzZJdE+jo6BU+hdhzIxy4 mDXD5qSF/7Gz5P1a0LcrqedQq7TSUseW7La3qAjuki1kpcVmyPpo2REfuGLwIQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=laesvuori.fi header.s=mail header.b=qpWDeAbd; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1707999887; a=rsa-sha256; cv=none; b=BxMsB9yiGwbVdxSRoz8XM7bjlROVr2+N3oqvv6j5DkRnLZtsXT/bystLoOmO+wGBl4KmIU JxnZqXh7b28Jql8Wb01J5sv4+P+0jZtapSZ39o2b0Hz3TDvXl50Wo/uRghbujhl3WvHtzA PcE0CkAV+wiFS8MKt49437HfrB9BdWl6Wav9ZMMYgQL7nl6hBo7IB4EuJhm40GKgO+/2JY NbrUXWCPwoxHSZU28CwQEOShUsd6PvBlsrlgmjSw3yL7LoSm4ZyOq3gvPH68UUFek1il3Q rGE0hAffVKpiP2lR4fjhxCKteDToVOkfZfWQ+NoAtfx5wsUii5J8q1EcEceLCg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 946EB60A22 for ; Thu, 15 Feb 2024 13:24:47 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raamn-0002DT-5u; Thu, 15 Feb 2024 07:24:18 -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 1raaml-0002Cd-Om for guix-patches@gnu.org; Thu, 15 Feb 2024 07:24:15 -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 1raaml-0006Fs-6U for guix-patches@gnu.org; Thu, 15 Feb 2024 07:24:15 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1raan3-0001fW-Fr; Thu, 15 Feb 2024 07:24:33 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69159] [PATCH v2 22/23] gnu: Add ghc-9.6 Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, guix-patches@gnu.org Resent-Date: Thu, 15 Feb 2024 12:24:33 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69159 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69159@debbugs.gnu.org, 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 submit@debbugs.gnu.org id=B.17079998256026 (code B ref -1); Thu, 15 Feb 2024 12:24:33 +0000 Received: (at submit) by debbugs.gnu.org; 15 Feb 2024 12:23:45 +0000 Received: from localhost ([127.0.0.1]:54449 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raamG-0001Z2-At for submit@debbugs.gnu.org; Thu, 15 Feb 2024 07:23:44 -0500 Received: from lists.gnu.org ([209.51.188.17]:42358) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raaNv-0006TL-No for submit@debbugs.gnu.org; Thu, 15 Feb 2024 06:58:36 -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 1raXSa-0000GY-QR for guix-patches@gnu.org; Thu, 15 Feb 2024 03:51:12 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101] helo=mail.laesvuori.fi) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1raXSZ-0003rG-3J for guix-patches@gnu.org; Thu, 15 Feb 2024 03:51:12 -0500 Received: from X-kone.org.aalto.fi (unknown [130.233.144.187]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 75DEB343681; 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=1707987091; bh=8McD71PgWAmFv796ocCVx7tsA3u18Rw5tyFELJ25lxk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=qpWDeAbd4NZ6qaCnNdhTuOA7M/BbahX8uAmbZ4bbhIq0yPXWsyZWiVVylvGxLBm3r hjJRypfuOYTHdzZhw3mhI1V/bQ4Kb8a01w6697FWlWCet2Kbvgpq1TlOjRhmiLPLQM GmVoNifdnoxvALsZoqmBvgY8cmI6oytsQRvK5P9w= Date: Thu, 15 Feb 2024 10:50:03 +0200 Message-ID: <073e883857858856f28e19843adbef915ab9df60.1707827100.git.saku@laesvuori.fi> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=75.119.130.101; envelope-from=saku@laesvuori.fi; helo=mail.laesvuori.fi X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 From: Saku Laesvuori via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -6.68 X-Spam-Score: -6.68 X-Migadu-Queue-Id: 946EB60A22 X-TUID: y6PnI11XDhvQ Message-ID: <20240215085003.D_pG3VAN5u4DwgBtExKFXzFgaOeXA6y2UAdhYQ-UMJ8@z> * gnu/packages/haskell.scm (ghc-9.6): New variable. Change-Id: I6883ed973bdd1d6eaf981605c1bc8f855f850187 --- gnu/packages/haskell.scm | 108 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 107 insertions(+), 1 deletion(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 9e1e659cf1..e316fc860e 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -72,7 +72,8 @@ (define-module (gnu packages haskell) #:use-module (guix packages) #:use-module (guix utils) #:use-module (ice-9 match) - #:use-module (ice-9 regex)) + #:use-module (ice-9 regex) + #:use-module (srfi srfi-26)) (define-public cl-yale-haskell (let ((commit "85f94c72a16c5f70301dd8db04cde9de2d7dd270") @@ -2056,4 +2057,109 @@ (define hadrian-for-ghc-9.6 It is based on the Shake library and replaces @{make} in building GHC") (license license:expat))) +(define-public ghc-9.6 + (let ((base ghc-9.4)) + (package + (inherit base) + (name "ghc-next") + (version "9.6.4") + (source (origin + (inherit (package-source base)) + (uri (string-append "https://www.haskell.org/ghc/dist/" version + "/ghc-" version "-src.tar.xz")) + (sha256 + (base32 + "1h6lpx8kd4xycjwb8iv2rgnz23kwq5b0qp4bhvczsx3in2w2bgqh")))) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:make-flags flags ''()) + #~(list "-V" "--docs=no-sphinx")) + ((#:phases phases '%standard-phases) + #~(let* ((run-hadrian (lambda args + (apply invoke "hadrian" args)))) + (modify-phases #$phases + (delete 'fix-shell-wrappers) + ;; https://gitlab.haskell.org/ghc/ghc/-/issues/22557 + (add-before 'build 'fix-iserv-rpath + (lambda _ + (mkdir-p "_build") + (call-with-output-file + "_build/hadrian.settings" + (lambda (port) + (display + (string-append + "*.iserv.ghc.link.opts += -optl-Wl,-rpath," + #$output "/lib/ghc-" #$(package-version this-package) + "/lib/" #$(or (%current-target-system) + (%current-system)) + "-ghc-" #$(package-version this-package) "/") + port))))) + (replace 'build + (lambda* (#:key (parallel-build? #f) (make-flags '()) + #:allow-other-keys) + (apply run-hadrian + `("binary-dist-dir" + ,@(if parallel-build? + `(,(string-append "-j" (number->string (parallel-job-count)))) + '()) + ,@make-flags)))) + (replace 'check + (lambda* (#:key (tests? #t) (parallel-tests? #f) (make-flags '()) #:allow-other-keys) + (if tests? + (apply run-hadrian + `(,@(if parallel-tests? + `(,(string-append "-j" (number->string (parallel-job-count)))) + '()) + ,@make-flags + "test" + "--skip-perf")) + (format #t "test suite not run~%")))) + (replace 'install + (lambda* (#:key (make-flags '()) #:allow-other-keys) + (apply run-hadrian + `("install" + ,@make-flags + ,(string-append "--prefix=" #$output))))) + (add-after 'install 'replace-$pkgroot + (lambda _ + (substitute* + (find-files + (string-append #$output "/lib/ghc-" + #$(package-version this-package) + "/lib/package.conf.d/") + "^.*\\.conf$") + (("\\$\\{pkgroot\\}/") + (string-append #$output "/lib/ghc-" + #$(package-version this-package) + "/lib/")))))))))) + (inputs (list bash-minimal gmp ncurses libffi)) + (native-inputs + `(("perl" ,perl) + ("python" ,python) + ("git" ,git-minimal/pinned) + ("which" ,which) + ("ghostscript" ,ghostscript) + ("autoconf" ,autoconf) + ("automake" ,automake) + + ("hadrian" ,hadrian-for-ghc-9.6) + ("ghc-bootstrap" ,ghc-bootstrap-for-9.6) + ("ghc-alex" ,ghc-alex-bootstrap-for-9.4) + ("ghc-happy" ,ghc-happy-bootstrap-for-9.4) + ("ghc-testsuite" + ,(origin + (method url-fetch) + (uri (string-append + "https://www.haskell.org/ghc/dist/" + version "/ghc-" version "-testsuite.tar.xz")) + (sha256 + (base32 + "0wwd6d68aia2rmlpki30azz0raf98is472cqljhbzzdzpqpjh4vf")))))) + (native-search-paths + (list (search-path-specification + (variable "GHC_PACKAGE_PATH") + (files (list (string-append "lib/ghc-" version))) + (file-pattern ".*\\.conf\\.d$") + (file-type 'directory))))))) + ;;; haskell.scm ends here -- 2.41.0