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%;} - - -