From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#39798] [PATCH 12/13] gnu: ghc-pandoc: Update to 2.9.2. Resent-Message-ID: From: Pierre Neidhardt Date: Wed, 26 Feb 2020 12:46:04 +0100 Message-Id: <20200226114605.15106-12-mail@ambrevar.xyz> In-Reply-To: <20200226114605.15106-1-mail@ambrevar.xyz> References: <20200226114605.15106-1-mail@ambrevar.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39798@debbugs.gnu.org * 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%;} - - -