From patchwork Mon Sep 13 14:24:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lars-Dominik Braun X-Patchwork-Id: 32815 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 332C727BBE3; Mon, 13 Sep 2021 15:49:44 +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_H2,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 A35CE27BBE1 for ; Mon, 13 Sep 2021 15:49:43 +0100 (BST) Received: from localhost ([::1]:48682 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPnHC-00004q-N7 for patchwork@mira.cbaines.net; Mon, 13 Sep 2021 10:49:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51114) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPmtK-0005Kf-Bi for guix-patches@gnu.org; Mon, 13 Sep 2021 10:25:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35006) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mPmtK-0007ji-3S for guix-patches@gnu.org; Mon, 13 Sep 2021 10:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mPmtJ-0008WK-Vy for guix-patches@gnu.org; Mon, 13 Sep 2021 10:25:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49606] [PATCH wip-haskell v2] gnu: Add ghc-8.10. Resent-From: Lars-Dominik Braun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 13 Sep 2021 14:25:01 +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: Xinglu Chen Cc: 49606@debbugs.gnu.org, Ricardo Wurmus , Sarah Morgensen , John Kehayias Received: via spool by 49606-submit@debbugs.gnu.org id=B49606.163154309832739 (code B ref 49606); Mon, 13 Sep 2021 14:25:01 +0000 Received: (at 49606) by debbugs.gnu.org; 13 Sep 2021 14:24:58 +0000 Received: from localhost ([127.0.0.1]:46552 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mPmtB-0008Vu-Br for submit@debbugs.gnu.org; Mon, 13 Sep 2021 10:24:58 -0400 Received: from mout-p-101.mailbox.org ([80.241.56.151]:45588) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mPmt9-0008Vh-2i for 49606@debbugs.gnu.org; Mon, 13 Sep 2021 10:24:52 -0400 Received: from smtp202.mailbox.org (smtp202.mailbox.org [80.241.60.245]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4H7TJX5TSbzQk34; Mon, 13 Sep 2021 16:24:44 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1631543082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Yn+rIsnZuCQbh86eFOmTqCK9Mhey+i6AD45utPauNuE=; b=B9BQ4QnYq1kJSFH6cF83ERVdLiKZOoFD7+0XXwn/BIhLg448a51tkPXgTmD2D4KkULx9kT jAQqKwqwWevhNhtBL2G03RTiVpMIaWySeBfX0DDuPoXJAI0TMe53jRtvA3Lq8z7A7ebi39 pkqohsMyDayyv94NOvnEeQLf36TC66T9Sfh+BeuOZAhbbDprlYq0RmDOAwF4/qEDsEEFN4 e+CG2UL2yZ0SPhbgaZhDahM4y9KGpIt7FTI8DiJTUxEdw1wiuNWy5RG+vvP8hLXeBYsFba XRcZVm5SWW92qOGBexwjHeIqFEXwVnVZ/axy3q4oAw46znOlHKFo5KTY9V8ALw== Date: Mon, 13 Sep 2021 16:24:37 +0200 From: Lars-Dominik Braun Message-ID: References: <039023c844a5fa57c050bab868677dabd08b1bb0.1626535972.git.public@yoctocell.xyz> <50732186fb1a7b17d2d44d172957ba145607debf.1627682631.git.public@yoctocell.xyz> <875ywbhspt.fsf@yoctocell.xyz> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <875ywbhspt.fsf@yoctocell.xyz> X-Rspamd-Queue-Id: 12BE55BE 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 Hi, > Any comments/thoughts on this, anyone? I looked at the patch and would like to propose minor modifications. In particular I - removed the 'fix-cc-name phase, which is inherited from ghc-8.8 anyway - converted the failing test (which I can’t get to pass either) into an expected failure instead of nulling it out and - renamed the package to ghc-next, which should avoid https://issues.guix.gnu.org/47335 – if we also rename GHC 8.8 in a different patch. I think we can merge this patch to master, since it only adds a new GHC version and has no further implications. Thoughts? Cheers, Lars diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 3d10bdc946..ca0498e6d9 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -21,6 +21,7 @@ ;;; Copyright © 2019 Jacob MacDonald ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2021 Matthew James Kraai +;;; Copyright © 2021 Xinglu Chen ;;; ;;; This file is part of GNU Guix. ;;; @@ -663,6 +664,60 @@ 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-next") + (version "8.10.7") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.haskell.org/ghc/dist/" + version "/ghc-" version "-src.tar.xz")) + (sha256 + (base32 "179ws2q0dinl1a39wm9j37xzwm84zfz3c5543vz8v479khigdvp3")))) + (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 + "1zl25gg6bpx5601k8h3cqnns1xfc0nqgwnh8jvn2s65ra3f2g1nz")))) + ("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-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")))))) + ;; Mark failing tests as broken. Reason for failure is unknown. + (add-after 'skip-more-tests 'skip-even-more-tests + (lambda _ + (substitute* '("testsuite/tests/driver/T16521/all.T") + (("extra_files" all) (string-append "[" all)) + (("\\]\\), " all) + (string-append all "expect_broken(0)], "))))))))) + (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)