From patchwork Thu Oct 31 12:47:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 69701 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 7880C27BBEA; Thu, 31 Oct 2024 12:54:16 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 0C58C27BBE2 for ; Thu, 31 Oct 2024 12:54:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t6Ug3-0003Gm-6e; Thu, 31 Oct 2024 08:53:27 -0400 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 1t6Ufp-0002vX-AG for guix-patches@gnu.org; Thu, 31 Oct 2024 08:53:15 -0400 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 1t6Ufp-00023W-16 for guix-patches@gnu.org; Thu, 31 Oct 2024 08:53:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=lKjSi7r2wUJpIMpoLAUC8bhrki1GXsTh6wGP4gc2c3I=; b=JceuGw2u7CKAKOX9q5iFBWK9YG2Bzq5/Wo7TnK8XR2P0ZN4C0me1M7a6CYVZIMNf+Srn3M+rgX5XgYlSno0BbwLZ7swNL2/VtymZbodU1zq3Eoe3iAwO+QQ1wFJ8Zt7drlHdC/5xviKxDCqIRf7fEWujv+2BuZIoCEgCoyt+a5BdG8mCdwe7MMK+x2hPtMf+7WpHXRc0lCmkzgujftf/nG3QIztgLTkgdqYZfGsnBMQgqORDocF22o8mVAZvZjtgo7Ve0TffzT6PNv9z5B0DgU7/qhZ9gh6UXtT5AKJAOTa08wk6maZrw5GPpjrnAfS4zIHaO+kHvulj+s5SJQS5Xw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t6Ufo-0007vE-RH for guix-patches@gnu.org; Thu, 31 Oct 2024 08:53:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#67921] [PATCH v3 22/24] gnu: Add hadrian-for-ghc-9.6 Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 31 Oct 2024 12:53:12 +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: dev@jpoiret.xyz, lars@6xq.net, saku@laesvuori.fi Received: via spool by 67921-submit@debbugs.gnu.org id=B67921.173037917230297 (code B ref 67921); Thu, 31 Oct 2024 12:53:12 +0000 Received: (at 67921) by debbugs.gnu.org; 31 Oct 2024 12:52:52 +0000 Received: from localhost ([127.0.0.1]:41966 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6UfT-0007sS-G2 for submit@debbugs.gnu.org; Thu, 31 Oct 2024 08:52:51 -0400 Received: from 4.mo575.mail-out.ovh.net ([46.105.59.63]:46441) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6UfP-0007r4-7Y for 67921@debbugs.gnu.org; Thu, 31 Oct 2024 08:52:48 -0400 Received: from director5.ghost.mail-out.ovh.net (unknown [10.108.9.56]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 4XfP6Q0Tkgz1rMR for <67921@debbugs.gnu.org>; Thu, 31 Oct 2024 12:52:46 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-chfd5 (unknown [10.111.182.36]) by director5.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 8E9B91FDD5; Thu, 31 Oct 2024 12:52:45 +0000 (UTC) Received: from ngraves.fr ([37.59.142.97]) by ghost-submission-5b5ff79f4f-chfd5 with ESMTPSA id f65qLZx9I2fA2AAAw+/Q5Q (envelope-from ); Thu, 31 Oct 2024 12:52:45 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-97G00231a0f400-4fe6-4310-87db-7244d0835463, CD33DFF0435C6B52A7C438D6B876B70D33D893A4) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 80.214.74.119 Date: Thu, 31 Oct 2024 13:47:01 +0100 Message-ID: <20241031125127.14080-23-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241031125127.14080-1-ngraves@ngraves.fr> References: <20241031125127.14080-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 9051672303657542182 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdekhedggeefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnheptdegkefhteekgfefleehleeggfdufeejteehveelfeejjeelleevudehheevkeefnecuffhomhgrihhnpehhrghskhgvlhhlrdhorhhgnecukfhppeduvdejrddtrddtrddupdektddrvddugedrjeegrdduudelpdefjedrheelrddugedvrdeljeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieejledvudesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejhedpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=lKjSi7r2wUJpIMpoLAUC8bhrki1GXsTh6wGP4gc2c3I=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1730379166; v=1; b=mHHYM2/Cb9wpu9ZE80hbphJk5b3E5vLrxaYtCZLUGGj2Hui8r+U5xy4qgoMN2EQJkfw4Oscl YuDfyBslEdcrDYkyJd50Fk45jGIQ6bPV6jKP1a8/Nz7lZ49BdgeSNbCnm+HkMVIPunHQefyfeYW OJiKUWZdw2hnj3ZLgCa4HfHu6ZDlMxXzItnHPMX5bGms3jO/sj7yW+a4ONorxoJGPvD6ASdrDbk WRwz4Jk2otlU5oxTD5m3OjLv5JjmEzl8D9XLnTEllSiEMBxxpa6DfIlwJ5v0hh13M0njknzusmv LPgQ5waQX8gYG4Td4vzQ2JcckeYC/RyBgtGYoo1Bcg2TQ== 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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 From: Saku Laesvuori * gnu/packages/haskell.scm (hadrian-for-ghc-9.6): New variable. Change-Id: I4205c888afa7b03b4b1622a3af7d1d538fa5c9b1 --- gnu/packages/haskell.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 4bd1ef150b..256fe84c89 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2121,4 +2121,44 @@ (define ghc-primitive-bootstrap-for-9.6 "This package provides various primitive memory-related operations.") (license license:bsd-3))) +(define hadrian-for-ghc-9.6 + (package + (name "hadrian") + (version "9.6.4") + (source (origin + (method url-fetch) + (uri (string-append "https://www.haskell.org/ghc/dist/" version + "/ghc-" version "-src.tar.xz")) + (sha256 + (base32 + "1h6lpx8kd4xycjwb8iv2rgnz23kwq5b0qp4bhvczsx3in2w2bgqh")))) + (build-system haskell-build-system) + (inputs + (list ghc-base16-bytestring-bootstrap-for-9.6 + ghc-cryptohash-sha256-bootstrap-for-9.6 + ghc-extra-bootstrap-for-9.6 + ghc-shake-bootstrap-for-9.6 + ghc-unordered-containers-bootstrap-for-9.6 + bash-minimal)) + (arguments + (list #:configure-flags ''("--flags=-selftest") + #:tests? #f + #:haskell ghc-bootstrap-for-9.6 + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'cd-to-hadrian + (lambda _ + (chdir "hadrian"))) + (add-after 'cd-to-hadrian 'fix-shell-wrappers + (lambda _ + (substitute* + "src/Rules/Test.hs" + (("\"#!/bin/sh\"") + (format #f "\"#!~a/bin/sh\"" #$(this-package-input "bash-minimal"))))))))) + (home-page "https://gitlab.haskell.org/ghc/ghc/-/tree/master/hadrian") + (synopsis "Build system for the Glasgow Haskell Compiler (@code{ghc})") + (description "Hadrian is the build system for the Glasgow Haskell Compiler. +It is based on the Shake library and replaces @{make} in building GHC") + (license license:expat))) + ;;; haskell.scm ends here