Commit c30466e7 authored by Ryan Scott's avatar Ryan Scott

Migrate patches to latest Hackage versions

parent 76f9ba89
Pipeline #8862 passed with stages
in 55 minutes and 58 seconds
commit 07cfab73b53324a8459148a61b37e92c002e9b37
Author: Ryan Scott <ryan.gl.scott@gmail.com>
Date: Fri May 17 13:30:53 2019 -0400
Fix https://github.com/kcsongor/generic-lens/issues/84
diff --git a/src/Data/Generics/Product/Any.hs b/src/Data/Generics/Product/Any.hs
index cc90fc0..e78bcf9 100644
--- a/src/Data/Generics/Product/Any.hs
+++ b/src/Data/Generics/Product/Any.hs
@@ -53,7 +53,7 @@ import Data.Generics.Product.Typed
diff -ru generic-lens-1.2.0.0.orig/src/Data/Generics/Product/Any.hs generic-lens-1.2.0.0/src/Data/Generics/Product/Any.hs
--- generic-lens-1.2.0.0.orig/src/Data/Generics/Product/Any.hs 2001-09-08 21:46:40.000000000 -0400
+++ generic-lens-1.2.0.0/src/Data/Generics/Product/Any.hs 2019-07-27 09:36:08.986915947 -0400
@@ -53,7 +53,7 @@
-- human = Human "Tunyasz" 50 "London"
-- :}
......@@ -17,11 +10,10 @@ index cc90fc0..e78bcf9 100644
-- |A lens that focuses on a part of a product as identified by some
-- selector. Currently supported selectors are field names, positions and
-- unique types. Compatible with the lens package's 'Control.Lens.Lens'
diff --git a/src/Data/Generics/Sum/Any.hs b/src/Data/Generics/Sum/Any.hs
index cefb67a..478ef5b 100644
--- a/src/Data/Generics/Sum/Any.hs
+++ b/src/Data/Generics/Sum/Any.hs
@@ -61,7 +61,7 @@ import Data.Generics.Internal.VL.Prism
diff -ru generic-lens-1.2.0.0.orig/src/Data/Generics/Sum/Any.hs generic-lens-1.2.0.0/src/Data/Generics/Sum/Any.hs
--- generic-lens-1.2.0.0.orig/src/Data/Generics/Sum/Any.hs 2001-09-08 21:46:40.000000000 -0400
+++ generic-lens-1.2.0.0/src/Data/Generics/Sum/Any.hs 2019-07-27 09:36:08.986915947 -0400
@@ -61,7 +61,7 @@
-- :}
-- |Sums that have generic prisms.
......
This diff is collapsed.
commit 628b9f79437644aaad2fe486171c6a8e957099d3
commit 903c71c943fb8848b8a9b3fa903bd0e7edd7f89c
Author: Ryan Scott <ryan.gl.scott@gmail.com>
Date: Fri May 17 14:15:54 2019 -0400
Date: Sat Jul 27 09:37:03 2019 -0400
Adapt to base-4.13.0.0
diff --git a/src/Text/Pandoc/Class.hs b/src/Text/Pandoc/Class.hs
index fb3cfa72a..b924d51dc 100644
index 8d9caa6e8..c87ff648b 100644
--- a/src/Text/Pandoc/Class.hs
+++ b/src/Text/Pandoc/Class.hs
@@ -981,7 +981,7 @@ instance PandocMonad PandocPure where
......@@ -18,7 +18,7 @@ index fb3cfa72a..b924d51dc 100644
readFileLazy fp = do
fps <- getsPureState stFiles
diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs
index c3469b22b..364a6f473 100644
index ab5aa6b05..e245aee6d 100644
--- a/src/Text/Pandoc/Readers/Markdown.hs
+++ b/src/Text/Pandoc/Readers/Markdown.hs
@@ -260,7 +260,7 @@ yamlBsToMeta bstr = do
......@@ -44,10 +44,10 @@ index a7b9ee621..c38ffc3d5 100644
(findEntryByPath path arch `mplus` findEntryByPath path distArchive)
docPropsAppEntry <- entryFromArchive refArchive "docProps/app.xml"
diff --git a/src/Text/Pandoc/Writers/Muse.hs b/src/Text/Pandoc/Writers/Muse.hs
index ae23a4f9b..32244dd94 100644
index c03fd0c1a..f297f0832 100644
--- a/src/Text/Pandoc/Writers/Muse.hs
+++ b/src/Text/Pandoc/Writers/Muse.hs
@@ -614,7 +614,7 @@ inlineToMuse (Subscript lst) = do
@@ -605,7 +605,7 @@ inlineToMuse (Subscript lst) = do
modify $ \st -> st { stUseTags = False }
return $ "<sub>" <> contents <> "</sub>"
inlineToMuse SmallCaps {} =
......@@ -56,7 +56,7 @@ index ae23a4f9b..32244dd94 100644
inlineToMuse (Quoted SingleQuote lst) = do
contents <- inlineListToMuse lst
modify $ \st -> st { stUseTags = False }
@@ -624,7 +624,7 @@ inlineToMuse (Quoted DoubleQuote lst) = do
@@ -615,7 +615,7 @@ inlineToMuse (Quoted DoubleQuote lst) = do
modify $ \st -> st { stUseTags = False }
return $ "“" <> contents <> "”"
inlineToMuse Cite {} =
......@@ -65,7 +65,7 @@ index ae23a4f9b..32244dd94 100644
inlineToMuse (Code _ str) = do
useTags <- gets stUseTags
modify $ \st -> st { stUseTags = False }
@@ -632,7 +632,7 @@ inlineToMuse (Code _ str) = do
@@ -623,7 +623,7 @@ inlineToMuse (Code _ str) = do
then "<code>" <> text (substitute "</code>" "<</code><code>/code>" str) <> "</code>"
else "=" <> text str <> "="
inlineToMuse Math{} =
......
diff -ru persistent-template-2.7.1.orig/Database/Persist/TH.hs persistent-template-2.7.1/Database/Persist/TH.hs
--- persistent-template-2.7.1.orig/Database/Persist/TH.hs 2019-05-06 21:35:33.000000000 -0400
+++ persistent-template-2.7.1/Database/Persist/TH.hs 2019-05-11 09:02:38.170979008 -0400
@@ -503,8 +503,14 @@
diff -ru persistent-template-2.7.2.orig/Database/Persist/TH.hs persistent-template-2.7.2/Database/Persist/TH.hs
--- persistent-template-2.7.2.orig/Database/Persist/TH.hs 2019-07-17 09:42:19.000000000 -0400
+++ persistent-template-2.7.2/Database/Persist/TH.hs 2019-07-27 09:12:53.021835613 -0400
@@ -518,8 +518,14 @@
uniqueTypeDec :: MkPersistSettings -> EntityDef -> Dec
uniqueTypeDec mps t =
......@@ -17,7 +17,7 @@ diff -ru persistent-template-2.7.1.orig/Database/Persist/TH.hs persistent-templa
Nothing
(map (mkUnique mps t) $ entityUniques t)
(derivClause $ entityUniques t)
@@ -766,7 +772,12 @@
@@ -781,7 +787,12 @@
bi <- backendKeyI
return (bi, allInstances)
......@@ -31,7 +31,7 @@ diff -ru persistent-template-2.7.1.orig/Database/Persist/TH.hs persistent-templa
cxti <- mapM conT i
let kd = if useNewtype
then NewtypeInstD [] k [recordType] Nothing dec [DerivClause Nothing cxti]
@@ -1053,19 +1064,34 @@
@@ -1068,19 +1079,34 @@
, puk
, DataInstD
[]
......
diff -ru skylighting-core-0.7.7.orig/src/Skylighting/Regex.hs skylighting-core-0.7.7/src/Skylighting/Regex.hs
--- skylighting-core-0.7.7.orig/src/Skylighting/Regex.hs 2019-02-28 01:12:37.000000000 -0500
+++ skylighting-core-0.7.7/src/Skylighting/Regex.hs 2019-05-17 14:07:17.266167167 -0400
diff -ru skylighting-core-0.8.2.orig/src/Skylighting/Regex.hs skylighting-core-0.8.2/src/Skylighting/Regex.hs
--- skylighting-core-0.8.2.orig/src/Skylighting/Regex.hs 2019-07-14 12:56:37.000000000 -0400
+++ skylighting-core-0.8.2/src/Skylighting/Regex.hs 2019-07-27 09:30:40.211827426 -0400
@@ -12,6 +12,7 @@
, convertOctalEscapes
) where
......@@ -9,7 +9,7 @@ diff -ru skylighting-core-0.7.7.orig/src/Skylighting/Regex.hs skylighting-core-0
import qualified Control.Exception as E
import Data.Aeson
import Data.Binary (Binary)
@@ -102,5 +103,5 @@
@@ -103,5 +104,5 @@
encodeToText :: BS.ByteString -> Text.Text
encodeToText = TE.decodeUtf8 . Base64.encode
......
cabal-version: 1.12
-- This file has been generated from package.yaml by hpack version 0.31.1.
--
-- see: https://github.com/sol/hpack
--
-- hash: 5c038df3338fc7661664ddc082dde9288b48c1153a7680a63b2aed528590535e
name: store
version: 0.5.1.0
x-revision: 1
synopsis: Fast binary serialization
category: Serialization, Data
homepage: https://github.com/fpco/store#readme
bug-reports: https://github.com/fpco/store/issues
maintainer: Michael Sloan <sloan@fpcomplete.com>
copyright: 2016 FP Complete
license: MIT
license-file: LICENSE
build-type: Simple
extra-source-files:
ChangeLog.md
README.md
source-repository head
type: git
location: https://github.com/fpco/store
flag comparison-bench
manual: True
default: False
flag small-bench
manual: True
default: False
library
exposed-modules:
Data.Store
Data.Store.Internal
Data.Store.TH
Data.Store.TH.Internal
Data.Store.TypeHash
Data.Store.TypeHash.Internal
Data.Store.Version
System.IO.ByteBuffer
other-modules:
Data.Store.Impl
hs-source-dirs:
src
ghc-options: -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns -fwarn-incomplete-record-updates -O2
build-depends:
array >=0.5.0.0
, async >=2.0.2
, base >=4.7 && <5
, base-orphans >=0.4.3
, base64-bytestring >=0.1.1
, bifunctors >=4.0
, bytestring >=0.10.4.0
, containers >=0.5.5.1
, contravariant >=1.3
, cryptohash >=0.11.6
, deepseq >=1.3.0.2
, directory >=1.2
, filepath >=1.3
, free >=4.11
, ghc-prim >=0.3.1.0
, hashable >=1.2.3.1
, hspec >=2.1.2
, hspec-smallcheck >=0.3.0
, integer-gmp >=0.5.1.0
, lifted-base >=0.2.3.3
, monad-control >=0.3.3.0
, mono-traversable >=0.7.0
, network >=2.6.0.2
, primitive >=0.6
, resourcet >=1.1.3.3
, safe >=0.3.8
, semigroups >=0.8
, smallcheck >=1.1.1
, store-core >=0.4 && <0.5
, syb >=0.4.4
, template-haskell >=2.11.0.0 && < 2.15
, text >=1.2.0.4
, th-lift >=0.7.1
, th-lift-instances >=0.1.4
, th-orphans >=0.12.2
, th-reify-many >=0.1.6
, th-utilities >=0.2
, time >=1.4.2
, transformers >=0.3.0.0
, unordered-containers >=0.2.5.1
, vector >=0.10.12.3
, void >=0.5.11
default-language: Haskell2010
test-suite store-test
type: exitcode-stdio-1.0
main-is: Spec.hs
other-modules:
Data.Store.UntrustedSpec
Data.StoreSpec
Data.StoreSpec.TH
System.IO.ByteBufferSpec
hs-source-dirs:
test
ghc-options: -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns -fwarn-incomplete-record-updates -O2 -threaded -rtsopts -with-rtsopts=-N
build-depends:
array >=0.5.0.0
, async >=2.0.2
, base >=4.7 && <5
, base-orphans >=0.4.3
, base64-bytestring >=0.1.1
, bifunctors >=4.0
, bytestring >=0.10.4.0
, clock >=0.3
, containers >=0.5.5.1
, contravariant >=1.3
, cryptohash >=0.11.6
, deepseq >=1.3.0.2
, directory >=1.2
, filepath >=1.3
, free >=4.11
, ghc-prim >=0.3.1.0
, hashable >=1.2.3.1
, hspec >=2.1.2
, hspec-smallcheck >=0.3.0
, integer-gmp >=0.5.1.0
, lifted-base >=0.2.3.3
, monad-control >=0.3.3.0
, mono-traversable >=0.7.0
, network >=2.6.0.2
, primitive >=0.6
, resourcet >=1.1.3.3
, safe >=0.3.8
, semigroups >=0.8
, smallcheck >=1.1.1
, store
, store-core >=0.4 && <0.5
, syb >=0.4.4
, template-haskell >=2.9.0.0
, text >=1.2.0.4
, th-lift >=0.7.1
, th-lift-instances >=0.1.4
, th-orphans >=0.12.2
, th-reify-many >=0.1.6
, th-utilities >=0.2
, time >=1.4.2
, transformers >=0.3.0.0
, unordered-containers >=0.2.5.1
, vector >=0.10.12.3
, void >=0.5.11
default-language: Haskell2010
benchmark store-bench
type: exitcode-stdio-1.0
main-is: Bench.hs
other-modules:
Paths_store
hs-source-dirs:
bench
ghc-options: -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns -fwarn-incomplete-record-updates -O2 -threaded -rtsopts -with-rtsopts=-N1 -with-rtsopts=-s -with-rtsopts=-qg
build-depends:
array >=0.5.0.0
, async >=2.0.2
, base >=4.7 && <5
, base-orphans >=0.4.3
, base64-bytestring >=0.1.1
, bifunctors >=4.0
, bytestring >=0.10.4.0
, containers >=0.5.5.1
, contravariant >=1.3
, criterion
, cryptohash >=0.11.6
, deepseq >=1.3.0.2
, directory >=1.2
, filepath >=1.3
, free >=4.11
, ghc-prim >=0.3.1.0
, hashable >=1.2.3.1
, hspec >=2.1.2
, hspec-smallcheck >=0.3.0
, integer-gmp >=0.5.1.0
, lifted-base >=0.2.3.3
, monad-control >=0.3.3.0
, mono-traversable >=0.7.0
, network >=2.6.0.2
, primitive >=0.6
, resourcet >=1.1.3.3
, safe >=0.3.8
, semigroups >=0.8
, smallcheck >=1.1.1
, store
, store-core >=0.4 && <0.5
, syb >=0.4.4
, template-haskell >=2.9.0.0
, text >=1.2.0.4
, th-lift >=0.7.1
, th-lift-instances >=0.1.4
, th-orphans >=0.12.2
, th-reify-many >=0.1.6
, th-utilities >=0.2
, time >=1.4.2
, transformers >=0.3.0.0
, unordered-containers >=0.2.5.1
, vector >=0.10.12.3
, void >=0.5.11
if flag(comparison-bench)
cpp-options: -DCOMPARISON_BENCH
build-depends:
binary
, cereal
, cereal-vector
, vector-binary-instances
if flag(small-bench)
cpp-options: -DSMALL_BENCH
default-language: Haskell2010
benchmark store-weigh
type: exitcode-stdio-1.0
main-is: Allocations.hs
hs-source-dirs:
test
ghc-options: -Wall -fwarn-tabs -fwarn-incomplete-uni-patterns -fwarn-incomplete-record-updates -O2 -threaded -rtsopts -with-rtsopts=-N -with-rtsopts=-T -O2
build-depends:
array >=0.5.0.0
, async >=2.0.2
, base >=4.7 && <5
, base-orphans >=0.4.3
, base64-bytestring >=0.1.1
, bifunctors >=4.0
, bytestring >=0.10.4.0
, cereal
, cereal-vector
, containers >=0.5.5.1
, contravariant >=1.3
, criterion
, cryptohash >=0.11.6
, deepseq >=1.3.0.2
, directory >=1.2
, filepath >=1.3
, free >=4.11
, ghc-prim >=0.3.1.0
, hashable >=1.2.3.1
, hspec >=2.1.2
, hspec-smallcheck >=0.3.0
, integer-gmp >=0.5.1.0
, lifted-base >=0.2.3.3
, monad-control >=0.3.3.0
, mono-traversable >=0.7.0
, network >=2.6.0.2
, primitive >=0.6
, resourcet >=1.1.3.3
, safe >=0.3.8
, semigroups >=0.8
, smallcheck >=1.1.1
, store
, store-core >=0.4 && <0.5
, syb >=0.4.4
, template-haskell >=2.9.0.0
, text >=1.2.0.4
, th-lift >=0.7.1
, th-lift-instances >=0.1.4
, th-orphans >=0.12.2
, th-reify-many >=0.1.6
, th-utilities >=0.2
, time >=1.4.2
, transformers >=0.3.0.0
, unordered-containers >=0.2.5.1
, vector >=0.10.12.3
, vector-binary-instances
, void >=0.5.11
, weigh
default-language: Haskell2010
diff -ru store-0.5.1.0.orig/src/Data/Store/TH/Internal.hs store-0.5.1.0/src/Data/Store/TH/Internal.hs
--- store-0.5.1.0.orig/src/Data/Store/TH/Internal.hs 2019-04-24 14:58:44.000000000 -0400
+++ store-0.5.1.0/src/Data/Store/TH/Internal.hs 2019-05-11 08:56:43.536046269 -0400
diff -ru store-0.5.1.2.orig/src/Data/Store/TH/Internal.hs store-0.5.1.2/src/Data/Store/TH/Internal.hs
--- store-0.5.1.2.orig/src/Data/Store/TH/Internal.hs 2019-07-06 22:55:51.000000000 -0400
+++ store-0.5.1.2/src/Data/Store/TH/Internal.hs 2019-07-27 09:31:17.024174416 -0400
@@ -363,7 +363,14 @@
FamilyI _ insts <- reify ''UV.Vector
return (map (everywhere (id `extT` dequalVarT) . go) insts)
......@@ -17,9 +17,9 @@ diff -ru store-0.5.1.0.orig/src/Data/Store/TH/Internal.hs store-0.5.1.0/src/Data
go (NewtypeInstD preds _ [ty] _ con _) = (preds, ty, conToDataCons con)
go (DataInstD preds _ [ty] _ cons _) = (preds, ty, concatMap conToDataCons cons)
#else
diff -ru store-0.5.1.0.orig/src/Data/Store/TH.hs store-0.5.1.0/src/Data/Store/TH.hs
--- store-0.5.1.0.orig/src/Data/Store/TH.hs 2019-04-24 14:58:44.000000000 -0400
+++ store-0.5.1.0/src/Data/Store/TH.hs 2019-05-11 08:56:43.536046269 -0400
diff -ru store-0.5.1.2.orig/src/Data/Store/TH.hs store-0.5.1.2/src/Data/Store/TH.hs
--- store-0.5.1.2.orig/src/Data/Store/TH.hs 2019-07-06 22:55:51.000000000 -0400
+++ store-0.5.1.2/src/Data/Store/TH.hs 2019-07-27 09:31:17.024174416 -0400
@@ -37,6 +37,7 @@
, assertRoundtrip
) where
......@@ -37,9 +37,9 @@ diff -ru store-0.5.1.0.orig/src/Data/Store/TH.hs store-0.5.1.0/src/Data/Store/TH
assertRoundtrip verbose x
| checkRoundtrip verbose x = return ()
| otherwise = fail $ "Failed to roundtrip " ++ show (typeOf x)
diff -ru store-0.5.1.0.orig/src/Data/Store/Version.hs store-0.5.1.0/src/Data/Store/Version.hs
--- store-0.5.1.0.orig/src/Data/Store/Version.hs 2019-04-24 14:58:44.000000000 -0400
+++ store-0.5.1.0/src/Data/Store/Version.hs 2019-05-11 08:56:43.536046269 -0400
diff -ru store-0.5.1.2.orig/src/Data/Store/Version.hs store-0.5.1.2/src/Data/Store/Version.hs
--- store-0.5.1.2.orig/src/Data/Store/Version.hs 2019-07-06 22:55:51.000000000 -0400
+++ store-0.5.1.2/src/Data/Store/Version.hs 2019-07-27 09:31:17.024174416 -0400
@@ -217,7 +217,7 @@
goField = do
s <- get
......@@ -49,9 +49,9 @@ diff -ru store-0.5.1.0.orig/src/Data/Store/Version.hs store-0.5.1.0/src/Data/Sto
(name:names) -> do
getStructureInfo' ignore renames (Proxy :: Proxy b)
s' <- get
diff -ru store-0.5.1.0.orig/src/System/IO/ByteBuffer.hs store-0.5.1.0/src/System/IO/ByteBuffer.hs
--- store-0.5.1.0.orig/src/System/IO/ByteBuffer.hs 2018-12-24 02:27:39.000000000 -0500
+++ store-0.5.1.0/src/System/IO/ByteBuffer.hs 2019-05-11 08:56:43.536046269 -0400
diff -ru store-0.5.1.2.orig/src/System/IO/ByteBuffer.hs store-0.5.1.2/src/System/IO/ByteBuffer.hs
--- store-0.5.1.2.orig/src/System/IO/ByteBuffer.hs 2019-07-06 22:55:51.000000000 -0400
+++ store-0.5.1.2/src/System/IO/ByteBuffer.hs 2019-07-27 09:31:17.024174416 -0400
@@ -43,6 +43,7 @@
import Control.Applicative
import Control.Exception (SomeException, throwIO)
......
diff -ru yaml-0.11.0.0.orig/src/Data/Yaml/Parser.hs yaml-0.11.0.0/src/Data/Yaml/Parser.hs
--- yaml-0.11.0.0.orig/src/Data/Yaml/Parser.hs 2018-10-12 02:00:28.000000000 -0400
+++ yaml-0.11.0.0/src/Data/Yaml/Parser.hs 2019-03-15 20:18:04.718999343 -0400
diff -ru yaml-0.11.1.0.orig/src/Data/Yaml/Parser.hs yaml-0.11.1.0/src/Data/Yaml/Parser.hs
--- yaml-0.11.1.0.orig/src/Data/Yaml/Parser.hs 2018-10-12 02:00:28.000000000 -0400
+++ yaml-0.11.1.0/src/Data/Yaml/Parser.hs 2019-07-27 09:12:43.669748494 -0400
@@ -7,6 +7,7 @@
import Control.Applicative
......@@ -20,9 +20,9 @@ diff -ru yaml-0.11.0.0.orig/src/Data/Yaml/Parser.hs yaml-0.11.0.0/src/Data/Yaml/
fail = YamlParser . const . Left . pack
instance MonadPlus YamlParser where
mzero = fail "mzero"
diff -ru yaml-0.11.0.0.orig/src/Data/Yaml.hs yaml-0.11.0.0/src/Data/Yaml.hs
--- yaml-0.11.0.0.orig/src/Data/Yaml.hs 2018-10-12 02:00:28.000000000 -0400
+++ yaml-0.11.0.0/src/Data/Yaml.hs 2019-03-15 20:17:18.483454743 -0400
diff -ru yaml-0.11.1.0.orig/src/Data/Yaml.hs yaml-0.11.1.0/src/Data/Yaml.hs
--- yaml-0.11.1.0.orig/src/Data/Yaml.hs 2018-10-12 02:00:28.000000000 -0400
+++ yaml-0.11.1.0/src/Data/Yaml.hs 2019-07-27 09:12:43.669748494 -0400
@@ -86,6 +86,7 @@
import Control.Applicative((<$>))
#endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment