From patchwork Sat May 25 20:11:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Vollmert X-Patchwork-Id: 14081 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 5371B1704B; Sat, 25 May 2019 21:12:07 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id E54B317016 for ; Sat, 25 May 2019 21:12:06 +0100 (BST) Received: from localhost ([127.0.0.1]:45907 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hUd1S-0005EZ-Hl for patchwork@mira.cbaines.net; Sat, 25 May 2019 16:12:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44139) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hUd1P-0005ES-MS for guix-patches@gnu.org; Sat, 25 May 2019 16:12:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hUd1O-0006jO-Kn for guix-patches@gnu.org; Sat, 25 May 2019 16:12:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36171) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hUd1O-0006jH-Hn for guix-patches@gnu.org; Sat, 25 May 2019 16:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hUd1O-0001IL-Bu for guix-patches@gnu.org; Sat, 25 May 2019 16:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#35907] [PATCH] guix import hackage: update list of ghc-included packages Resent-From: Robert Vollmert Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 May 2019 20:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 35907 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35907@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15588150814911 (code B ref -1); Sat, 25 May 2019 20:12:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 May 2019 20:11:21 +0000 Received: from localhost ([127.0.0.1]:49715 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hUd0j-0001H9-FG for submit@debbugs.gnu.org; Sat, 25 May 2019 16:11:21 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57924) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hUd0h-0001Gu-E6 for submit@debbugs.gnu.org; Sat, 25 May 2019 16:11:20 -0400 Received: from lists.gnu.org ([209.51.188.17]:42486) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hUd0c-000628-CM for submit@debbugs.gnu.org; Sat, 25 May 2019 16:11:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44068) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hUd0b-0004zi-56 for guix-patches@gnu.org; Sat, 25 May 2019 16:11:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hUd0a-00060P-1J for guix-patches@gnu.org; Sat, 25 May 2019 16:11:13 -0400 Received: from mx2.mailbox.org ([80.241.60.215]:57182) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hUd0Z-0005zc-Rm for guix-patches@gnu.org; Sat, 25 May 2019 16:11:11 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 87AA3A017E; Sat, 25 May 2019 22:11:10 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id qiv2ditNlI_J; Sat, 25 May 2019 22:11:04 +0200 (CEST) From: Robert Vollmert Date: Sat, 25 May 2019 22:11:02 +0200 Message-Id: <20190525201102.14630-1-rob@vllmrt.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Robert Vollmert Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Update the list of excepted dependencies for current ghc-8.4, based on the release notes at https://downloads.haskell.org/~ghc/8.4.3/docs/html/users_guide/8.4.3-notes.html Particularly, this adds `text` to the list, which is a dependency of `parsec` which was already on the list before, causing build failures with updated versions of the `text` package. * guix/import/hackage.scm (ghc-standard-libraries): Update list. --- guix/import/hackage.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index c97b16197f..bc72f21bf3 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -52,34 +52,35 @@ hackage-package?)) (define ghc-standard-libraries - ;; List of libraries distributed with ghc (7.10.2). We include GHC itself as - ;; some packages list it. - '("array" + ;; List of libraries distributed with ghc (8.4.3). + ;; https://downloads.haskell.org/~ghc/8.4.3/docs/html/users_guide/8.4.3-notes.html + '("ghc" + "cabal" ;; in the output of `ghc-pkg list` Cabal is uppercased, but + ;; hackage-name->package-name takes this into account. + "win32" ;; similarly uppercased + "array" "base" - "bin-package-db" "binary" "bytestring" - "cabal" ;; in the output of `ghc-pkg list` Cabal is uppercased, but - ;; hackage-name->package-name takes this into account. "containers" "deepseq" "directory" "filepath" - "ghc" + "ghc-boot" + "ghc-compact" "ghc-prim" + "ghci" "haskeline" - "hoopl" "hpc" "integer-gmp" - "pretty" + "mtl" + "parsec" "process" - "rts" "template-haskell" - "terminfo" + "text" "time" "transformers" "unix" - "win32" "xhtml")) (define package-name-prefix "ghc-")