From unknown Tue Jun 17 22:28:19 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#49542] [PATCH] gnu: ghc-8.8: Update to 8.8.4. Resent-From: Matthew James Kraai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 13 Jul 2021 12:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49542 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49542@debbugs.gnu.org Cc: Matthew James Kraai X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162617818919677 (code B ref -1); Tue, 13 Jul 2021 12:10:01 +0000 Received: (at submit) by debbugs.gnu.org; 13 Jul 2021 12:09:49 +0000 Received: from localhost ([127.0.0.1]:39635 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3HEQ-00057G-E2 for submit@debbugs.gnu.org; Tue, 13 Jul 2021 08:09:49 -0400 Received: from lists.gnu.org ([209.51.188.17]:56356) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3HEO-000578-Ey for submit@debbugs.gnu.org; Tue, 13 Jul 2021 08:09:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35126) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3HEO-000589-8c for guix-patches@gnu.org; Tue, 13 Jul 2021 08:09:44 -0400 Received: from mail.ftbfs.org ([52.8.68.13]:41962 helo=aws.ftbfs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3HEM-0003gt-Mv for guix-patches@gnu.org; Tue, 13 Jul 2021 08:09:44 -0400 Received: from ip68-228-72-85.oc.oc.cox.net ([68.228.72.85] helo=localhost.localdomain) by aws.ftbfs.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1m3HEJ-0002bj-Ge; Tue, 13 Jul 2021 12:09:40 +0000 From: Matthew James Kraai Date: Tue, 13 Jul 2021 05:09:37 -0700 Message-Id: <20210713120937.14216-1-kraai@ftbfs.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No (score -1.0): ALL_TRUSTED=-1 Received-SPF: pass client-ip=52.8.68.13; envelope-from=kraai@ftbfs.org; helo=aws.ftbfs.org X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) * gnu/packages/haskell.scm (ghc-8.8): Update to 8.8.4. [arguments]: Add 'fix-cc-reference phase. --- gnu/packages/haskell.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 09732fc594..3d10bdc946 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 Matthew James Kraai ;;; ;;; This file is part of GNU Guix. ;;; @@ -613,14 +614,14 @@ 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")) (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) @@ -643,6 +644,11 @@ interactive environment for the functional language Haskell.") (substitute-keyword-arguments (package-arguments ghc-8.6) ((#:phases phases '%standard-phases) `(modify-phases ,phases + (add-after 'fix-references 'fix-cc-reference + (lambda _ + (substitute* "utils/hsc2hs/Common.hs" + (("\"cc\"") "\"gcc\"")) + #t)) (add-after 'unpack-testsuite 'skip-more-tests (lambda _ ;; XXX: This test fails because our ld-wrapper script -- 2.32.0 From unknown Tue Jun 17 22:28:19 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Matthew James Kraai Subject: bug#49542: closed (Re: bug#49542: [PATCH] gnu: ghc-8.8: Update to 8.8.4.) Message-ID: References: <87mtq96kj7.fsf@gnu.org> <20210713120937.14216-1-kraai@ftbfs.org> X-Gnu-PR-Message: they-closed 49542 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 49542@debbugs.gnu.org Date: Mon, 26 Jul 2021 17:41:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1627321262-4800-1" This is a multi-part message in MIME format... ------------=_1627321262-4800-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #49542: [PATCH] gnu: ghc-8.8: Update to 8.8.4. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 49542@debbugs.gnu.org. --=20 49542: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D49542 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1627321262-4800-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 49542-done) by debbugs.gnu.org; 26 Jul 2021 17:40:38 +0000 Received: from localhost ([127.0.0.1]:51449 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m84aj-0001EH-VV for submit@debbugs.gnu.org; Mon, 26 Jul 2021 13:40:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:56312) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m84ah-0001E2-MI for 49542-done@debbugs.gnu.org; Mon, 26 Jul 2021 13:40:36 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:49142) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m84ac-0007pd-7Q; Mon, 26 Jul 2021 13:40:30 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=45312 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m84ab-0006sR-SB; Mon, 26 Jul 2021 13:40:30 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Matthew James Kraai Subject: Re: bug#49542: [PATCH] gnu: ghc-8.8: Update to 8.8.4. References: <20210713120937.14216-1-kraai@ftbfs.org> Date: Mon, 26 Jul 2021 19:40:28 +0200 In-Reply-To: <20210713120937.14216-1-kraai@ftbfs.org> (Matthew James Kraai's message of "Tue, 13 Jul 2021 05:09:37 -0700") Message-ID: <87mtq96kj7.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 49542-done Cc: 49542-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Matthew James Kraai skribis: > * gnu/packages/haskell.scm (ghc-8.8): Update to 8.8.4. > [arguments]: Add 'fix-cc-reference phase. Applied, thanks! Ludo=E2=80=99. ------------=_1627321262-4800-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 13 Jul 2021 12:09:49 +0000 Received: from localhost ([127.0.0.1]:39635 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3HEQ-00057G-E2 for submit@debbugs.gnu.org; Tue, 13 Jul 2021 08:09:49 -0400 Received: from lists.gnu.org ([209.51.188.17]:56356) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3HEO-000578-Ey for submit@debbugs.gnu.org; Tue, 13 Jul 2021 08:09:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35126) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3HEO-000589-8c for guix-patches@gnu.org; Tue, 13 Jul 2021 08:09:44 -0400 Received: from mail.ftbfs.org ([52.8.68.13]:41962 helo=aws.ftbfs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3HEM-0003gt-Mv for guix-patches@gnu.org; Tue, 13 Jul 2021 08:09:44 -0400 Received: from ip68-228-72-85.oc.oc.cox.net ([68.228.72.85] helo=localhost.localdomain) by aws.ftbfs.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1m3HEJ-0002bj-Ge; Tue, 13 Jul 2021 12:09:40 +0000 From: Matthew James Kraai To: guix-patches@gnu.org Subject: [PATCH] gnu: ghc-8.8: Update to 8.8.4. Date: Tue, 13 Jul 2021 05:09:37 -0700 Message-Id: <20210713120937.14216-1-kraai@ftbfs.org> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No (score -1.0): ALL_TRUSTED=-1 Received-SPF: pass client-ip=52.8.68.13; envelope-from=kraai@ftbfs.org; helo=aws.ftbfs.org X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit Cc: Matthew James Kraai X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) * gnu/packages/haskell.scm (ghc-8.8): Update to 8.8.4. [arguments]: Add 'fix-cc-reference phase. --- gnu/packages/haskell.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 09732fc594..3d10bdc946 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 Matthew James Kraai ;;; ;;; This file is part of GNU Guix. ;;; @@ -613,14 +614,14 @@ 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")) (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) @@ -643,6 +644,11 @@ interactive environment for the functional language Haskell.") (substitute-keyword-arguments (package-arguments ghc-8.6) ((#:phases phases '%standard-phases) `(modify-phases ,phases + (add-after 'fix-references 'fix-cc-reference + (lambda _ + (substitute* "utils/hsc2hs/Common.hs" + (("\"cc\"") "\"gcc\"")) + #t)) (add-after 'unpack-testsuite 'skip-more-tests (lambda _ ;; XXX: This test fails because our ld-wrapper script -- 2.32.0 ------------=_1627321262-4800-1--