From patchwork Sun Jan 24 17:39:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: itd X-Patchwork-Id: 26616 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 6A5D027BC1B; Sun, 24 Jan 2021 19:01:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,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 92E5C27BC1A for ; Sun, 24 Jan 2021 19:01:29 +0000 (GMT) Received: from localhost ([::1]:56518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l3kdc-0000oj-P6 for patchwork@mira.cbaines.net; Sun, 24 Jan 2021 14:01:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l3kAB-00028w-PY for guix-patches@gnu.org; Sun, 24 Jan 2021 13:31:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53916) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l3kAA-00082q-UL for guix-patches@gnu.org; Sun, 24 Jan 2021 13:31:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l3kAA-0001Es-Rq for guix-patches@gnu.org; Sun, 24 Jan 2021 13:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46083] [PATCH] gnu: ghc-8.8: Update to 8.8.4. Resent-From: itd Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 24 Jan 2021 18:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46083 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46083@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16115130154688 (code B ref -1); Sun, 24 Jan 2021 18:31:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Jan 2021 18:30:15 +0000 Received: from localhost ([127.0.0.1]:37228 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l3k9O-0001DS-9Z for submit@debbugs.gnu.org; Sun, 24 Jan 2021 13:30:15 -0500 Received: from lists.gnu.org ([209.51.188.17]:36494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l3jML-0006Dc-Ak for submit@debbugs.gnu.org; Sun, 24 Jan 2021 12:39:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42954) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l3jMK-0001Wp-1F for guix-patches@gnu.org; Sun, 24 Jan 2021 12:39:33 -0500 Received: from mail-out2.in.tum.de ([131.159.0.36]:53791 helo=mail-out2.informatik.tu-muenchen.de) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l3jMH-0000lo-Gx for guix-patches@gnu.org; Sun, 24 Jan 2021 12:39:31 -0500 Received: from amnesix.net.in.tum.de (amnesix.net.in.tum.de [131.159.20.238]) by mail.net.in.tum.de (Postfix) with ESMTP id 3A4FA2926827; Sun, 24 Jan 2021 18:39:11 +0100 (CET) From: itd Date: Sun, 24 Jan 2021 18:39:10 +0100 Message-ID: <87k0s2grpd.fsf@localhost> MIME-Version: 1.0 Received-SPF: none client-ip=131.159.0.36; envelope-from=itd@net.in.tum.de; helo=mail-out2.informatik.tu-muenchen.de X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sun, 24 Jan 2021 13:30:12 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sun, 24 Jan 2021 13:59:57 -0500 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/patches/ghc-hsc2hs-default-compiler.patch: New file. * gnu/packages/haskell.scm (ghc-8.8): Update to 8.8.4 [source]: Add new patch. --- Hi, please consider updating ghc-8.8 to version 8.8.4. Below a possible patch for that. Feedback appreciated. Without the new patch some tests failed with output "Can't find cc": > Unexpected failures: > ffi/should_run/Capi_Ctype_001.run Capi_Ctype_001 [bad exit code] (normal) > ffi/should_run/Capi_Ctype_002.run Capi_Ctype_002 [bad exit code] (normal) > hsc2hs/hsc2hs001.run hsc2hs001 [bad exit code] (normal) > hsc2hs/hsc2hs002.run hsc2hs002 [bad exit code] (normal) > hsc2hs/hsc2hs003.run hsc2hs003 [bad exit code] (normal) > hsc2hs/hsc2hs004.run hsc2hs004 [bad exit code] (normal) > hsc2hs/T3837.run T3837 [bad exit code] (normal) > hsc2hs/T4340.run T4340 [bad exit code] (normal) > hsc2hs/T10272.run T10272 [bad exit code] (normal) > hsc2hs/T11004.run T11004 [bad exit code] (normal) > hsc2hs/T12504.run T12504 [bad exit code] (normal) > hsc2hs/T15758.run T15758 [bad exit code] (normal) > libraries/base/tests/IO/T12010/T12010.run T12010 [bad exit code] (threaded1) Thanks. Best regards itd gnu/packages/haskell.scm | 7 ++++--- .../patches/ghc-hsc2hs-default-compiler.patch | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/ghc-hsc2hs-default-compiler.patch diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 09732fc594..494acbf88a 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -613,14 +613,15 @@ interactive environment for the functional language Haskell.") (define-public ghc-8.8 (package (inherit ghc-8.6) (name "ghc") - (version "8.8.3") + (version "8.8.4") (source (origin (method url-fetch) (uri (string-append "https://www.haskell.org/ghc/dist/" version "/ghc-" version "-src.tar.xz")) + (patches (search-patches "ghc-hsc2hs-default-compiler.patch")) (sha256 - (base32 "128g932i3wix6ic03v04nh5755vyjiidzri9iybwad72yfmc1p70")))) + (base32 "0bgwbxxvdn56l91bp9p5d083gzcfdi6z8l8b17qzjpr3n8w5wl7h")))) (native-inputs `(("ghc-bootstrap" ,ghc-8.6) ("ghc-testsuite" @@ -632,7 +633,7 @@ interactive environment for the functional language Haskell.") (patches (search-patches "ghc-testsuite-dlopen-pie.patch")) (sha256 (base32 - "1l32mp94ll72skfsq1g2fqax4bkiw8b85gr3wd0bbqsqyi9a9jpr")))) + "0c55pj2820q26rikhpf636sn4mjgqsxjrl94vsywrh79dxp3k14z")))) ("git" ,git) ; invoked during tests ,@(filter (match-lambda (("ghc-bootstrap" . _) #f) diff --git a/gnu/packages/patches/ghc-hsc2hs-default-compiler.patch b/gnu/packages/patches/ghc-hsc2hs-default-compiler.patch new file mode 100644 index 0000000000..72f9049463 --- /dev/null +++ b/gnu/packages/patches/ghc-hsc2hs-default-compiler.patch @@ -0,0 +1,15 @@ +GCC does not provide "cc" on guix. Hence, look for "gcc" instead. + +diff --git a/utils/hsc2hs/Common.hs b/utils/hsc2hs/Common.hs +index 50471b1..c8bd297 100644 +--- a/utils/hsc2hs/Common.hs ++++ b/utils/hsc2hs/Common.hs +@@ -20,7 +20,7 @@ die :: String -> IO a + die s = hPutStr stderr s >> exitWith (ExitFailure 1) + + default_compiler :: String +-default_compiler = "cc" ++default_compiler = "gcc" + + ------------------------------------------------------------------------ + -- Write the output files.