From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id eDCUHQgCzmUuIQAA62LTzQ:P1 (envelope-from ) for ; Thu, 15 Feb 2024 13:22:32 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id eDCUHQgCzmUuIQAA62LTzQ (envelope-from ) for ; Thu, 15 Feb 2024 13:22:32 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=laesvuori.fi header.s=mail header.b=WgZsBMTO; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1707999752; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=RjzpFu9K1JUVpQDqJIJ17A6EZXIyo9tGgdNno9kmQnA=; b=Nv9/nOdft52WGgn8r2qXuU2EfpsP0QqpjVZ484VoftkomTsLrN0ktj15QpranQVOU/VKEn mx6OVEBVoqyeCb7XFXehF/QxTC9YDJeDkEgd4wvohVDF7Wztcpz4/I5kRdVU0/rp88qqX/ Vr6707+/bf0MBHWy4nAifzaJi9OiUlsTUBlZruqXqX2utGv+cHKP7IgIcE8OeLqwqCQiXI iEacqi1Li8Tzql+ODk1f7RqZR0A/K5i/QNl6sWrTZK6X49KdFrskD3Y7gz8F08V3arRMtj juJtRyDklYUguwPAm8tXJISOfBCjnwkW2J8j9QMoEMWDm1JY1EkASasywtIkLQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=laesvuori.fi header.s=mail header.b=WgZsBMTO; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1707999752; a=rsa-sha256; cv=none; b=Av4LNX7FGSdX6XarM3Ecrm+/bQ0fGWmRjAO7CALGsl6BWnzf2fBix/nak29BLyq/r6ZNtR BQfpTy8LAuFrdze9ZaDTz/eiE78vgOXe6ZsW2gytdRsumt5U2ZQw0Y2j36iwj4gkXzurI+ 5lhAd+5Kkoy0p77ZmENoZhc0eDOuHAPJ8SKcbMQTdfyhBCNYqCylMgpPaN+qYV0ctF6U2N GnNhPWoZrxrMcY9uXdd3Wz6l7l4Ie6ZrGYLsMCVKnQchJCXOVADD9Dw12KroXuA+5zNQ1p sCLhNClGhlcsLqjoOmU/TjDYyglDK3PrTsUjsOAcO/vtXkq61GF93HIwAUcNaw== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id F3F276B1E7 for ; Thu, 15 Feb 2024 13:22:31 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1raakN-0001YL-79; Thu, 15 Feb 2024 07:21:47 -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 1raakL-0001XY-NA for guix-patches@gnu.org; Thu, 15 Feb 2024 07:21:45 -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 1raakL-0005jV-EY for guix-patches@gnu.org; Thu, 15 Feb 2024 07:21:45 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1raake-0001Rs-00; Thu, 15 Feb 2024 07:22:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69144] [PATCH v2 01/23] gnu: ghc-next: Update to version 9.4.8 Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, guix-patches@gnu.org Resent-Date: Thu, 15 Feb 2024 12:22:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69144 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69144@debbugs.gnu.org, 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 submit@debbugs.gnu.org id=B.17079996775437 (code B ref -1); Thu, 15 Feb 2024 12:22:03 +0000 Received: (at submit) by debbugs.gnu.org; 15 Feb 2024 12:21:17 +0000 Received: from localhost ([127.0.0.1]:54385 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raajs-0001PY-60 for submit@debbugs.gnu.org; Thu, 15 Feb 2024 07:21:17 -0500 Received: from lists.gnu.org ([209.51.188.17]:42358) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1raaO7-0006TL-5a for submit@debbugs.gnu.org; Thu, 15 Feb 2024 06:58:48 -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 1raXSA-0008UQ-DA for guix-patches@gnu.org; Thu, 15 Feb 2024 03:50:46 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101] helo=mail.laesvuori.fi) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1raXS8-0003i5-9C for guix-patches@gnu.org; Thu, 15 Feb 2024 03:50:46 -0500 Received: from X-kone.org.aalto.fi (unknown [130.233.144.187]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 41C31342FEF; Thu, 15 Feb 2024 09:51:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1707987080; bh=/cAHoQF4gGeaLKyD2ZL4RdY7KN2YZs4ckv/L/xNIRwc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WgZsBMTOfXj5kn0wK1HADoLkfHlkHDrAUtL6qHHBadj9PfekCkJhJQq0jC6YR7fUJ tIasS3EL+kjKJQyRiH9156WLPoSMLDm6P1mhlPHXi2pQm77jE7LiikNaewOVWGllmu +B+u6jOsPrh9x5K5TmLU8wYV/h7vPws8EUQkIZt0= Date: Thu, 15 Feb 2024 10:49:42 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=75.119.130.101; envelope-from=saku@laesvuori.fi; helo=mail.laesvuori.fi X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 From: Saku Laesvuori via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -6.68 X-Spam-Score: -6.68 X-Migadu-Queue-Id: F3F276B1E7 X-Migadu-Scanner: mx11.migadu.com X-TUID: s8bIRHTcnMSc Message-ID: <20240215084942.b2wvJHSCcdrMEXz23I5L5E4fss-OKoELh-8ReCtbBKQ@z> * gnu/packages/haskell.scm (ghc-9.4): Update to version 9.4.8. [native-inputs]: Add a patch to fix the testsuite. (ghc-happy-bootstrap-for-9.4): Update to version 1.20.1.1. * gnu/packages/patches/ghc-9.4-testsuite-fixes.patch: New patch. Change-Id: I5ef72f83e5feed1defb706bafa934077fda1553c --- gnu/packages/haskell.scm | 11 +- .../patches/ghc-9.4-testsuite-fixes.patch | 119 ++++++++++++++++++ 2 files changed, 125 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/ghc-9.4-testsuite-fixes.patch diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 62815efbb1..88826fb31f 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1437,14 +1437,14 @@ (define ghc-happy-bootstrap-for-9.4 (hidden-package (package (name "ghc-happy") - (version "1.20.0") + (version "1.20.1.1") (source (origin (method url-fetch) (uri (hackage-uri "happy" version)) (sha256 (base32 - "1346r2x5ravs5fqma65bzjragqbb2g6v41wz9maknwm2jf7kl79v")))) + "06w8g3lfk2ynrfhqznhp1mnp8a5b64lj6qviixpndzf5lv2psklb")))) (build-system haskell-build-system) (arguments (list #:haskell ghc-bootstrap-for-9.4 @@ -1462,14 +1462,14 @@ (define-public ghc-9.4 (package (inherit base) (name "ghc-next") - (version "9.4.4") + (version "9.4.8") (source (origin (method url-fetch) (uri (string-append "https://www.haskell.org/ghc/dist/" version "/ghc-" version "-src.tar.xz")) (sha256 (base32 - "1qk7rlqf02s3b6m6sqqngmjq1mxnrz88h159lz6k25gddmdg5kp8")))) + "0pmqg9846lanb0hcyxhgr9ipzq33rfldxj7ln0j3qgpyczmhgx0b")))) (arguments (substitute-keyword-arguments (package-arguments base) ((#:phases phases '%standard-phases) @@ -1487,7 +1487,8 @@ (define-public ghc-9.4 version "/ghc-" version "-testsuite.tar.xz")) (sha256 (base32 - "04p2lawxxg3nyv6frzhyjyh3arhqqyh5ka3alxa2pxhcd2hdcja3")))) + "159wsqnqpqb0pxa3zyhvyg07wxr2zz7v52h52wkplw4pn12dsidc")) + (patches (search-patches "ghc-9.4-testsuite-fixes.patch")))) ("ghc-alex" ,ghc-alex-bootstrap-for-9.4) ("ghc-happy" ,ghc-happy-bootstrap-for-9.4) ,@(filter (match-lambda diff --git a/gnu/packages/patches/ghc-9.4-testsuite-fixes.patch b/gnu/packages/patches/ghc-9.4-testsuite-fixes.patch new file mode 100644 index 0000000000..f394632add --- /dev/null +++ b/gnu/packages/patches/ghc-9.4-testsuite-fixes.patch @@ -0,0 +1,119 @@ +From 3acd8aa948a27465cffc8e2ab56229485e2a5b98 Mon Sep 17 00:00:00 2001 +From: Saku Laesvuori +Date: Tue, 5 Dec 2023 22:49:45 +0200 +Subject: [PATCH] Fix tests + +* replaces egrep with grep -E +* removes unnecessary escaping in some grep regular expressions +* adds a missing include header to a makefile +--- + testsuite/tests/cabal/cabal01/Makefile | 2 +- + testsuite/tests/ghci/should_run/GHCiPrimCall/Makefile | 4 ++++ + testsuite/tests/haddock/perf/Makefile | 8 ++++---- + testsuite/tests/hsc2hs/Makefile | 4 ++-- + testsuite/tests/numeric/should_run/T7014.primops | 4 ++-- + testsuite/tests/simplCore/should_compile/Makefile | 4 ++-- + 6 files changed, 15 insertions(+), 11 deletions(-) + +diff --git a/testsuite/tests/cabal/cabal01/Makefile b/testsuite/tests/cabal/cabal01/Makefile +index 004e4c75..6ec499c9 100644 +--- a/testsuite/tests/cabal/cabal01/Makefile ++++ b/testsuite/tests/cabal/cabal01/Makefile +@@ -5,7 +5,7 @@ include $(TOP)/mk/test.mk + # Find all the env variables starting with CI_ to unset them. + # Otherwise, we might run into environment length limitations on Windows. + # (See `xargs --show-limits`.) +-VARS_TO_UNSET := $(shell env | grep ^CI_ | egrep -o '^[^=]+') ++VARS_TO_UNSET := $(shell env | grep ^CI_ | grep -E -o '^[^=]+') + unexport $(VARS_TO_UNSET) + + clean: +diff --git a/testsuite/tests/ghci/should_run/GHCiPrimCall/Makefile b/testsuite/tests/ghci/should_run/GHCiPrimCall/Makefile +index fd64d23f..cb669db3 100644 +--- a/testsuite/tests/ghci/should_run/GHCiPrimCall/Makefile ++++ b/testsuite/tests/ghci/should_run/GHCiPrimCall/Makefile +@@ -1,3 +1,7 @@ ++TOP=../../../.. ++include $(TOP)/mk/boilerplate.mk ++include $(TOP)/mk/test.mk ++ + .PHONY: GHCiPrimCall + GHCiPrimCall: + '$(TEST_HC)' $(TEST_HC_OPTS) -fPIC -v0 -c GHCiPrimCall_cmm.cmm +diff --git a/testsuite/tests/haddock/perf/Makefile b/testsuite/tests/haddock/perf/Makefile +index b67b52f2..ff2f7ebb 100644 +--- a/testsuite/tests/haddock/perf/Makefile ++++ b/testsuite/tests/haddock/perf/Makefile +@@ -4,12 +4,12 @@ include $(TOP)/mk/test.mk + + # We accept a 5% increase in parser allocations due to -haddock + haddock_parser_perf : +- WithHaddock=$(shell '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fforce-recomp -Wno-all -ddump-timings -haddock -O0 Fold.hs 2>/dev/null | grep Parser | egrep -o 'alloc=[0-9]+' | cut -c7- ) ; \ +- WithoutHaddock=$(shell '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fforce-recomp -Wno-all -ddump-timings -O0 Fold.hs 2>/dev/null | grep Parser | egrep -o 'alloc=[0-9]+' | cut -c7- ) ; \ ++ WithHaddock=$(shell '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fforce-recomp -Wno-all -ddump-timings -haddock -O0 Fold.hs 2>/dev/null | grep Parser | grep -E -o 'alloc=[0-9]+' | cut -c7- ) ; \ ++ WithoutHaddock=$(shell '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fforce-recomp -Wno-all -ddump-timings -O0 Fold.hs 2>/dev/null | grep Parser | grep -E -o 'alloc=[0-9]+' | cut -c7- ) ; \ + awk "BEGIN { ratio = ($$WithHaddock / $$WithoutHaddock); if (ratio > 1.05) {print \"-haddock allocation ratio too high:\", ratio; exit 1} else {exit 0} }" + + # Similarly for the renamer + haddock_renamer_perf : +- WithoutHaddock=$(shell '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fforce-recomp -Wno-all -ddump-timings -O0 Fold.hs 2>/dev/null | grep Renamer | egrep -o 'alloc=[0-9]+' | cut -c7- ) ; \ +- WithHaddock=$(shell '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fforce-recomp -Wno-all -ddump-timings -haddock -O0 Fold.hs 2>/dev/null | grep Renamer | egrep -o 'alloc=[0-9]+' | cut -c7- ) ; \ ++ WithoutHaddock=$(shell '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fforce-recomp -Wno-all -ddump-timings -O0 Fold.hs 2>/dev/null | grep Renamer | grep -E -o 'alloc=[0-9]+' | cut -c7- ) ; \ ++ WithHaddock=$(shell '$(TEST_HC)' $(TEST_HC_OPTS) -fno-code -fforce-recomp -Wno-all -ddump-timings -haddock -O0 Fold.hs 2>/dev/null | grep Renamer | grep -E -o 'alloc=[0-9]+' | cut -c7- ) ; \ + awk "BEGIN { ratio = ($$WithHaddock / $$WithoutHaddock); if (ratio > 1.05) {print \"-haddock allocation ratio too high:\", ratio; exit 1} else {exit 0} }" +diff --git a/testsuite/tests/hsc2hs/Makefile b/testsuite/tests/hsc2hs/Makefile +index d0b2d249..95b011c8 100644 +--- a/testsuite/tests/hsc2hs/Makefile ++++ b/testsuite/tests/hsc2hs/Makefile +@@ -52,9 +52,9 @@ T11004: + T12504: + '$(HSC2HS)' $(HSC2HS_OPTS) T12504/path/to/$@.hsc + ifeq "$(WINDOWS)" "YES" +- grep '{-# LINE 1 \"T12504\\\\path\\\\to\\\\$@\.hsc\" #-}' T12504/path/to/$@.hs ++ grep '{-# LINE 1 "T12504\\\\path\\\\to\\\\$@\.hsc" #-}' T12504/path/to/$@.hs + else +- grep '{-# LINE 1 \"T12504/path/to/$@\.hsc\" #-}' T12504/path/to/$@.hs ++ grep '{-# LINE 1 "T12504/path/to/$@\.hsc" #-}' T12504/path/to/$@.hs + endif + + .PHONY: T15758 +diff --git a/testsuite/tests/numeric/should_run/T7014.primops b/testsuite/tests/numeric/should_run/T7014.primops +index 3243666d..c807fb45 100644 +--- a/testsuite/tests/numeric/should_run/T7014.primops ++++ b/testsuite/tests/numeric/should_run/T7014.primops +@@ -1,8 +1,8 @@ + and# + or# + uncheckedShift.*# +-\+# +-\-# +++# ++-# + \*# + quotInt# + remInt# +diff --git a/testsuite/tests/simplCore/should_compile/Makefile b/testsuite/tests/simplCore/should_compile/Makefile +index b5041800..c56e04f6 100644 +--- a/testsuite/tests/simplCore/should_compile/Makefile ++++ b/testsuite/tests/simplCore/should_compile/Makefile +@@ -66,7 +66,7 @@ T13367: + + T8832: + $(RM) -f T8832.o T8832.hi +- '$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl -dsuppress-ticks T8832.hs | egrep '^[a-zA-Z0-9]+ =' ++ '$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl -dsuppress-ticks T8832.hs | grep -E '^[a-zA-Z0-9]+ =' + + T12603: + $(RM) -f T12603.o T12603.hi +@@ -259,7 +259,7 @@ str-rules: + # g should have been collapsed into one defininition by CSE. + .PHONY: T13340 + T13340: +- '$(TEST_HC)' $(TEST_HC_OPTS) -c -O T13340.hs -ddump-simpl -dsuppress-all | grep -c '\+#' ++ '$(TEST_HC)' $(TEST_HC_OPTS) -c -O T13340.hs -ddump-simpl -dsuppress-all | grep -c '+#' + + + # We expect to see all dictionaries specialized away. +-- +2.41.0 + -- 2.41.0