From b97f549b14402421fcfb360ddd4cff7de93b9af0 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Mon, 20 Sep 2021 10:49:34 +0200 Subject: gnu: Update Haskell ecosystem. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump packages’ versions to the lastest Stackage or Hackage release. Since packages are interdependent, do so in a single commit. 525 packages have been updated. These packages have been removed, because they fail to build, have no newer version available and no dependencies: corrode ghc-easytest ghc-edisonapi ghc-edisoncore ghc-pandoc-types ghc-regex-tdfa-text These have been removed, because they are no longer required: ghc-happy-1.19.9 ghc-prettyprinter-1.6 ghc-protolude-0.3 ghc-pandoc-citeproc and pandoc-citeproc have been removed, because pandoc does not use them any more. Co-authored-by: Xinglu Chen --- .../patches/ghc-diff-swap-cover-args.patch | 20 --- .../patches/ghc-haddock-api-fix-haddock.patch | 54 ------ gnu/packages/patches/ghc-hpack-fix-tests.patch | 193 --------------------- .../ghc-language-haskell-extract-ghc-8.10.patch | 27 +++ .../patches/ghc-microlens-aeson-fix-tests.patch | 27 --- .../patches/ghc-pandoc-fix-html-tests.patch | 92 ---------- .../patches/ghc-pandoc-fix-latex-test.patch | 31 ---- .../patches/purescript-relax-dependencies.patch | 40 ----- 8 files changed, 27 insertions(+), 457 deletions(-) delete mode 100644 gnu/packages/patches/ghc-diff-swap-cover-args.patch delete mode 100644 gnu/packages/patches/ghc-haddock-api-fix-haddock.patch delete mode 100644 gnu/packages/patches/ghc-hpack-fix-tests.patch create mode 100644 gnu/packages/patches/ghc-language-haskell-extract-ghc-8.10.patch delete mode 100644 gnu/packages/patches/ghc-microlens-aeson-fix-tests.patch delete mode 100644 gnu/packages/patches/ghc-pandoc-fix-html-tests.patch delete mode 100644 gnu/packages/patches/ghc-pandoc-fix-latex-test.patch delete mode 100644 gnu/packages/patches/purescript-relax-dependencies.patch (limited to 'gnu/packages/patches') diff --git a/gnu/packages/patches/ghc-diff-swap-cover-args.patch b/gnu/packages/patches/ghc-diff-swap-cover-args.patch deleted file mode 100644 index 724416ff7a..0000000000 --- a/gnu/packages/patches/ghc-diff-swap-cover-args.patch +++ /dev/null @@ -1,20 +0,0 @@ -The QuickCheck library swapped the order of the arguments of the 'cover' -function in version 2.12. Version 0.3.4 of the Diff library still uses -the old argument order. Swapping the argument order makes Diff work -with newer versions of QuickCheck. - -See for the -upstream bug report. - -diff -ruN a/test/Test.hs b/test/Test.hs ---- a/test/Test.hs 2016-04-23 01:21:45.000000000 -0400 -+++ b/test/Test.hs 2019-11-01 19:13:04.590770903 -0400 -@@ -134,7 +134,7 @@ - prop_ppDiffR (DiffInput le ri) = - let haskDiff=ppDiff $ getGroupedDiff le ri - utilDiff= unsafePerformIO (runDiff (unlines le) (unlines ri)) -- in cover (haskDiff == utilDiff) 90 "exact match" $ -+ in cover 90 (haskDiff == utilDiff) "exact match" $ - classify (haskDiff == utilDiff) "exact match" - (div ((length haskDiff)*100) (length utilDiff) < 110) -- less than 10% bigger - where diff --git a/gnu/packages/patches/ghc-haddock-api-fix-haddock.patch b/gnu/packages/patches/ghc-haddock-api-fix-haddock.patch deleted file mode 100644 index 927cb5b366..0000000000 --- a/gnu/packages/patches/ghc-haddock-api-fix-haddock.patch +++ /dev/null @@ -1,54 +0,0 @@ -This patch is taken from upstream. It fixes documentation generation. -The patch has been lightly adapted to apply to the release tarball, but -the commit message was left untouched, so it refers to some changes not -included in the patch. - -From 0d9a81e20238a6b72f9f5c005f1f7e9cf05f6fb9 Mon Sep 17 00:00:00 2001 -From: Alec Theriault -Date: Sat, 27 Oct 2018 10:05:04 -0700 -Subject: [PATCH] Fix documentation in `haddock-api` (#957) - -* Fix misplaced Haddocks in Haddock itself - -Haddock should be able to generate documentation for 'haddock-api' -again. - -* Make CI check that documentation can be built. - -* Add back a doc that is OK ---- - .travis.yml | 3 +++ - haddock-api/src/Haddock/Backends/LaTeX.hs | 10 +++++----- - 2 files changed, 8 insertions(+), 5 deletions(-) - -diff --git a/src/Haddock/Backends/LaTeX.hs b/src/Haddock/Backends/LaTeX.hs -index 4e0e6eba..613c6deb 100644 ---- a/src/Haddock/Backends/LaTeX.hs -+++ b/src/Haddock/Backends/LaTeX.hs -@@ -243,8 +243,8 @@ ppDocGroup lev doc = sec lev <> braces doc - - -- | Given a declaration, extract out the names being declared - declNames :: LHsDecl DocNameI -- -> ( LaTeX -- ^ to print before each name in an export list -- , [DocName] -- ^ names being declared -+ -> ( LaTeX -- to print before each name in an export list -+ , [DocName] -- names being declared - ) - declNames (L _ decl) = case decl of - TyClD _ d -> (empty, [tcdName d]) -@@ -444,9 +444,9 @@ ppLPatSig doc docnames ty unicode - -- arguments as needed. - ppTypeOrFunSig :: HsType DocNameI - -> DocForDecl DocName -- ^ documentation -- -> ( LaTeX -- ^ first-line (no-argument docs only) -- , LaTeX -- ^ first-line (argument docs only) -- , LaTeX -- ^ type prefix (argument docs only) -+ -> ( LaTeX -- first-line (no-argument docs only) -+ , LaTeX -- first-line (argument docs only) -+ , LaTeX -- type prefix (argument docs only) - ) - -> Bool -- ^ unicode - -> LaTeX --- -2.23.0 - diff --git a/gnu/packages/patches/ghc-hpack-fix-tests.patch b/gnu/packages/patches/ghc-hpack-fix-tests.patch deleted file mode 100644 index 19aa762174..0000000000 --- a/gnu/packages/patches/ghc-hpack-fix-tests.patch +++ /dev/null @@ -1,193 +0,0 @@ -This patch is taken and adapted from upstream. It landed shortly after -the release of 0.31.2, and fixes eleven tests. The patch has been -lightly adapted to apply to the release tarball, but the commit message -was left untouched, so it refers to some changes not included in the -patch. - -From a8d9362d4b686074f698c04c20beea88587511a1 Mon Sep 17 00:00:00 2001 -From: quasicomputational -Date: Sat, 1 Jun 2019 15:11:31 +0100 -Subject: [PATCH] Make CI green (#345) - -* AppVeyor workaround for TMP issue - -https://github.com/commercialhaskell/stack/issues/3944 - -* Bump resolver to nightly-2018-12-12. - -This has the primary benefit of moving to GHC 8.6.3 and should fix -AppVeyor. - -* Add clock 0.8 as an extra-dep. - -* Adapt expected output to aeson 1.4.3.0. ---- - appveyor.yml | 3 +++ - hpack.cabal | 10 +++++----- - package.yaml | 2 +- - stack.yaml | 5 +++-- - test/Data/Aeson/Config/FromValueSpec.hs | 2 +- - test/Data/Aeson/Config/TypesSpec.hs | 2 +- - test/EndToEndSpec.hs | 8 ++++---- - test/Hpack/ConfigSpec.hs | 2 +- - test/Hpack/Syntax/DefaultsSpec.hs | 2 +- - test/Hpack/Syntax/DependenciesSpec.hs | 4 ++-- - 10 files changed, 22 insertions(+), 18 deletions(-) - -diff --git a/hpack.cabal b/hpack.cabal -index fedb9a8..4db3014 100644 ---- a/hpack.cabal -+++ b/hpack.cabal -@@ -1,10 +1,10 @@ - cabal-version: 1.12 - ---- This file has been generated from package.yaml by hpack version 0.31.0. -+-- This file has been generated from package.yaml by hpack version 0.31.2. - -- - -- see: https://github.com/sol/hpack - -- ---- hash: 3d060180293c32b8d0c25b710d0f419e96a6cc6ec3f95ac5e70bb77f44cbafc3 -+-- hash: bd5dd178c7e9f7f7a3456d79b592ea336c41ef43c9892354c001f06659e8b901 - - name: hpack - version: 0.31.2 -@@ -31,7 +31,7 @@ library - build-depends: - Cabal >=2.2 - , Glob >=0.9.0 -- , aeson >=1.2.1.0 -+ , aeson >=1.4.3.0 - , base >=4.9 && <5 - , bifunctors - , bytestring -@@ -87,7 +87,7 @@ executable hpack - build-depends: - Cabal >=2.2 - , Glob >=0.9.0 -- , aeson >=1.2.1.0 -+ , aeson >=1.4.3.0 - , base >=4.9 && <5 - , bifunctors - , bytestring -@@ -125,7 +125,7 @@ test-suite spec - , Glob >=0.9.0 - , HUnit >=1.6.0.0 - , QuickCheck -- , aeson >=1.2.1.0 -+ , aeson >=1.4.3.0 - , base >=4.9 && <5 - , bifunctors - , bytestring -diff --git a/test/Data/Aeson/Config/FromValueSpec.hs b/test/Data/Aeson/Config/FromValueSpec.hs -index 33de8b7..06b3eb9 100644 ---- a/test/Data/Aeson/Config/FromValueSpec.hs -+++ b/test/Data/Aeson/Config/FromValueSpec.hs -@@ -85,7 +85,7 @@ spec = do - [yaml| - name: "Joe" - age: "23" -- |] `shouldDecodeTo` left "Error while parsing $.age - expected Int, encountered String" -+ |] `shouldDecodeTo` left "Error while parsing $.age - parsing Int failed, expected Number, but encountered String" - - context "with (,)" $ do - it "captures unrecognized fields" $ do -diff --git a/test/Data/Aeson/Config/TypesSpec.hs b/test/Data/Aeson/Config/TypesSpec.hs -index c954534..472aa42 100644 ---- a/test/Data/Aeson/Config/TypesSpec.hs -+++ b/test/Data/Aeson/Config/TypesSpec.hs -@@ -13,7 +13,7 @@ spec = do - context "List" $ do - let - parseError :: String -> Result (List Int) -- parseError prefix = Left (prefix ++ " - expected Int, encountered String") -+ parseError prefix = Left (prefix ++ " - parsing Int failed, expected Number, but encountered String") - - context "when parsing single values" $ do - it "returns the value in a singleton list" $ do -diff --git a/test/EndToEndSpec.hs b/test/EndToEndSpec.hs -index 283c72c..46389ea 100644 ---- a/test/EndToEndSpec.hs -+++ b/test/EndToEndSpec.hs -@@ -285,7 +285,7 @@ spec = around_ (inTempDirectoryNamed "foo") $ do - path: defaults.yaml - ref: "2017" - library: {} -- |] `shouldFailWith` (file ++ ": Error while parsing $ - expected Object, encountered Array") -+ |] `shouldFailWith` (file ++ ": Error while parsing $ - expected Object, but encountered Array") - - it "warns on unknown fields" $ do - let file = joinPath ["defaults", "sol", "hpack-template", "2017", "defaults.yaml"] -@@ -340,7 +340,7 @@ spec = around_ (inTempDirectoryNamed "foo") $ do - it "rejects other values" $ do - [i| - version: {} -- |] `shouldFailWith` "package.yaml: Error while parsing $.version - expected Number or String, encountered Object" -+ |] `shouldFailWith` "package.yaml: Error while parsing $.version - expected Number or String, but encountered Object" - - describe "license" $ do - it "accepts cabal-style licenses" $ do -@@ -1363,14 +1363,14 @@ spec = around_ (inTempDirectoryNamed "foo") $ do - then: - dependencies: Win32 - else: null -- |] `shouldFailWith` "package.yaml: Error while parsing $.when.else - expected Object, encountered Null" -+ |] `shouldFailWith` "package.yaml: Error while parsing $.when.else - expected Object, but encountered Null" - - it "rejects invalid conditionals" $ do - [i| - dependencies: - - foo - - 23 -- |] `shouldFailWith` "package.yaml: Error while parsing $.dependencies[1] - expected Object or String, encountered Number" -+ |] `shouldFailWith` "package.yaml: Error while parsing $.dependencies[1] - expected Object or String, but encountered Number" - - it "warns on unknown fields" $ do - [i| -diff --git a/test/Hpack/ConfigSpec.hs b/test/Hpack/ConfigSpec.hs -index 9f4b279..69cbea1 100644 ---- a/test/Hpack/ConfigSpec.hs -+++ b/test/Hpack/ConfigSpec.hs -@@ -675,7 +675,7 @@ spec = do - it "rejects other values" $ do - [yaml| - 23 -- |] `shouldDecodeTo` (Left "Error while parsing $ - expected Boolean or String, encountered Number" :: Result Cond) -+ |] `shouldDecodeTo` (Left "Error while parsing $ - expected Boolean or String, but encountered Number" :: Result Cond) - - describe "formatOrList" $ do - it "formats a singleton list" $ do -diff --git a/test/Hpack/Syntax/DefaultsSpec.hs b/test/Hpack/Syntax/DefaultsSpec.hs -index 5875413..5438b7a 100644 ---- a/test/Hpack/Syntax/DefaultsSpec.hs -+++ b/test/Hpack/Syntax/DefaultsSpec.hs -@@ -151,4 +151,4 @@ spec = do - it "fails" $ do - [yaml| - 10 -- |] `shouldDecodeTo` left "Error while parsing $ - expected Object or String, encountered Number" -+ |] `shouldDecodeTo` left "Error while parsing $ - expected Object or String, but encountered Number" -diff --git a/test/Hpack/Syntax/DependenciesSpec.hs b/test/Hpack/Syntax/DependenciesSpec.hs -index 1a83732..d95044f 100644 ---- a/test/Hpack/Syntax/DependenciesSpec.hs -+++ b/test/Hpack/Syntax/DependenciesSpec.hs -@@ -125,7 +125,7 @@ spec = do - it "rejects invalid values" $ do - [yaml| - hpack: [] -- |] `shouldDecodeTo` left "Error while parsing $.hpack - expected Null, Object, Number, or String, encountered Array" -+ |] `shouldDecodeTo` left "Error while parsing $.hpack - expected Null, Object, Number, or String, but encountered Array" - - context "when the constraint is a Number" $ do - it "accepts 1" $ do -@@ -213,7 +213,7 @@ spec = do - [yaml| - foo: - version: {} -- |] `shouldDecodeTo` left "Error while parsing $.foo.version - expected Null, Number, or String, encountered Object" -+ |] `shouldDecodeTo` left "Error while parsing $.foo.version - expected Null, Number, or String, but encountered Object" - - it "accepts a string" $ do - [yaml| --- -2.23.0 - diff --git a/gnu/packages/patches/ghc-language-haskell-extract-ghc-8.10.patch b/gnu/packages/patches/ghc-language-haskell-extract-ghc-8.10.patch new file mode 100644 index 0000000000..a1358dec94 --- /dev/null +++ b/gnu/packages/patches/ghc-language-haskell-extract-ghc-8.10.patch @@ -0,0 +1,27 @@ +Compatibility with GHC 8.10 and template-haskell 2.16. + +Taken from +https://raw.githubusercontent.com/archlinux/svntogit-community/packages/haskell-language-haskell-extract/trunk/ghc-8.10.patch + +diff --git a/src/Language/Haskell/Extract.hs b/src/Language/Haskell/Extract.hs +index 3e8958b..43dfe04 100644 +--- a/src/Language/Haskell/Extract.hs ++++ b/src/Language/Haskell/Extract.hs +@@ -1,3 +1,4 @@ ++{-# LANGUAGE CPP #-} + module Language.Haskell.Extract ( + functionExtractor, + functionExtractorMap, +@@ -25,7 +26,11 @@ extractAllFunctions pattern = + functionExtractor :: String -> ExpQ + functionExtractor pattern = + do functions <- extractAllFunctions pattern +- let makePair n = TupE [ LitE $ StringL n , VarE $ mkName n] ++ let makePair n = TupE ++#if MIN_VERSION_template_haskell(2,16,0) ++ $ map Just ++#endif ++ [ LitE $ StringL n , VarE $ mkName n] + return $ ListE $ map makePair functions + + diff --git a/gnu/packages/patches/ghc-microlens-aeson-fix-tests.patch b/gnu/packages/patches/ghc-microlens-aeson-fix-tests.patch deleted file mode 100644 index c1ef6a837c..0000000000 --- a/gnu/packages/patches/ghc-microlens-aeson-fix-tests.patch +++ /dev/null @@ -1,27 +0,0 @@ -This patch fixes the test suite to allow any order when listing the -members of a JSON object. Aeson (being true to the JSON specification) -does not specify an order for objects. In practice, the order depends -on your processor architecture. - -See for a discussion resulting -in a similar patch fixing the Aeson tests. - -See for the -upstream bug report. - -diff -ruN a/test/Test.hs b/test/Test.hs ---- a/test/Test.hs 2018-12-31 15:10:50.000000000 -0500 -+++ b/test/Test.hs 2019-11-08 01:34:07.419706831 -0500 -@@ -48,8 +48,10 @@ - , testCase "" $ ("{\"a\": {}, \"b\": null}" ^? key (T.pack "b") . _Object) @?= Nothing - , testCase "" $ ("{\"a\": 100, \"b\": 200}" ^? key (T.pack "a")) @?= Just (Number 100.0) - , testCase "" $ ("[1,2,3]" ^? key (T.pack "a")) @?= Nothing -- , testCase "" $ ("{\"a\": 4, \"b\": 7}" ^.. members) @?= [Number 4.0,Number 7.0] -- , testCase "" $ ("{\"a\": 4, \"b\": 7}" & members . _Number %~ (* 10)) @?= "{\"a\":40,\"b\":70}" -+ , testCase "" $ assertBool "" (let x = ("{\"a\": 4, \"b\": 7}" ^.. members) -+ in x == [Number 4.0,Number 7.0] || x == [Number 7.0,Number 4.0]) -+ , testCase "" $ assertBool "" (let x = ("{\"a\": 4, \"b\": 7}" & members . _Number %~ (* 10)) -+ in x == "{\"a\":40,\"b\":70}" || x == "{\"b\":70,\"a\":40}") - , testCase "" $ ("[1,2,3]" ^? nth 1) @?= Just (Number 2.0) - , testCase "" $ ("{\"a\": 100, \"b\": 200}" ^? nth 1) @?= Nothing - , testCase "" $ ("[1,2,3]" & nth 1 .~ Number 20) @?= "[1,20,3]" 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%;} - - -