From patchwork Wed Feb 26 11:45:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Neidhardt X-Patchwork-Id: 20437 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 C8CD427BBEA; Wed, 26 Feb 2020 11:49:59 +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, 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 ESMTP id 9A62D27BBE4 for ; Wed, 26 Feb 2020 11:49:59 +0000 (GMT) Received: from localhost ([::1]:43034 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6vCR-0001bb-5C for patchwork@mira.cbaines.net; Wed, 26 Feb 2020 06:49:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33623) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6v9a-0006do-Tu for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6v9Z-0002um-Ss for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50546) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6v9Z-0002tS-OT for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j6v9Z-0004g9-My for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39798] [PATCH 01/13] gnu: ghc-hsyaml: Update to 0.2.1.0. References: <20200226113442.9798-1-mail@ambrevar.xyz> In-Reply-To: <20200226113442.9798-1-mail@ambrevar.xyz> Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Feb 2020 11:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39798@debbugs.gnu.org Received: via spool by 39798-submit@debbugs.gnu.org id=B39798.158271757717790 (code B ref 39798); Wed, 26 Feb 2020 11:47:01 +0000 Received: (at 39798) by debbugs.gnu.org; 26 Feb 2020 11:46:17 +0000 Received: from localhost ([127.0.0.1]:56486 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6v8r-0004cr-Gs for submit@debbugs.gnu.org; Wed, 26 Feb 2020 06:46:17 -0500 Received: from relay12.mail.gandi.net ([217.70.178.232]:46483) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6v8p-0004cT-8Y for 39798@debbugs.gnu.org; Wed, 26 Feb 2020 06:46:16 -0500 Received: from bababa.home (lfbn-idf2-1-1315-147.w92-169.abo.wanadoo.fr [92.169.129.147]) (Authenticated sender: mail@ambrevar.xyz) by relay12.mail.gandi.net (Postfix) with ESMTPSA id 83B93200007 for <39798@debbugs.gnu.org>; Wed, 26 Feb 2020 11:46:06 +0000 (UTC) From: Pierre Neidhardt Date: Wed, 26 Feb 2020 12:45:53 +0100 Message-Id: <20200226114605.15106-1-mail@ambrevar.xyz> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/haskell-xyz.scm (ghc-hsyaml): Update to 0.2.1.0. --- gnu/packages/haskell-xyz.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index e368082c03..03adfdb062 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -5679,7 +5679,7 @@ for Haskell. The functions provided by this module are @code{upper}, (define-public ghc-hsyaml (package (name "ghc-hsyaml") - (version "0.1.2.0") + (version "0.2.1.0") (source (origin (method url-fetch) @@ -5687,11 +5687,13 @@ for Haskell. The functions provided by this module are @code{upper}, "HsYAML/HsYAML-" version ".tar.gz")) (sha256 (base32 - "1pajfhj16559v64ixm8j7bvxdqmxg6c3c0z3wz7in8ckswgzfp54")))) + "10qzhsg789h37q22hm9p27dx4rhbykcbxp7p3pvkws8fr7ajgxv0")))) (build-system haskell-build-system) - (arguments - `(#:cabal-revision - ("1" "0j6qmmcz5yqh89hs2cq453maix50q61vl2h0ahj5lg02bygn42cf"))) + (inputs + `(("ghc-quickcheck" ,ghc-quickcheck))) + (native-inputs + `(("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck))) (home-page "https://github.com/haskell-hvr/HsYAML") (synopsis "Pure Haskell YAML 1.2 parser") (description "This library provides a From patchwork Wed Feb 26 11:45:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Neidhardt X-Patchwork-Id: 20438 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 E18CE27BBEA; Wed, 26 Feb 2020 11:50:05 +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, 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 ESMTP id A4C6B27BBE4 for ; Wed, 26 Feb 2020 11:50:05 +0000 (GMT) Received: from localhost ([::1]:43036 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6vCX-0001oV-6V for patchwork@mira.cbaines.net; Wed, 26 Feb 2020 06:50:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33639) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6v9b-0006eb-Bl for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6v9a-0002wE-7u for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50547) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6v9a-0002vY-4A for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j6v9a-0004gH-2h for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39798] [PATCH 02/13] gnu: ghc-doctemplates: Update to 0.8.1. Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Feb 2020 11:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39798@debbugs.gnu.org Received: via spool by 39798-submit@debbugs.gnu.org id=B39798.158271757817797 (code B ref 39798); Wed, 26 Feb 2020 11:47:02 +0000 Received: (at 39798) by debbugs.gnu.org; 26 Feb 2020 11:46:18 +0000 Received: from localhost ([127.0.0.1]:56488 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6v8r-0004ct-Q9 for submit@debbugs.gnu.org; Wed, 26 Feb 2020 06:46:18 -0500 Received: from relay12.mail.gandi.net ([217.70.178.232]:54277) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6v8q-0004cW-AX for 39798@debbugs.gnu.org; Wed, 26 Feb 2020 06:46:16 -0500 Received: from bababa.home (lfbn-idf2-1-1315-147.w92-169.abo.wanadoo.fr [92.169.129.147]) (Authenticated sender: mail@ambrevar.xyz) by relay12.mail.gandi.net (Postfix) with ESMTPSA id 877C8200004 for <39798@debbugs.gnu.org>; Wed, 26 Feb 2020 11:46:08 +0000 (UTC) From: Pierre Neidhardt Date: Wed, 26 Feb 2020 12:45:54 +0100 Message-Id: <20200226114605.15106-2-mail@ambrevar.xyz> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200226114605.15106-1-mail@ambrevar.xyz> References: <20200226114605.15106-1-mail@ambrevar.xyz> MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/haskell-xyz.scm (ghc-doctemplates): Update to 0.8.1. --- gnu/packages/haskell-xyz.scm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 03adfdb062..147254c6a9 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -3115,7 +3115,7 @@ Writer monad), where list append quickly becomes too expensive.") (define-public ghc-doctemplates (package (name "ghc-doctemplates") - (version "0.2.2.1") + (version "0.8.1") (source (origin (method url-fetch) @@ -3124,17 +3124,25 @@ Writer monad), where list append quickly becomes too expensive.") version ".tar.gz")) (sha256 (base32 - "1gyckfg3kgvzhxw14i7iwrw0crygvsp86sy53bbr1yn7bxbgn33b")))) + "02xysm510m3hbifwb7ngx39wj1ycxjrws4ngnm0d7ywqm9cv1hbb")))) (build-system haskell-build-system) (inputs `(("ghc-aeson" ,ghc-aeson) ("ghc-blaze-markup" ,ghc-blaze-markup) ("ghc-blaze-html" ,ghc-blaze-html) + ("ghc-doclayout" ,ghc-doclayout) + ("ghc-glob" ,ghc-glob) + ("ghc-hsyaml" ,ghc-hsyaml) ("ghc-vector" ,ghc-vector) ("ghc-unordered-containers" ,ghc-unordered-containers) - ("ghc-scientific" ,ghc-scientific))) + ("ghc-safe" ,ghc-safe) + ("ghc-scientific" ,ghc-scientific) + ("ghc-text-conversions" ,ghc-text-conversions))) (native-inputs - `(("ghc-hspec" ,ghc-hspec))) + `(("ghc-hspec" ,ghc-hspec) + ("ghc-tasty" ,ghc-tasty) + ("ghc-tasty-golden" ,ghc-tasty-golden) + ("ghc-tasty-hunit" ,ghc-tasty-hunit))) (home-page "https://github.com/jgm/doctemplates#readme") (synopsis "Pandoc-style document templates") (description From patchwork Wed Feb 26 11:45:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Neidhardt X-Patchwork-Id: 20439 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 956DB27BBEA; Wed, 26 Feb 2020 11:50:12 +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, 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 ESMTP id 6C67827BBE4 for ; Wed, 26 Feb 2020 11:50:12 +0000 (GMT) Received: from localhost ([::1]:43042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6vCd-000212-Vs for patchwork@mira.cbaines.net; Wed, 26 Feb 2020 06:50:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33651) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6v9b-0006fG-ME for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6v9a-0002yI-LF for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50548) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6v9a-0002xV-Gv for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j6v9a-0004gO-Fq for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39798] [PATCH 03/13] gnu: Add ghc-regex-base-0.94. Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Feb 2020 11:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39798@debbugs.gnu.org Received: via spool by 39798-submit@debbugs.gnu.org id=B39798.158271758117819 (code B ref 39798); Wed, 26 Feb 2020 11:47:02 +0000 Received: (at 39798) by debbugs.gnu.org; 26 Feb 2020 11:46:21 +0000 Received: from localhost ([127.0.0.1]:56492 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6v8v-0004dG-3E for submit@debbugs.gnu.org; Wed, 26 Feb 2020 06:46:21 -0500 Received: from relay12.mail.gandi.net ([217.70.178.232]:48941) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6v8s-0004cY-2v for 39798@debbugs.gnu.org; Wed, 26 Feb 2020 06:46:18 -0500 Received: from bababa.home (lfbn-idf2-1-1315-147.w92-169.abo.wanadoo.fr [92.169.129.147]) (Authenticated sender: mail@ambrevar.xyz) by relay12.mail.gandi.net (Postfix) with ESMTPSA id B5D85200011 for <39798@debbugs.gnu.org>; Wed, 26 Feb 2020 11:46:10 +0000 (UTC) From: Pierre Neidhardt Date: Wed, 26 Feb 2020 12:45:55 +0100 Message-Id: <20200226114605.15106-3-mail@ambrevar.xyz> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200226114605.15106-1-mail@ambrevar.xyz> References: <20200226114605.15106-1-mail@ambrevar.xyz> MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/haskell-xyz.scm (ghc-regex-base-0.94): New variable. --- gnu/packages/haskell-xyz.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 147254c6a9..d1e90b79d3 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -9453,6 +9453,21 @@ regular expressions. Parsers can be built using Applicative interface.") regex-posix, regex-pcre, regex-parsec, regex-tdfa, regex-dfa.") (license license:bsd-3))) +(define-public ghc-regex-base-0.94 + (package + (inherit ghc-regex-base) + (version "0.94.0.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/regex-base/regex-base-" + version + ".tar.gz")) + (sha256 + (base32 + "055rlq67xnbqv43fgrlw6d7s8nhyavahrp6blihwjmqizksq47y4")))))) + (define-public ghc-regex-compat (package (name "ghc-regex-compat") From patchwork Wed Feb 26 11:45:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Neidhardt X-Patchwork-Id: 20442 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 57C3927BBEA; Wed, 26 Feb 2020 11:51:03 +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, 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 ESMTP id 20B9A27BBE4 for ; Wed, 26 Feb 2020 11:51:03 +0000 (GMT) Received: from localhost ([::1]:43072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6vDR-0003Av-BV for patchwork@mira.cbaines.net; Wed, 26 Feb 2020 06:51:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33672) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6v9c-0006gM-76 for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6v9b-0002zr-0Z for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50549) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6v9a-0002z2-TY for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j6v9a-0004gV-SV for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39798] [PATCH 05/13] gnu: ghc-skylighting-core: Update to 0.8.3.2. Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Feb 2020 11:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39798@debbugs.gnu.org Received: via spool by 39798-submit@debbugs.gnu.org id=B39798.158271758517842 (code B ref 39798); Wed, 26 Feb 2020 11:47:02 +0000 Received: (at 39798) by debbugs.gnu.org; 26 Feb 2020 11:46:25 +0000 Received: from localhost ([127.0.0.1]:56496 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6v8z-0004di-DM for submit@debbugs.gnu.org; Wed, 26 Feb 2020 06:46:25 -0500 Received: from relay12.mail.gandi.net ([217.70.178.232]:49359) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6v8x-0004d0-Ei for 39798@debbugs.gnu.org; Wed, 26 Feb 2020 06:46:23 -0500 Received: from bababa.home (lfbn-idf2-1-1315-147.w92-169.abo.wanadoo.fr [92.169.129.147]) (Authenticated sender: mail@ambrevar.xyz) by relay12.mail.gandi.net (Postfix) with ESMTPSA id AE274200004 for <39798@debbugs.gnu.org>; Wed, 26 Feb 2020 11:46:15 +0000 (UTC) From: Pierre Neidhardt Date: Wed, 26 Feb 2020 12:45:57 +0100 Message-Id: <20200226114605.15106-5-mail@ambrevar.xyz> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200226114605.15106-1-mail@ambrevar.xyz> References: <20200226114605.15106-1-mail@ambrevar.xyz> MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/haskell-xyz.scm (ghc-skylighting-core): Update to 0.8.3.2. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index aa915ddd98..875ea37ccc 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10539,7 +10539,7 @@ enumerations.") (define-public ghc-skylighting-core (package (name "ghc-skylighting-core") - (version "0.8.2.1") + (version "0.8.3.2") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -10547,7 +10547,7 @@ enumerations.") version ".tar.gz")) (sha256 (base32 - "0hdchivb4af9w7v5v7lrwfwawd3kcwmpzk69m1vkkm3pis8lcr1s")))) + "04l1qcfqkvi7c4hv5nra4nl2zk5r6l6jkj95wvq466anls8x35rj")))) (build-system haskell-build-system) (inputs `(("ghc-aeson" ,ghc-aeson) From patchwork Wed Feb 26 11:45:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Neidhardt X-Patchwork-Id: 20432 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 5612427BBEA; Wed, 26 Feb 2020 11:47:28 +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, 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 ESMTP id 2AA9827BBE4 for ; Wed, 26 Feb 2020 11:47:28 +0000 (GMT) Received: from localhost ([::1]:42974 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6v9s-0006oK-Q3 for patchwork@mira.cbaines.net; Wed, 26 Feb 2020 06:47:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33703) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6v9d-0006hu-05 for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6v9b-00035R-QU for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50551) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6v9b-00034Q-Mi for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j6v9b-0004gk-LX for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39798] [PATCH 06/13] gnu: ghc-skylighting: Update to 0.8.3.2. Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Feb 2020 11:47:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39798@debbugs.gnu.org Received: via spool by 39798-submit@debbugs.gnu.org id=B39798.158271759017891 (code B ref 39798); Wed, 26 Feb 2020 11:47:03 +0000 Received: (at 39798) by debbugs.gnu.org; 26 Feb 2020 11:46:30 +0000 Received: from localhost ([127.0.0.1]:56506 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6v93-0004eP-PP for submit@debbugs.gnu.org; Wed, 26 Feb 2020 06:46:30 -0500 Received: from relay12.mail.gandi.net ([217.70.178.232]:38667) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6v90-0004dF-3E for 39798@debbugs.gnu.org; Wed, 26 Feb 2020 06:46:26 -0500 Received: from bababa.home (lfbn-idf2-1-1315-147.w92-169.abo.wanadoo.fr [92.169.129.147]) (Authenticated sender: mail@ambrevar.xyz) by relay12.mail.gandi.net (Postfix) with ESMTPSA id 52DD1200015 for <39798@debbugs.gnu.org>; Wed, 26 Feb 2020 11:46:17 +0000 (UTC) From: Pierre Neidhardt Date: Wed, 26 Feb 2020 12:45:58 +0100 Message-Id: <20200226114605.15106-6-mail@ambrevar.xyz> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200226114605.15106-1-mail@ambrevar.xyz> References: <20200226114605.15106-1-mail@ambrevar.xyz> MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/haskell-xyz.scm (ghc-skylighting): Update to 0.8.3.2. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 875ea37ccc..b6c82322f2 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -10583,14 +10583,14 @@ provided. Skylighting is intended to be the successor to highlighting-kate.") (package (inherit ghc-skylighting-core) (name "ghc-skylighting") - (version "0.8.2.1") + (version "0.8.3.2") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/skylighting-" version "/skylighting-" version ".tar.gz")) (sha256 (base32 - "1xls8ycad77m55ax4hp55k60h3pi5sm3m32hycbc8baixbgfx5xz")))) + "03kbvz66r4fp1zq09c6arnhi2s81iwsmv8lv2kz0g7a8dr0hpaq2")))) (inputs `(("ghc-skylighting-core" ,ghc-skylighting-core) ,@(package-inputs ghc-skylighting-core))))) From patchwork Wed Feb 26 11:45:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Neidhardt X-Patchwork-Id: 20444 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 87C7027BBEA; Wed, 26 Feb 2020 11:51:27 +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, 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 ESMTP id 6139127BBE4 for ; Wed, 26 Feb 2020 11:51:27 +0000 (GMT) Received: from localhost ([::1]:43078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6vDq-0003TU-VS for patchwork@mira.cbaines.net; Wed, 26 Feb 2020 06:51:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33761) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6v9i-0006jJ-Cn for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6v9e-0003F6-CN for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50555) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6v9e-0003Ce-8q for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j6v9d-0004hD-7N for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39798] [PATCH 07/13] gnu: ghc-pandoc-types: Update to 1.20. Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Feb 2020 11:47:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39798@debbugs.gnu.org Received: via spool by 39798-submit@debbugs.gnu.org id=B39798.158271759717937 (code B ref 39798); Wed, 26 Feb 2020 11:47:05 +0000 Received: (at 39798) by debbugs.gnu.org; 26 Feb 2020 11:46:37 +0000 Received: from localhost ([127.0.0.1]:56515 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6v9B-0004f8-1j for submit@debbugs.gnu.org; Wed, 26 Feb 2020 06:46:37 -0500 Received: from relay12.mail.gandi.net ([217.70.178.232]:44233) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6v92-0004dU-AN for 39798@debbugs.gnu.org; Wed, 26 Feb 2020 06:46:29 -0500 Received: from bababa.home (lfbn-idf2-1-1315-147.w92-169.abo.wanadoo.fr [92.169.129.147]) (Authenticated sender: mail@ambrevar.xyz) by relay12.mail.gandi.net (Postfix) with ESMTPSA id BFAB5200011 for <39798@debbugs.gnu.org>; Wed, 26 Feb 2020 11:46:20 +0000 (UTC) From: Pierre Neidhardt Date: Wed, 26 Feb 2020 12:45:59 +0100 Message-Id: <20200226114605.15106-7-mail@ambrevar.xyz> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200226114605.15106-1-mail@ambrevar.xyz> References: <20200226114605.15106-1-mail@ambrevar.xyz> MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/haskell-xyz.scm (ghc-pandoc-types): Update to 1.20. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index b6c82322f2..40c8b4293d 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8423,7 +8423,7 @@ suitable for inclusion in pandoc YAML metadata.") (define-public ghc-pandoc-types (package (name "ghc-pandoc-types") - (version "1.17.6.1") + (version "1.20") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" @@ -8431,7 +8431,7 @@ suitable for inclusion in pandoc YAML metadata.") version ".tar.gz")) (sha256 (base32 - "1d6ygq991ddria71l7hg9yd7lq94sjy4m71rdws1v8hq943c4d0q")))) + "0wz89ywyhvxz8daw4ia132kg6ynx5y4wva4g899wvq4kyjy1dixa")))) (build-system haskell-build-system) (inputs `(("ghc-syb" ,ghc-syb) From patchwork Wed Feb 26 11:46:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Neidhardt X-Patchwork-Id: 20441 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 7CEB227BBEA; Wed, 26 Feb 2020 11:50:35 +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, 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 ESMTP id 53E0027BBE4 for ; Wed, 26 Feb 2020 11:50:35 +0000 (GMT) Received: from localhost ([::1]:43058 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6vD0-0002X2-S8 for patchwork@mira.cbaines.net; Wed, 26 Feb 2020 06:50:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33682) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6v9c-0006go-Ds for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6v9b-00032X-DG for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50550) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6v9b-00031k-A9 for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j6v9b-0004gd-8g for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39798] [PATCH 08/13] gnu: ghc-texmath: Update to 0.12.0.1. Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Feb 2020 11:47:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39798@debbugs.gnu.org Received: via spool by 39798-submit@debbugs.gnu.org id=B39798.158271758917884 (code B ref 39798); Wed, 26 Feb 2020 11:47:03 +0000 Received: (at 39798) by debbugs.gnu.org; 26 Feb 2020 11:46:29 +0000 Received: from localhost ([127.0.0.1]:56504 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6v92-0004eA-Lq for submit@debbugs.gnu.org; Wed, 26 Feb 2020 06:46:29 -0500 Received: from relay12.mail.gandi.net ([217.70.178.232]:49359) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6v8y-0004d0-Kw for 39798@debbugs.gnu.org; Wed, 26 Feb 2020 06:46:24 -0500 Received: from bababa.home (lfbn-idf2-1-1315-147.w92-169.abo.wanadoo.fr [92.169.129.147]) (Authenticated sender: mail@ambrevar.xyz) by relay12.mail.gandi.net (Postfix) with ESMTPSA id 5537F200016 for <39798@debbugs.gnu.org>; Wed, 26 Feb 2020 11:46:22 +0000 (UTC) From: Pierre Neidhardt Date: Wed, 26 Feb 2020 12:46:00 +0100 Message-Id: <20200226114605.15106-8-mail@ambrevar.xyz> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200226114605.15106-1-mail@ambrevar.xyz> References: <20200226114605.15106-1-mail@ambrevar.xyz> MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/haskell-xyz.scm (ghc-texmath): Update to 0.12.0.1. --- gnu/packages/haskell-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 40c8b4293d..b0ea9192e3 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -11563,14 +11563,14 @@ dependency.") (define-public ghc-texmath (package (name "ghc-texmath") - (version "0.11.3") + (version "0.12.0.1") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/" "texmath/texmath-" version ".tar.gz")) (sha256 (base32 - "03rpxbp43bjs62mmw4hv4785n6f6nbf8kj2y9mma5nzk6i2xs09f")))) + "1halp1vn2334ym3j3fxfbrpkr15nc201c7vfwmzimya6vnyknsxs")))) (build-system haskell-build-system) (inputs `(("ghc-syb" ,ghc-syb) From patchwork Wed Feb 26 11:46:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Neidhardt X-Patchwork-Id: 20443 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 5453C27BBEA; Wed, 26 Feb 2020 11:51:20 +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, 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 ESMTP id 2A36527BBE4 for ; Wed, 26 Feb 2020 11:51:20 +0000 (GMT) Received: from localhost ([::1]:43074 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6vDj-0003KB-MM for patchwork@mira.cbaines.net; Wed, 26 Feb 2020 06:51:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33758) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6v9i-0006jC-CA for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6v9d-0003Dl-OQ for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50556) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6v9d-0003D7-LB for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j6v9d-0004hL-Jq for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39798] [PATCH 09/13] gnu: Add ghc-base-compat-0.11. Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Feb 2020 11:47:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39798@debbugs.gnu.org Received: via spool by 39798-submit@debbugs.gnu.org id=B39798.158271759717944 (code B ref 39798); Wed, 26 Feb 2020 11:47:05 +0000 Received: (at 39798) by debbugs.gnu.org; 26 Feb 2020 11:46:37 +0000 Received: from localhost ([127.0.0.1]:56517 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6v9B-0004fF-Bs for submit@debbugs.gnu.org; Wed, 26 Feb 2020 06:46:37 -0500 Received: from relay12.mail.gandi.net ([217.70.178.232]:57031) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6v94-0004dg-Fb for 39798@debbugs.gnu.org; Wed, 26 Feb 2020 06:46:30 -0500 Received: from bababa.home (lfbn-idf2-1-1315-147.w92-169.abo.wanadoo.fr [92.169.129.147]) (Authenticated sender: mail@ambrevar.xyz) by relay12.mail.gandi.net (Postfix) with ESMTPSA id 9B492200004 for <39798@debbugs.gnu.org>; Wed, 26 Feb 2020 11:46:24 +0000 (UTC) From: Pierre Neidhardt Date: Wed, 26 Feb 2020 12:46:01 +0100 Message-Id: <20200226114605.15106-9-mail@ambrevar.xyz> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200226114605.15106-1-mail@ambrevar.xyz> References: <20200226114605.15106-1-mail@ambrevar.xyz> MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/haskell-xyz.scm (ghc-base-compat-0.11): New variable. --- gnu/packages/haskell-xyz.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index b0ea9192e3..9e85f89248 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -767,6 +767,21 @@ of base to a wider range of compilers, without requiring the use of CPP pragmas in your code.") (license license:bsd-3))) +(define-public ghc-base-compat-0.11 + (package + (inherit ghc-base-compat) + (version "0.11.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/base-compat/base-compat-" + version + ".tar.gz")) + (sha256 + (base32 + "0dkdmyxg8hfjn1zyrp4mahkr90g4y672mlvkj0m1krwkxi11avrm")))))) + (define-public ghc-base-compat-batteries (package (name "ghc-base-compat-batteries") From patchwork Wed Feb 26 11:46:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Neidhardt X-Patchwork-Id: 20440 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 9DAFD27BBEA; Wed, 26 Feb 2020 11:50:28 +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, TVD_SPACE_RATIO,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 ESMTP id 7524327BBE4 for ; Wed, 26 Feb 2020 11:50:28 +0000 (GMT) Received: from localhost ([::1]:43052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6vCt-0002H3-U9 for patchwork@mira.cbaines.net; Wed, 26 Feb 2020 06:50:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33723) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6v9e-0006ie-8g for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6v9c-00037o-8e for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50552) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6v9c-00036j-4D for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j6v9c-0004gr-33 for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39798] [PATCH 10/13] gnu: Add ghc-optparse-applicative-0.15. Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Feb 2020 11:47:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39798@debbugs.gnu.org Received: via spool by 39798-submit@debbugs.gnu.org id=B39798.158271759017898 (code B ref 39798); Wed, 26 Feb 2020 11:47:04 +0000 Received: (at 39798) by debbugs.gnu.org; 26 Feb 2020 11:46:30 +0000 Received: from localhost ([127.0.0.1]:56508 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6v94-0004eW-5A for submit@debbugs.gnu.org; Wed, 26 Feb 2020 06:46:30 -0500 Received: from relay12.mail.gandi.net ([217.70.178.232]:49359) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6v90-0004d0-5a for 39798@debbugs.gnu.org; Wed, 26 Feb 2020 06:46:26 -0500 Received: from bababa.home (lfbn-idf2-1-1315-147.w92-169.abo.wanadoo.fr [92.169.129.147]) (Authenticated sender: mail@ambrevar.xyz) by relay12.mail.gandi.net (Postfix) with ESMTPSA id 70CAD200007 for <39798@debbugs.gnu.org>; Wed, 26 Feb 2020 11:46:24 +0000 (UTC) From: Pierre Neidhardt Date: Wed, 26 Feb 2020 12:46:02 +0100 Message-Id: <20200226114605.15106-10-mail@ambrevar.xyz> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200226114605.15106-1-mail@ambrevar.xyz> References: <20200226114605.15106-1-mail@ambrevar.xyz> MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/haskell-xyz.scm (ghc-optparse-applicative-0.15): New variable. --- gnu/packages/haskell-xyz.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 9e85f89248..0d766ebe75 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8191,6 +8191,21 @@ easily work with command-line options.") command line options in Haskell.") (license license:bsd-3))) +(define-public ghc-optparse-applicative-0.15 + (package + (inherit ghc-optparse-applicative) + (version "0.15.1.0") + (source + (origin + (method url-fetch) + (uri (string-append + "https://hackage.haskell.org/package/optparse-applicative" + "/optparse-applicative-" version ".tar.gz")) + (sha256 + (base32 + "1ws6y3b3f6hsgv0ff0yp6lw4hba1rps4dnvry3yllng0s5gngcsd")))) + (arguments '()))) + (define-public ghc-jira-wiki-markup (package (name "ghc-jira-wiki-markup") From patchwork Wed Feb 26 11:46:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Neidhardt X-Patchwork-Id: 20434 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 DB0AF27BBEA; Wed, 26 Feb 2020 11:48:07 +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 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 ESMTP id AF80227BBE4 for ; Wed, 26 Feb 2020 11:48:07 +0000 (GMT) Received: from localhost ([::1]:42992 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6vAd-0007V7-57 for patchwork@mira.cbaines.net; Wed, 26 Feb 2020 06:48:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33757) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6v9i-0006jB-CH for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6v9c-00039d-Kf for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50553) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6v9c-00038o-GX for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j6v9c-0004gz-F8 for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39798] [PATCH 11/13] gnu: ghc-haddock-library: Update to 1.8.0. Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Feb 2020 11:47:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39798@debbugs.gnu.org Received: via spool by 39798-submit@debbugs.gnu.org id=B39798.158271759017905 (code B ref 39798); Wed, 26 Feb 2020 11:47:04 +0000 Received: (at 39798) by debbugs.gnu.org; 26 Feb 2020 11:46:30 +0000 Received: from localhost ([127.0.0.1]:56510 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6v94-0004ed-Do for submit@debbugs.gnu.org; Wed, 26 Feb 2020 06:46:30 -0500 Received: from relay12.mail.gandi.net ([217.70.178.232]:38667) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6v90-0004dF-Ob for 39798@debbugs.gnu.org; Wed, 26 Feb 2020 06:46:27 -0500 Received: from bababa.home (lfbn-idf2-1-1315-147.w92-169.abo.wanadoo.fr [92.169.129.147]) (Authenticated sender: mail@ambrevar.xyz) by relay12.mail.gandi.net (Postfix) with ESMTPSA id 0F94D200016 for <39798@debbugs.gnu.org>; Wed, 26 Feb 2020 11:46:25 +0000 (UTC) From: Pierre Neidhardt Date: Wed, 26 Feb 2020 12:46:03 +0100 Message-Id: <20200226114605.15106-11-mail@ambrevar.xyz> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200226114605.15106-1-mail@ambrevar.xyz> References: <20200226114605.15106-1-mail@ambrevar.xyz> MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/haskell-xyz.scm (ghc-haddock-library): Update to 1.8.0. --- gnu/packages/haskell-xyz.scm | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 0d766ebe75..b80e19deef 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -4841,7 +4841,7 @@ documentation-generation tool for Haskell libraries.") (define-public ghc-haddock-library (package (name "ghc-haddock-library") - (version "1.7.0") + (version "1.8.0") (source (origin (method url-fetch) @@ -4851,23 +4851,12 @@ documentation-generation tool for Haskell libraries.") ".tar.gz")) (sha256 (base32 - "04fhcjk0pvsaqvsgp2w06cv2qvshq1xs1bwc157q4lmkgr57khp7")))) + "15xpv29yh3kb9qq9gmws2l8m64i7phvf47y08vxc2j55101sg4vh")))) (build-system haskell-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; Since there is no revised Cabal file upstream, we have to - ;; patch it manually. - (add-before 'configure 'relax-test-suite-dependencies - (lambda _ - (substitute* "haddock-library.cabal" - (("hspec\\s*>= 2.4.4 && < 2.6") "hspec") - (("QuickCheck\\s*\\^>= 2.11") "QuickCheck")) - #t))))) (native-inputs - `(("ghc-base-compat" ,ghc-base-compat) + `(("ghc-base-compat" ,ghc-base-compat-0.11) ("ghc-hspec" ,ghc-hspec) - ("ghc-optparse-applicative" ,ghc-optparse-applicative) + ("ghc-optparse-applicative" ,ghc-optparse-applicative-0.15) ("ghc-quickcheck" ,ghc-quickcheck) ("ghc-tree-diff" ,ghc-tree-diff) ("hspec-discover" ,hspec-discover))) From patchwork Wed Feb 26 11:46:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Neidhardt X-Patchwork-Id: 20435 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 A9F1827BBE4; Wed, 26 Feb 2020 11:48:14 +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, 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 ESMTP id EB4BB27BBEA for ; Wed, 26 Feb 2020 11:48:13 +0000 (GMT) Received: from localhost ([::1]:42994 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6vAj-0007mu-E5 for patchwork@mira.cbaines.net; Wed, 26 Feb 2020 06:48:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33759) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6v9i-0006jF-Cj for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6v9e-0003EC-6S for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:10 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50557) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6v9e-0003Dt-2M for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j6v9e-0004hS-1M for guix-patches@gnu.org; Wed, 26 Feb 2020 06:47:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39798] [PATCH 12/13] gnu: ghc-pandoc: Update to 2.9.2. Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Feb 2020 11:47:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39798@debbugs.gnu.org Received: via spool by 39798-submit@debbugs.gnu.org id=B39798.158271760017954 (code B ref 39798); Wed, 26 Feb 2020 11:47:05 +0000 Received: (at 39798) by debbugs.gnu.org; 26 Feb 2020 11:46:40 +0000 Received: from localhost ([127.0.0.1]:56519 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6v9B-0004fN-KZ for submit@debbugs.gnu.org; Wed, 26 Feb 2020 06:46:39 -0500 Received: from relay12.mail.gandi.net ([217.70.178.232]:49359) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6v91-0004d0-FX for 39798@debbugs.gnu.org; Wed, 26 Feb 2020 06:46:31 -0500 Received: from bababa.home (lfbn-idf2-1-1315-147.w92-169.abo.wanadoo.fr [92.169.129.147]) (Authenticated sender: mail@ambrevar.xyz) by relay12.mail.gandi.net (Postfix) with ESMTPSA id BE5D0200002 for <39798@debbugs.gnu.org>; Wed, 26 Feb 2020 11:46:26 +0000 (UTC) From: Pierre Neidhardt Date: Wed, 26 Feb 2020 12:46:04 +0100 Message-Id: <20200226114605.15106-12-mail@ambrevar.xyz> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200226114605.15106-1-mail@ambrevar.xyz> References: <20200226114605.15106-1-mail@ambrevar.xyz> MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/haskell-xyz.scm (ghc-pandoc): Update to 2.9.2. * gnu/local.mk: Remove obsolete ghc-pandoc patches. * gnu/packages/patches/ghc-pandoc-fix-html-tests.patch: Remove file. * gnu/packages/patches/ghc-pandoc-fix-latex-test.patch: Remove file. --- gnu/local.mk | 2 - gnu/packages/haskell-xyz.scm | 9 +- .../patches/ghc-pandoc-fix-html-tests.patch | 92 ------------------- .../patches/ghc-pandoc-fix-latex-test.patch | 31 ------- 4 files changed, 5 insertions(+), 129 deletions(-) delete mode 100644 gnu/packages/patches/ghc-pandoc-fix-html-tests.patch delete mode 100644 gnu/packages/patches/ghc-pandoc-fix-latex-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 857345cfad..edf1d18537 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -917,8 +917,6 @@ dist_patch_DATA = \ %D%/packages/patches/ghc-hpack-fix-tests.patch \ %D%/packages/patches/ghc-microlens-aeson-fix-tests.patch \ %D%/packages/patches/ghc-monad-par-fix-tests.patch \ - %D%/packages/patches/ghc-pandoc-fix-html-tests.patch \ - %D%/packages/patches/ghc-pandoc-fix-latex-test.patch \ %D%/packages/patches/ghostscript-no-header-id.patch \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index b80e19deef..d5084d6aa0 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8306,17 +8306,15 @@ code. It was designed for use in @code{Pandoc}.") (define-public ghc-pandoc (package (name "ghc-pandoc") - (version "2.7.3") + (version "2.9.2") (source (origin (method url-fetch) (uri (string-append "https://hackage.haskell.org/package/pandoc/pandoc-" version ".tar.gz")) - (patches (search-patches "ghc-pandoc-fix-html-tests.patch" - "ghc-pandoc-fix-latex-test.patch")) (sha256 (base32 - "0dpjrr40h54cljzhvixyym07z792a9izg6b9dmqpjlgcg4rj0xx8")))) + "1f9wbwzv6c3dlsn15iydh921icjqj7kjgrb726kqmj5gmaypc39j")))) (build-system haskell-build-system) (inputs `(("ghc-aeson" ,ghc-aeson) @@ -8327,7 +8325,9 @@ code. It was designed for use in @code{Pandoc}.") ("ghc-cmark-gfm" ,ghc-cmark-gfm) ("ghc-data-default" ,ghc-data-default) ("ghc-diff" ,ghc-diff) + ("ghc-doclayout" ,ghc-doclayout) ("ghc-doctemplates" ,ghc-doctemplates) + ("ghc-emojis" ,ghc-emojis) ("ghc-executable-path" ,ghc-executable-path) ("ghc-glob" ,ghc-glob) ("ghc-haddock-library" ,ghc-haddock-library) @@ -8340,6 +8340,7 @@ code. It was designed for use in @code{Pandoc}.") ("ghc-http-client-tls" ,ghc-http-client-tls) ("ghc-http-types" ,ghc-http-types) ("ghc-ipynb" ,ghc-ipynb) + ("ghc-jira-wiki-markup" ,ghc-jira-wiki-markup) ("ghc-juicypixels" ,ghc-juicypixels) ("ghc-network" ,ghc-network) ("ghc-network-uri" ,ghc-network-uri) diff --git a/gnu/packages/patches/ghc-pandoc-fix-html-tests.patch b/gnu/packages/patches/ghc-pandoc-fix-html-tests.patch deleted file mode 100644 index b624ff9e9e..0000000000 --- a/gnu/packages/patches/ghc-pandoc-fix-html-tests.patch +++ /dev/null @@ -1,92 +0,0 @@ -This patch is taken from upstream. It fixes two HTML tests that are broken -due to using a Skylighting version greater than or equal to 0.8.2. - -From 968d2046a3cb6db661673be580660ac402753c34 Mon Sep 17 00:00:00 2001 -From: John MacFarlane -Date: Sun, 14 Jul 2019 10:48:14 -0700 -Subject: [PATCH] Update test for new skylighting. - ---- - test/lhs-test.html | 13 ++++++------- - test/lhs-test.html+lhs | 13 ++++++------- - 2 files changed, 12 insertions(+), 14 deletions(-) - -diff --git a/test/lhs-test.html b/test/lhs-test.html -index 6685555f4..446dd3d95 100644 ---- a/test/lhs-test.html -+++ b/test/lhs-test.html -@@ -12,19 +12,18 @@ - div.column{display: inline-block; vertical-align: top; width: 50%;} - - -