e5bb4e5 · project-m36 · git.iko.soy

git.iko.soy/project-m36

Merge branch 'curryer_integration' of github.com:agentm/project-m36 into curryer_integration

# Conflicts: # project-m36.cabal

commite5bb4e517310f39dc514e4429f9816618b1c8efc authorA.M <agentm@themactionfaction.com> dateSun 27 Dec 2020, 23:15 (6 years ago) parentff5819b 4c3be65

11 files changed+33−119

compare with master

unifiedsplit

.travis.yml+2−2 Changelog.markdown+5 README.markdown+1−1 cabal.project−6 docs/15_minute_tutorial.markdown+3−7 docs/introduction_to_projectm36.markdown+2−2 project-m36.cabal+2−2 stack.ghc8.2.yaml−50 stack.ghc8.4.yaml−46 stack.ghc8.6.yaml+11−2 stack.ghc8.8.yaml+7−1

.travis.yml+2−2

@@ -16,8 +16,8 @@ cache:

1616matrix:

1717 fast_finish: true

1818 include:

19− - env: CACHE_NAME=8.4.4 STACK_YAML=stack.ghc8.4.yaml

20− compiler: ": #stack 8.4.4"

19+ - env: CACHE_NAME=8.8.4 STACK_YAML=stack.ghc8.4.yaml

20+ compiler: ": #stack 8.8.4"

2121

2222 - env: CACHE_NAME=8.6.5 STACK_YAML=stack.ghc8.6.yaml

2323 compiler: ": #stack 8.6.5"

Changelog.markdown+5

@@ -1,3 +1,8 @@

1+# 2020-12-27 (v0.9.0)

3+* replace unmaintained distributed-process-client-server RPC package with new curryer RPC package

4+* drop support for GHC 8.2 and GHC 8.4 due to dependency on DerivingVia extension

16# 2020-11-21 (v0.8.2)

38* support multiple extend expressions in TutorialD

README.markdown+1−1

@@ -95,7 +95,7 @@ Project:M36 supports multiple frontends which target different audiences.

9595

9696## Development

9797

98−Project:M36 is developed in Haskell and compiled with GHC 8.2.2 or later.

98+Project:M36 is developed in Haskell and compiled with GHC 8.6 or later.

9999

100100## Related Projects

101101

cabal.project−6

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

11packages: project-m36.cabal

3−--RPC library

4−source-repository-package

5− type: git

6− location: https://github.com/agentm/curryer.git

7− tag: 1e60c0580ca33d6ae1e97aaddc32189fdfe3ef6c

8−

93--high-performance streaming library

104source-repository-package

115 type: git

docs/15_minute_tutorial.markdown+3−7

@@ -4,9 +4,7 @@ Thank you for evaluating Project:M36, a new relational algebra engine written in

55## Prerequisites

7−* any Linux

8−* GHC 8.2 or later version (Haskell compiler)

9−* cabal (package downloader) installed

7+* any Linux, MacOS, or Windows computer with Docker installed

108

119## Download and Install

1210

@@ -14,13 +12,11 @@ Run a pre-built docker image:

1412

1513```docker run -it projectm36/project-m36 tutd```

1614

17−or build it yourself:

15+or build it yourself with GHC >= 8.6:

1816

1917```bash

2018git clone https://github.com/agentm/project-m36.git

21−cabal sandbox init

22−cabal install --dependencies-only

23−cabal run tutd

19+cabal new-run tutd

2420```

2521

2622## Some Basic TutorialD

docs/introduction_to_projectm36.markdown+2−2

@@ -51,7 +51,7 @@ Requirements:

5151

5252To build with stack:

5353

54−* [GHC 8.4.4 or greater](https://www.haskell.org/downloads)

54+* [GHC 8.6.5 or greater](https://www.haskell.org/downloads)

5555* [Haskell stack](https://docs.haskellstack.org/en/stable/README/)

5656* Linux, macOS, or Microsoft Windows

5757

@@ -63,7 +63,7 @@ Compilation steps:

6363

6464At this point, the TutorialD interactive interpreter can be run using ```stack exec tutd```.

6565

66−Alternative building with GHC 8.4.4 or greater:

66+Alternative building with GHC 8.6.5 or greater:

6767

6868* ```cabal new-build```

6969

project-m36.cabal+2−2

@@ -182,7 +182,7 @@ Executable tutd

182182 stm-containers >= 1.0.0,

183183 list-t,

184184 parser-combinators,

185− curryer,

185+ curryer-rpc,

186186 prettyprinter

187187 Other-Modules: TutorialD.Interpreter,

188188 TutorialD.Interpreter.Base,

@@ -264,7 +264,7 @@ Executable bigrel

264264

265265Common commontest

266266 Default-Language: Haskell2010

267− Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics,parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, websockets, optparse-applicative, network, aeson, project-m36, random, MonadRandom, semigroups, parser-combinators, winery, curryer, prettyprinter, base64-bytestring

267+ Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, uuid, stm, deepseq, deepseq-generics,parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, megaparsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, websockets, optparse-applicative, network, aeson, project-m36, random, MonadRandom, semigroups, parser-combinators, winery, curryer-rpc, prettyprinter, base64-bytestring

268268 Default-Extensions: OverloadedStrings

269269 GHC-Options: -Wall -threaded

270270 Hs-Source-Dirs: ./src/bin, ., test/

stack.ghc8.2.yamldeleted−50

@@ -1,50 +0,0 @@

1−# This file was automatically generated by stack init

2−# For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration/

3−

4−# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)

5−resolver: lts-11.20

6−

7−# Local packages, usually specified by relative directory name

8−packages:

9−- '.'

10−

11−# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)

12−extra-deps:

13−- git: https://github.com/agentm/curryer.git

14− commit: 1e60c0580ca33d6ae1e97aaddc32189fdfe3ef6c

15−- data-accessor-transformers-0.2.1.7

16−- data-interval-1.2.0

17−- extended-reals-0.2.1.0

18−- gnuplot-0.5.4.1

19−- text-1.2.2.1

20−- aeson-1.2.1.00

21−- rset-1.0.0

22−

23−# Override default flag values for local packages and extra-deps

24−flags:

25− project-m36:

26− stack: true

27−

28−# Extra package databases containing global packages

29−extra-package-dbs: []

30−

31−# Control whether we use the GHC we find on the path

32−# system-ghc: true

33−

34−# Require a specific version of stack, using version ranges

35−# require-stack-version: -any # Default

36−# require-stack-version: >= 1.0.0

37−

38−# Override the architecture used by stack, especially useful on Windows

39−# arch: i386

40−# arch: x86_64

41−

42−# Extra directories used by stack for building

43−# extra-include-dirs: [/path/to/dir]

44−# extra-lib-dirs: [/path/to/dir]

45−

46−# Allow a newer minor version of GHC than the snapshot specifies

47−# compiler-check: newer-minor

48−

49−allow-newer: true

50−

stack.ghc8.4.yamldeleted−46

@@ -1,46 +0,0 @@

1−# This file was automatically generated by stack init

2−# For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration/

3−

4−# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)

5−resolver: lts-12.26

6−

7−# Local packages, usually specified by relative directory name

8−packages:

9−- '.'

10−# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)

11−extra-deps:

12−- git: https://github.com/agentm/curryer.git

13− commit: 1e60c0580ca33d6ae1e97aaddc32189fdfe3ef6c

14−- data-interval-1.3.0

15−- extended-reals-0.2.3.0

16−- rset-1.0.0

17−- hashable-time-0.2.0.2

18−- network-transport-tcp-0.6.0

19−

20−# Override default flag values for local packages and extra-deps

21−flags:

22− project-m36:

23− stack: true

24−

25−# Extra package databases containing global packages

26−extra-package-dbs: []

27−

28−# Control whether we use the GHC we find on the path

29−# system-ghc: true

30−

31−# Require a specific version of stack, using version ranges

32−# require-stack-version: -any # Default

33−# require-stack-version: >= 1.0.0

34−

35−# Override the architecture used by stack, especially useful on Windows

36−# arch: i386

37−# arch: x86_64

38−

39−# Extra directories used by stack for building

40−# extra-include-dirs: [/path/to/dir]

41−# extra-lib-dirs: [/path/to/dir]

42−

43−# Allow a newer minor version of GHC than the snapshot specifies

44−# compiler-check: newer-minor

45−

46−allow-newer: true

stack.ghc8.6.yaml+11−2

@@ -2,7 +2,7 @@

22# For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration/

44# Specifies the GHC version and set of packages available (e.g., lts-3.5, nightly-2015-09-21, ghc-7.10.2)

5−resolver: lts-14.3

5+resolver: lts-14.27

77# Local packages, usually specified by relative directory name

88packages:

@@ -10,7 +10,13 @@ packages:

1010# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)

1111extra-deps:

1212- git: https://github.com/agentm/curryer.git

13− commit: 1e60c0580ca33d6ae1e97aaddc32189fdfe3ef6c

13+ commit: edee978457dc60fa326298d173d64c4f0783ca64

14+- git: https://github.com/composewell/streamly.git

15+ commit: ac3af8749194f1788704dda8667d0b3807075cc2

16+- fast-builder-0.1.2.1

17+- winery-1.3.2

18+- barbies-2.0.2.0

19+- barbies-th-0.1.7

1420- extended-reals-0.2.3.0

1521- data-interval-2.0.1

1622- stm-containers-1.1.0.4

@@ -19,6 +25,9 @@ extra-deps:

1925- hashable-time-0.2.0.2

2026- network-transport-tcp-0.6.0

2127- megaparsec-7.0.5

28+- prettyprinter-1.7.0

29+- prettyprinter-ansi-terminal-1.1.2

30+- fusion-plugin-types-0.1.0

2231

2332# Override default flag values for local packages and extra-deps

2433flags:

stack.ghc8.8.yaml+7−1

@@ -10,9 +10,13 @@ packages:

1010# Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)

1111extra-deps:

1212- git: https://github.com/agentm/curryer.git

13− commit: 1e60c0580ca33d6ae1e97aaddc32189fdfe3ef6c

13+ commit: edee978457dc60fa326298d173d64c4f0783ca64

1414- git: https://github.com/composewell/streamly.git

1515 commit: ac3af8749194f1788704dda8667d0b3807075cc2

16+- fast-builder-0.1.2.1

17+- winery-1.3.2

18+- barbies-2.0.2.0

19+- barbies-th-0.1.7

1620- extended-reals-0.2.3.0

1721- data-interval-2.0.1

1822- stm-containers-1.1.0.4

@@ -24,6 +28,8 @@ extra-deps:

2428- network-2.8.0.1

2529- primitive-extras-0.8

2630- primitive-unlifted-0.1.3.0

31+- prettyprinter-1.7.0

32+- prettyprinter-ansi-terminal-1.1.2

2733

2834# Override default flag values for local packages and extra-deps

2935flags: