From patchwork Thu Feb 15 08:50:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 60352 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 2C26B27BBEB; Thu, 15 Feb 2024 08:53: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 E0A1E27BBE9 for ; Thu, 15 Feb 2024 08:53:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raXTG-0000VS-26; Thu, 15 Feb 2024 03:51:54 -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 1raXTE-0000Tk-LT for guix-patches@gnu.org; Thu, 15 Feb 2024 03:51:52 -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 1raXTE-00046J-CZ for guix-patches@gnu.org; Thu, 15 Feb 2024 03:51:52 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1raXTW-0001AO-R7; Thu, 15 Feb 2024 03:52:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67921] [PATCH v2 21/23] gnu: Add hadrian-for-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 08:52:10 +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.17079871054278 (code B ref 67921); Thu, 15 Feb 2024 08:52:10 +0000 Received: (at 67921) by debbugs.gnu.org; 15 Feb 2024 08:51:45 +0000 Received: from localhost ([127.0.0.1]:54042 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raXT7-00016q-14 for submit@debbugs.gnu.org; Thu, 15 Feb 2024 03:51:45 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101]:55062 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raXSZ-000129-Qn for 67921@debbugs.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 0BD58343680; 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=3rF5uasXhUx+jeXQ/TOPMTGmC2EeZ7Z07yUga8N4u6I=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vKp4FV7mMHVlE9OPgeYHh2UZzjmXzG03hUivk64OuR81rh6rkQ0f5lj5bjbYD7bG+ LGiIScqWj7/w8y/W5EOZDfgWz29aXrdHQbruF5n7ZwXjXqlXkFAiSt2p/sj2o0Mm6F ORjrZ0s4g5O99vvyfQMSpyb3kEwN5a3E/m5K/5SY= Date: Thu, 15 Feb 2024 10:50:02 +0200 Message-ID: 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 (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 4127d7d4a7..9e1e659cf1 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -2016,4 +2016,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