From patchwork Fri Jul 30 22:12:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 31665 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 E9E9327BC78; Fri, 30 Jul 2021 23:14:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6F7A227BC6B for ; Fri, 30 Jul 2021 23:14:11 +0100 (BST) Received: from localhost ([::1]:52016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m9ale-0001Pq-IB for patchwork@mira.cbaines.net; Fri, 30 Jul 2021 18:14:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9alW-0001Mq-HI for guix-patches@gnu.org; Fri, 30 Jul 2021 18:14:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49573) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m9alW-0007uu-9V for guix-patches@gnu.org; Fri, 30 Jul 2021 18:14:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m9alW-0002rV-6d for guix-patches@gnu.org; Fri, 30 Jul 2021 18:14:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49606] [PATCH wip-haskell v2] gnu: Add ghc-8.10. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 30 Jul 2021 22:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49606 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49606@debbugs.gnu.org Cc: Ricardo Wurmus , John Kehayias , Sarah Morgensen Received: via spool by 49606-submit@debbugs.gnu.org id=B49606.162768320210945 (code B ref 49606); Fri, 30 Jul 2021 22:14:02 +0000 Received: (at 49606) by debbugs.gnu.org; 30 Jul 2021 22:13:22 +0000 Received: from localhost ([127.0.0.1]:32886 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m9akr-0002qS-Hc for submit@debbugs.gnu.org; Fri, 30 Jul 2021 18:13:21 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:42922 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m9akp-0002q8-6Z for 49606@debbugs.gnu.org; Fri, 30 Jul 2021 18:13:20 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1627683189; bh=qDqfPX/LPMPUurvsKu7TV8IAX+OA3LYczkBlXwMcNfU=; h=From:To:Cc:Subject:In-Reply-To:References:Date; b=PJT1sRoGwIrlJnHAcU+Dj2SBS5sOq9u4iIk4bBPrCL4qMzDWdFbdp9ks+i24H+Rdo cKG15sW+gI8SaZ8Z6rE2VBpb1f/ic9E5I8zTexi1M5wsX6+TCiMyA6frG5CHZ39J2M bvYbJ0rhyKMJAjuGO2QaaX5rduL7d5eN4DOXyy0A= In-Reply-To: <039023c844a5fa57c050bab868677dabd08b1bb0.1626535972.git.public@yoctocell.xyz> References: <039023c844a5fa57c050bab868677dabd08b1bb0.1626535972.git.public@yoctocell.xyz> Message-Id: <50732186fb1a7b17d2d44d172957ba145607debf.1627682631.git.public@yoctocell.xyz> Date: Sat, 31 Jul 2021 00:12:44 +0200 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/haskell.scm (ghc-8.10): New variable. --- Changes since v1: * Fix /bin/sh path in one of the tests. Unfortunately, I haven’t been able to fix the T16521 test; I tried setting the C_INCLUDE_PATH variable to ‘libraries/process/include’, but it’s still not able to find ’processFlags.h’. Not sure if there is anything else I could try. Would it be OK to merge this despite the failing test? Also, this patch should go to the ‘wip-haskell’ branch; once/if it gets merged it would be a good idea to update the Stackage LTS release and update all the Haskell packages. gnu/packages/haskell.scm | 59 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) base-commit: f2470e9a4bcd47d526e14721bbd2693fb979d306 diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 09732fc594..089ea7ceb0 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2019 Robert Vollmert ;;; Copyright © 2019 Jacob MacDonald ;;; Copyright © 2020 Marius Bakke +;;; Copyright © 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -657,6 +658,64 @@ interactive environment for the functional language Haskell.") (file-pattern ".*\\.conf\\.d$") (file-type 'directory)))))) +(define-public ghc-8.10 + (package + (inherit ghc-8.8) + (name "ghc") + (version "8.10.5") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.haskell.org/ghc/dist/" + version "/ghc-" version "-src.tar.xz")) + (sha256 + (base32 "0vq7wch0wfvy2b5dbi308lq5225vf691n95m19c9igagdvql22gi")))) + (native-inputs + `(("ghc-bootstrap" ,ghc-8.8) + ("ghc-testsuite" + ,(origin + (method url-fetch) + (uri (string-append + "https://www.haskell.org/ghc/dist/" + version "/ghc-" version "-testsuite.tar.xz")) + (patches (search-patches "ghc-testsuite-dlopen-pie.patch")) + (sha256 + (base32 + "0vcq774rfb6q8vsnh7p5clxp2qaz8ip6d2bm2ghbq53n8jl296d6")))) + ("git" ,git-minimal) ; invoked during tests + ,@(filter (match-lambda + (("ghc-bootstrap" . _) #f) + (("ghc-testsuite" . _) #f) + (_ #t)) + (package-native-inputs ghc-8.8)))) + (arguments + (substitute-keyword-arguments (package-arguments ghc-8.8) + ((#:phases phases '%standard-phases) + `(modify-phases ,phases + (add-after 'unpack 'fix-cc-name + (lambda _ + (substitute* "utils/hsc2hs/Common.hs" + (("\"cc\"") "\"gcc\"")))) + (add-after 'unpack-testsuite 'patch-more-shebangs + (lambda* (#:key inputs #:allow-other-keys) + (let ((bash (assoc-ref inputs "bash"))) + (substitute* '("testsuite/tests/driver/T8602/T8602.script") + (("/bin/sh") + (string-append bash "/bin/sh")))))) + (add-after 'skip-more-tests 'skip-even-more-tests + (lambda _ + ;; FIXME: It is unable to find some C header files; + ;; setting C_INCLUDE_PATH doesn't help either. + (substitute* '("testsuite/tests/driver/T16521/all.T") + (("^.*" all) + (string-append "# guix skipped: " all))))))))) + (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)))))) + (define-public ghc-8 ghc-8.6) (define-public ghc ghc-8)