From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id AIRNLqCC7WB7ngAAgWs5BA (envelope-from ) for ; Tue, 13 Jul 2021 14:10:08 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 8IMgKqCC7WBicQAAB5/wlQ (envelope-from ) for ; Tue, 13 Jul 2021 12:10:08 +0000 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 77C1445F for ; Tue, 13 Jul 2021 14:10:08 +0200 (CEST) Received: from localhost ([::1]:40660 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3HEl-0005CC-DX for larch@yhetil.org; Tue, 13 Jul 2021 08:10:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35204) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3HEg-0005B7-6U for guix-patches@gnu.org; Tue, 13 Jul 2021 08:10:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56322) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3HEf-0003uj-UO for guix-patches@gnu.org; Tue, 13 Jul 2021 08:10:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m3HEf-00057r-JT for guix-patches@gnu.org; Tue, 13 Jul 2021 08:10:01 -0400 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 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-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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1626178208; h=from:from:sender:sender: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:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=421oOvwR+JAZsq++qcjFE3KuaLNX37VGIwytaZRim+4=; b=RmivW2v7Q6iAMXpTkghvCnctWZAg0h1gpfPDPtR+opFN/zAl9N8XltBT/kCUvqPWtrjjcc KZQVA2qFj3KoRG6xn+g7uLJ1WbCZuLon0SBbGFXXAqIvGT7sjQIkXb7dhfGDUcvgBfMBEQ dXCpUXW+AIvT49FIpHhpGCli7Njz8j9ClnFiL/SMEzf5vQHUhSre7Vq0SOiRUY2S11mYXX /A5byMEioQkx7PskJMS5XQ674lj6MrcKuZ+SrYDSeqVSmNsnM5mOJObWlaiBrp7aLISTod dktaBAtoMPFAtSDl/8xjBMldgsM3swHr2xSHdRp3q3IDwwO8ezGTgKJu8f93Cw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1626178208; a=rsa-sha256; cv=none; b=ZJZSYx/KznkTzWZB6GG6u1aXGQNWLMtESNLUTr59J8sdjZpO76tgCYPW9B22761LO0fHNk jDa0HbjfIhk+7M+0kiZoNLbZuWaeh8kAFS8Q9kQ31Wd+07guh7hBopKQMp3M1sWJMfVCcI g10YLWL1+8g+MTHORkQvBqClAQ+zRgWxZcDpS6/7s5fwuY8afSv2JXrKs2cDkC654ixMaz xoapWGYsKuik6XhLGSU4GXK6Q1/VXXff3qZ1uKkMWguHOXESGg4MAHG2Cfb6oatFU2/5TN Vx/fizwZJC15YVlM3xnbEcGGTV7oGlg1UI4xVkE1UryEQZR3jGqI6vYUKKfdLg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 0.10 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 77C1445F X-Spam-Score: 0.10 X-Migadu-Scanner: scn0.migadu.com X-TUID: y3PmC94cBmF5 * 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