4a34e59...develop · patch

git.iko.soy/patch

on develop help sign in

.github/workflows/haskell.yml+1−1

since splitsnapshots

unifiedsplit

@@ -42,6 +42,6 @@ jobs:

42 - name: Build

43 run: cabal build --enable-tests --enable-benchmarks all

44 - name: Run tests

45− run: cabal test all

45+ run: cabal test --enable-tests all

46 - name: Build Docs

47 run: cabal haddock

.travis.ymldeleted−171

@@ -1,171 +0,0 @@

1−# This Travis job script has been generated by a script via

2−#

3−# haskell-ci '--config=cabal.haskell-ci' 'cabal.project'

4−#

5−# For more information, see https://github.com/haskell-CI/haskell-ci

6−#

7−# version: 0.3.20190814

8−#

9−language: c

10−dist: xenial

11−sudo: required

12−git:

13− # whether to recursively clone submodules

14− submodules: false

15−cache:

16− directories:

17− - $HOME/.cabal/packages

18− - $HOME/.cabal/store

19−before_cache:

20− - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log

21− # remove files that are regenerated by 'cabal update'

22− - rm -fv $CABALHOME/packages/hackage.haskell.org/00-index.*

23− - rm -fv $CABALHOME/packages/hackage.haskell.org/*.json

24− - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache

25− - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar

26− - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx

27− - rm -rfv $CABALHOME/packages/head.hackage

28−matrix:

29− include:

30− - compiler: ghcjs-8.4

31− addons: {"apt":{"sources":["hvr-ghc"],"packages":["cabal-install-3.0"]}}

32− - compiler: ghc-8.8.1

33− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}}

34− - compiler: ghc-8.6.5

35− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-2.4"]}}

36− - compiler: ghc-8.4.4

37− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-2.4"]}}

38− - compiler: ghc-8.2.2

39− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-2.4"]}}

40− - compiler: ghc-8.0.2

41− addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-2.4"]}}

42−before_install:

43− - |

44− if [ "$TRAVIS_OS_NAME" = "linux" ]; then

45− sudo add-apt-repository -y ppa:hvr/ghcjs;

46− curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | sudo apt-key add -

47− sudo apt-add-repository 'https://deb.nodesource.com/node_8.x xenial main'

48− sudo apt-get update;

49− sudo apt-get install $CC cabal-install-3.0 nodejs;

50− fi

51− - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')

52− - WITHCOMPILER="-w $HC"

53− - |

54− if echo $CC | grep -q ghcjs; then

55− GHCJS=true

56− HC=${HC}js

57− WITHCOMPILER="--ghcjs ${WITHCOMPILER}js"

58− else

59− GHCJS=false;

60− fi

61− - if $GHCJS ; then sudo apt-get install -y ghc-8.4.4 ; fi

62− - if $GHCJS ; then PATH="/opt/ghc/8.4.4/bin:$PATH" ; fi

63− - HCPKG="$HC-pkg"

64− - unset CC

65− - CABAL=/opt/ghc/bin/cabal

66− - CABALHOME=$HOME/.cabal

67− - export PATH="$CABALHOME/bin:$PATH"

68− - TOP=$(pwd)

69− - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"

70− - echo $HCNUMVER

71− - CABAL="$CABAL -vnormal+nowrap+markoutput"

72− - set -o pipefail

73− - |

74− echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk

75− echo 'BEGIN { state = "output"; }' >> .colorful.awk

76− echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk

77− echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk

78− echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk

79− echo ' if (state == "cabal") {' >> .colorful.awk

80− echo ' print blue($0)' >> .colorful.awk

81− echo ' } else {' >> .colorful.awk

82− echo ' print $0' >> .colorful.awk

83− echo ' }' >> .colorful.awk

84− echo '}' >> .colorful.awk

85− - cat .colorful.awk

86− - |

87− color_cabal_output () {

88− awk -f $TOP/.colorful.awk

89− }

90− - echo text | color_cabal_output

91−install:

92− - ${CABAL} --version

93− - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"

94− - node --version

95− - echo $GHCJS

96− - TEST=--enable-tests

97− - BENCH=--enable-benchmarks

98− - BENCH=--disable-benchmarks

99− - HEADHACKAGE=false

100− - rm -f $CABALHOME/config

101− - |

102− echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config

103− echo "remote-build-reporting: anonymous" >> $CABALHOME/config

104− echo "write-ghc-environment-files: always" >> $CABALHOME/config

105− echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config

106− echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config

107− echo "world-file: $CABALHOME/world" >> $CABALHOME/config

108− echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config

109− echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config

110− echo "installdir: $CABALHOME/bin" >> $CABALHOME/config

111− echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config

112− echo "store-dir: $CABALHOME/store" >> $CABALHOME/config

113− echo "install-dirs user" >> $CABALHOME/config

114− echo " prefix: $CABALHOME" >> $CABALHOME/config

115− echo "repository hackage.haskell.org" >> $CABALHOME/config

116− echo " url: http://hackage.haskell.org/" >> $CABALHOME/config

117− - cat $CABALHOME/config

118− - rm -fv cabal.project cabal.project.local cabal.project.freeze

119− - travis_retry ${CABAL} v2-update -v

120− - if $GHCJS ; then (cd /tmp && ${CABAL} v2-install -w ghc-8.4.4 happy) ; fi

121− # Generate cabal.project

122− - rm -rf cabal.project cabal.project.local cabal.project.freeze

123− - touch cabal.project

124− - |

125− echo "packages: ." >> cabal.project

126− - |

127− - cat cabal.project || true

128− - cat cabal.project.local || true

129− - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi

130− - ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output

131− - "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"

132− - rm cabal.project.freeze

133−script:

134− - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)

135− # Packaging...

136− - ${CABAL} v2-sdist all | color_cabal_output

137− # Unpacking...

138− - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/

139− - cd ${DISTDIR} || false

140− - find . -maxdepth 1 -type f -name '*.tar.gz' -exec tar -xvf '{}' \;

141− - find . -maxdepth 1 -type f -name '*.tar.gz' -exec rm '{}' \;

142− - PKGDIR_patch="$(find . -maxdepth 1 -type d -regex '.*/patch-[0-9.]*')"

143− # Generate cabal.project

144− - rm -rf cabal.project cabal.project.local cabal.project.freeze

145− - touch cabal.project

146− - |

147− echo "packages: ${PKGDIR_patch}" >> cabal.project

148− - |

149− - cat cabal.project || true

150− - cat cabal.project.local || true

151− # Building...

152− # this builds all libraries and executables (without tests/benchmarks)

153− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output

154− # Building with tests and benchmarks...

155− # build & run tests, build benchmarks

156− - ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output

157− # Testing...

158− - if ! $GHCJS ; then ${CABAL} v2-test $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output ; fi

159− # cabal check...

160− - (cd ${PKGDIR_patch} && ${CABAL} -vnormal check)

161− # haddock...

162− - if ! $GHCJS ; then ${CABAL} v2-haddock $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output ; fi

163− # Constraint sets

164− - rm -rf cabal.project.local

165− # Constraint set old-these

166− - if $GHCJS || ! $GHCJS && [ $HCNUMVER -lt 80800 ] ; then ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='these <1' all | color_cabal_output ; fi

167− # Constraint set old-witherable

168− - ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --constraint='witherable <0.3.2' all | color_cabal_output

169−

170−# REGENDATA ["--config=cabal.haskell-ci","cabal.project"]

171−# EOF

ChangeLog.md+13−8

@@ -2,6 +2,11 @@

3## Unreleased

5+* New dep of `data-orphans` for old GHC to get instances honestly instead of

6+ via `monoidal-containers`.

8+## 0.0.5.0 - 2021-12-17

5* `Additive` now lives in `Data.Semigroup.Additive`, but is still reexported

10* `Additive` now lives in `Data.Semigroup.Additive`, but is still reexported

6 from `Data.Patch` for compatability.

11 from `Data.Patch` for compatability.

@@ -11,25 +16,25 @@

11 There are complete constructor and field patterns too, and everything is

16 There are complete constructor and field patterns too, and everything is

12 exported under the newtype as real constructors and fields would be.

17 exported under the newtype as real constructors and fields would be.

14−## 0.0.4.0

19+## 0.0.4.0 - 2021-04-20

16* Enable PolyKinds

21* Enable PolyKinds

18−## 0.0.3.2

23+## 0.0.3.2 - 2020-11-06

20* Update version bounds

25* Update version bounds

22−## 0.0.3.1

27+## 0.0.3.1 - 2020-02-05

24* Replace `fromJust` with something easier to debug.

29* Replace `fromJust` with something easier to debug.

26−## 0.0.3.0

31+## 0.0.3.0 - 2020-02-05

28* Create `PatchMapWithPatchingMove` variant which supports moves with a patch.

33* Create `PatchMapWithPatchingMove` variant which supports moves with a patch.

30* Create `DecidablyEmpty` subclass of `Monoid`.

35* Create `DecidablyEmpty` subclass of `Monoid`.

32−## 0.0.2.0

37+## 0.0.2.0 - 2020-01-17

34* Consistently provide:

39* Consistently provide:

@@ -41,16 +46,16 @@

42 for `PatchMap`, `PatchIntMap`, and `PatchMapWithMove`.

47 for `PatchMap`, `PatchIntMap`, and `PatchMapWithMove`.

44−## 0.0.1.0

49+## 0.0.1.0 - 2020-01-09

46* Support older GHCs with `split-these` flag.

51* Support older GHCs with `split-these` flag.

48* Additional instances for the `Group` class for basic types.

53* Additional instances for the `Group` class for basic types.

50−## 0.0.0.1

55+## 0.0.0.1 - 2020-01-08

52* Remove unneeded dependencies

57* Remove unneeded dependencies

54−## 0.0.0.0

59+## 0.0.0.0 - 2020-01-08

56* Extract patching functionality from Reflex.

61* Extract patching functionality from Reflex.

cabal.haskell-cideleted−14

@@ -1,14 +0,0 @@

1−distribution: xenial

2−benchmarks: False

3−unconstrained: False

4−installed: -all

5−

6−-- https://github.com/haskell/cabal/issues/6106

7−install-dependencies: False

8−

9−constraint-set old-these

10− ghc: <8.8

11− constraints: these <1

12−

13−constraint-set old-witherable

14− constraints: witherable <0.3.2

patch.cabal+5−2

@@ -1,5 +1,5 @@

1Name: patch

2−Version: 0.0.4.0

2+Version: 0.0.5.0

3Synopsis: Data structures for describing changes to other data structures.

4Description:

5 Data structures for describing changes to other data structures.

@@ -41,7 +41,10 @@ library

41 , lens >= 4.7 && < 5

42 , semigroupoids >= 4.0 && < 6

43 , transformers >= 0.5.6.0 && < 0.6

44− , witherable >= 0.3 && < 0.4

44+ , witherable >= 0.3 && < 0.5

45+

46+ if impl(ghc < 8.6) -- really, if base < 8.12

47+ build-depends: base-orphans >= 0.8 && < 0.9

46 exposed-modules: Data.Functor.Misc

49 exposed-modules: Data.Functor.Misc

47 , Data.Monoid.DecidablyEmpty

50 , Data.Monoid.DecidablyEmpty

src/Data/Patch.hs+2−1

@@ -85,7 +85,8 @@ instance Group (Proxy x) where

86-- | Const lifts groups into a functor.

87deriving instance Group a => Group (Const a x)

88+

88−-- | Ideitnty lifts groups pointwise (at only one point)

89+-- | Identity lifts groups pointwise (at only one point)

89deriving instance Group a => Group (Identity a)

90deriving instance Group a => Group (Identity a)

91-- | Functions lift groups pointwise.

92-- | Functions lift groups pointwise.

src/Data/Semigroup/Additive.hs+6−3

@@ -13,9 +13,11 @@ module Data.Semigroup.Additive

14import Data.Functor.Const (Const (..))

15import Data.Functor.Identity

16−-- For base-orphans, TODO don't cheat.

17−import Data.Map.Monoidal ()

18import Data.Proxy

16import Data.Proxy

17+#if !MIN_VERSION_base(4,12,0)

18+-- for :*: and :.: semigroup instances

19+import Data.Orphans ()

20+#endif

19#if !MIN_VERSION_base(4,11,0)

21#if !MIN_VERSION_base(4,11,0)

20import Data.Semigroup (Semigroup (..))

22import Data.Semigroup (Semigroup (..))

21#endif

23#endif

@@ -44,7 +46,8 @@ instance Additive (Proxy x)

45-- | Const lifts additive semigroups into a functor.

47-- | Const lifts additive semigroups into a functor.

46instance Additive a => Additive (Const a x)

48instance Additive a => Additive (Const a x)

49+

47−-- | Ideitnty lifts additive semigroups pointwise (at only one point)

50+-- | Identity lifts additive semigroups pointwise (at only one point)

48instance Additive a => Additive (Identity a)

51instance Additive a => Additive (Identity a)

50-- | Functions lift additive semigroups pointwise.

53-- | Functions lift additive semigroups pointwise.