From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 26 06:34:59 2020 Received: (at submit) by debbugs.gnu.org; 26 Feb 2020 11:35:00 +0000 Received: from localhost ([127.0.0.1]:56469 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6uxt-0004KG-PQ for submit@debbugs.gnu.org; Wed, 26 Feb 2020 06:34:59 -0500 Received: from lists.gnu.org ([209.51.188.17]:52877) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6uxp-0004K7-Pl for submit@debbugs.gnu.org; Wed, 26 Feb 2020 06:34:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54807) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6uxo-00077v-Lr for guix-patches@gnu.org; Wed, 26 Feb 2020 06:34:53 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.1 required=5.0 tests=BAYES_50,RCVD_IN_DNSWL_LOW, URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6uxj-0003IV-M9 for guix-patches@gnu.org; Wed, 26 Feb 2020 06:34:51 -0500 Received: from relay12.mail.gandi.net ([217.70.178.232]:41467) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j6uxj-0003CX-En for guix-patches@gnu.org; Wed, 26 Feb 2020 06:34:47 -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 A26D3200004 for ; Wed, 26 Feb 2020 11:34:42 +0000 (UTC) From: Pierre Neidhardt To: guix-patches@gnu.org Subject: [PATCH 00/13] Update Pandoc. Date: Wed, 26 Feb 2020 12:34:42 +0100 Message-Id: <20200226113442.9798-1-mail@ambrevar.xyz> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.70.178.232 X-Spam-Score: 1.4 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Update ghc-pandoc to 2.92 and rename it to pandoc. This closes bug 33844. Questions: - Should this go on staging? It rebuilds a few hundred packages, maybe less than 300. - I'm not 100% sure that updating the Haskell libraries didn't break anything. I guess the continuous integration [...] Content analysis details: (1.4 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: local.mk] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [209.51.188.17 listed in list.dnswl.org] 0.7 SPF_NEUTRAL SPF: sender does not match SPF record (neutral) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.5 FROM_SUSPICIOUS_NTLD From abused NTLD 1.0 FROM_SUSPICIOUS_NTLD_FP From abused NTLD X-Debbugs-Envelope-To: submit 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: -0.5 (/) Update ghc-pandoc to 2.92 and rename it to pandoc. This closes bug 33844. Questions: - Should this go on staging? It rebuilds a few hundred packages, maybe less than 300. - I'm not 100% sure that updating the Haskell libraries didn't break anything. I guess the continuous integration will tell us. - 3-4 libraries seemed to have many dependents and updating them would break stuff, so instead I created a versioned package, e.g. ghc-regex-base-0.94. Is this OK? Is there a best practice here? Pierre Neidhardt (13): gnu: ghc-hsyaml: Update to 0.2.1.0. gnu: ghc-doctemplates: Update to 0.8.1. gnu: Add ghc-regex-base-0.94. gnu: ghc-regex-pcre-builtin: Update to 0.95.1.1.8.43. gnu: ghc-skylighting-core: Update to 0.8.3.2. gnu: ghc-skylighting: Update to 0.8.3.2. gnu: ghc-pandoc-types: Update to 1.20. gnu: ghc-texmath: Update to 0.12.0.1. gnu: Add ghc-base-compat-0.11. gnu: Add ghc-optparse-applicative-0.15. gnu: ghc-haddock-library: Update to 1.8.0. gnu: ghc-pandoc: Update to 2.9.2. gnu: ghc-pandoc: Rename to pandoc. gnu/local.mk | 2 - gnu/packages/haskell-xyz.scm | 130 ++++++++++++------ .../patches/ghc-pandoc-fix-html-tests.patch | 92 ------------- .../patches/ghc-pandoc-fix-latex-test.patch | 31 ----- 4 files changed, 89 insertions(+), 166 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 -- 2.25.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 26 06:46:17 2020 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 To: 39798@debbugs.gnu.org Subject: [PATCH 01/13] gnu: ghc-hsyaml: Update to 0.2.1.0. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.8 (/) X-Debbugs-Envelope-To: 39798 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: -1.2 (-) * 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 -- 2.25.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 26 06:46:18 2020 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 To: 39798@debbugs.gnu.org Subject: [PATCH 02/13] gnu: ghc-doctemplates: Update to 0.8.1. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 39798 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: -1.2 (-) * 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 -- 2.25.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 26 06:46:21 2020 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 To: 39798@debbugs.gnu.org Subject: [PATCH 03/13] gnu: Add ghc-regex-base-0.94. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 39798 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: -1.2 (-) * 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") -- 2.25.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 26 06:46:25 2020 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 To: 39798@debbugs.gnu.org Subject: [PATCH 05/13] gnu: ghc-skylighting-core: Update to 0.8.3.2. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 39798 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: -1.2 (-) * 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) -- 2.25.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 26 06:46:29 2020 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 To: 39798@debbugs.gnu.org Subject: [PATCH 08/13] gnu: ghc-texmath: Update to 0.12.0.1. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 39798 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: -1.2 (-) * 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) -- 2.25.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 26 06:46:30 2020 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 To: 39798@debbugs.gnu.org Subject: [PATCH 06/13] gnu: ghc-skylighting: Update to 0.8.3.2. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 39798 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: -1.2 (-) * 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))))) -- 2.25.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 26 06:46:30 2020 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 To: 39798@debbugs.gnu.org Subject: [PATCH 10/13] gnu: Add ghc-optparse-applicative-0.15. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 39798 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: -1.2 (-) * 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") -- 2.25.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 26 06:46:30 2020 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 To: 39798@debbugs.gnu.org Subject: [PATCH 11/13] gnu: ghc-haddock-library: Update to 1.8.0. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 39798 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: -1.2 (-) * 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))) -- 2.25.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 26 06:46:37 2020 Received: (at 39798) by debbugs.gnu.org; 26 Feb 2020 11:46:37 +0000 Received: from localhost ([127.0.0.1]:56513 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j6v9A-0004f5-PC for submit@debbugs.gnu.org; Wed, 26 Feb 2020 06:46:37 -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 1j6v92-0004dF-80 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 72BE4200007 for <39798@debbugs.gnu.org>; Wed, 26 Feb 2020 11:46:27 +0000 (UTC) From: Pierre Neidhardt To: 39798@debbugs.gnu.org Subject: [PATCH 13/13] gnu: ghc-pandoc: Rename to pandoc. Date: Wed, 26 Feb 2020 12:46:05 +0100 Message-Id: <20200226114605.15106-13-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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 39798 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: -1.2 (-) * gnu/packages/haskell-xyz.scm (ghc-pandoc): Deprecate. (pandoc): New variable. --- gnu/packages/haskell-xyz.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index d5084d6aa0..a7ba7c5fb2 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -8303,9 +8303,9 @@ with several features not present in pretty-printing libraries designed for code. It was designed for use in @code{Pandoc}.") (license license:bsd-3))) -(define-public ghc-pandoc +(define-public pandoc (package - (name "ghc-pandoc") + (name "pandoc") (version "2.9.2") (source (origin @@ -8381,6 +8381,9 @@ definition lists, tables, and other features. A compatibility mode is provided for those who need a drop-in replacement for Markdown.pl.") (license license:gpl2+))) +(define-public ghc-pandoc + (deprecated-package "ghc-pandoc" pandoc)) + (define-public ghc-pandoc-citeproc (package (name "ghc-pandoc-citeproc") -- 2.25.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 26 06:46:37 2020 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 To: 39798@debbugs.gnu.org Subject: [PATCH 07/13] gnu: ghc-pandoc-types: Update to 1.20. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 39798 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: -1.2 (-) * 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) -- 2.25.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 26 06:46:37 2020 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 To: 39798@debbugs.gnu.org Subject: [PATCH 09/13] gnu: Add ghc-base-compat-0.11. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 39798 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: -1.2 (-) * 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") -- 2.25.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 26 06:46:40 2020 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 To: 39798@debbugs.gnu.org Subject: [PATCH 12/13] gnu: ghc-pandoc: Update to 2.9.2. 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 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.2 (/) X-Debbugs-Envelope-To: 39798 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: -1.2 (-) * 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%;} - - -