Merge remote-tracking branch 'origin/trunk' into topic/v1-cleanup · JavaDerek/unison@63922ec · GitHub
Skip to content

Commit 63922ec

Browse files
author
Arya Irani
committed
Merge remote-tracking branch 'origin/trunk' into topic/v1-cleanup
2 parents b971ea0 + fb53ffd commit 63922ec

55 files changed

Lines changed: 1852 additions & 703 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yaml‎

Lines changed: 8 additions & 1 deletion

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2013-2018, Unison Computing, public benefit corp and contributors
1+
Copyright (c) 2013-2021, Unison Computing, public benefit corp and contributors
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎cli/LICENSE‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Copyright (c) 2021, Unison Computing, public benefit corp and contributors
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a copy
4+
of this software and associated documentation files (the "Software"), to deal
5+
in the Software without restriction, including without limitation the rights
6+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7+
copies of the Software, and to permit persons to whom the Software is
8+
furnished to do so, subject to the following conditions:
9+
10+
The above copyright notice and this permission notice shall be included in
11+
all copies or substantial portions of the Software.
12+
13+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19+
THE SOFTWARE.

‎cli/package.yaml‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
name: unison-cli
2+
github: unisonweb/unison
3+
copyright: Copyright (C) 2013-2018 Unison Computing, PBC and contributors
4+
5+
default-extensions:
6+
- ApplicativeDo
7+
- BlockArguments
8+
- DeriveFunctor
9+
- DerivingStrategies
10+
- DoAndIfThenElse
11+
- FlexibleContexts
12+
- FlexibleInstances
13+
- LambdaCase
14+
- MultiParamTypeClasses
15+
- ScopedTypeVariables
16+
- TupleSections
17+
- TypeApplications
18+
19+
flags:
20+
optimized:
21+
manual: true
22+
default: false
23+
24+
executables:
25+
unison:
26+
source-dirs: unison
27+
main: Main.hs
28+
ghc-options: -threaded -rtsopts -with-rtsopts=-I0 -optP-Wno-nonportable-include-path
29+
dependencies:
30+
- base
31+
- bytestring
32+
- configurator
33+
- directory
34+
- directory
35+
- errors
36+
- filepath
37+
- megaparsec
38+
- mtl
39+
- optparse-applicative >= 0.16.1.0
40+
- shellmet
41+
- template-haskell
42+
- temporary
43+
- text
44+
- unison-core1
45+
- unison-parser-typechecker
46+
- unison-prelude
47+
- unliftio
48+
when:
49+
- condition: '!os(windows)'
50+
dependencies: unix
51+
52+
transcripts:
53+
source-dirs: transcripts
54+
main: Transcripts.hs
55+
ghc-options: -threaded -rtsopts -with-rtsopts=-N -v0
56+
dependencies:
57+
- base
58+
- directory
59+
- easytest
60+
- filepath
61+
- shellmet
62+
- process
63+
- text
64+
- unison-core1
65+
- unison-parser-typechecker
66+
- unison-prelude
67+
build-tools:
68+
- unison-cli:unison
69+
70+
71+
when:
72+
- condition: flag(optimized)
73+
ghc-options: -O2 -funbox-strict-fields

parser-typechecker/transcripts/Transcripts.hs renamed to cli/transcripts/Transcripts.hs

File renamed without changes.

‎cli/unison-cli.cabal‎

Lines changed: 108 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,108 @@
1+
cabal-version: 1.12
2+
3+
-- This file has been generated from package.yaml by hpack version 0.34.4.
4+
--
5+
-- see: https://github.com/sol/hpack
6+
7+
name: unison-cli
8+
version: 0.0.0
9+
homepage: https://github.com/unisonweb/unison#readme
10+
bug-reports: https://github.com/unisonweb/unison/issues
11+
copyright: Copyright (C) 2013-2018 Unison Computing, PBC and contributors
12+
license: MIT
13+
license-file: LICENSE
14+
build-type: Simple
15+
16+
source-repository head
17+
type: git
18+
location: https://github.com/unisonweb/unison
19+
20+
flag optimized
21+
manual: True
22+
default: False
23+
24+
executable transcripts
25+
main-is: Transcripts.hs
26+
other-modules:
27+
Paths_unison_cli
28+
hs-source-dirs:
29+
transcripts
30+
default-extensions:
31+
ApplicativeDo
32+
BlockArguments
33+
DeriveFunctor
34+
DerivingStrategies
35+
DoAndIfThenElse
36+
FlexibleContexts
37+
FlexibleInstances
38+
LambdaCase
39+
MultiParamTypeClasses
40+
ScopedTypeVariables
41+
TupleSections
42+
TypeApplications
43+
ghc-options: -threaded -rtsopts -with-rtsopts=-N -v0
44+
build-tools:
45+
unison
46+
build-depends:
47+
base
48+
, directory
49+
, easytest
50+
, filepath
51+
, process
52+
, shellmet
53+
, text
54+
, unison-core1
55+
, unison-parser-typechecker
56+
, unison-prelude
57+
if flag(optimized)
58+
ghc-options: -O2 -funbox-strict-fields
59+
default-language: Haskell2010
60+
61+
executable unison
62+
main-is: Main.hs
63+
other-modules:
64+
ArgParse
65+
Compat
66+
System.Path
67+
Version
68+
Paths_unison_cli
69+
hs-source-dirs:
70+
unison
71+
default-extensions:
72+
ApplicativeDo
73+
BlockArguments
74+
DeriveFunctor
75+
DerivingStrategies
76+
DoAndIfThenElse
77+
FlexibleContexts
78+
FlexibleInstances
79+
LambdaCase
80+
MultiParamTypeClasses
81+
ScopedTypeVariables
82+
TupleSections
83+
TypeApplications
84+
ghc-options: -threaded -rtsopts -with-rtsopts=-I0 -optP-Wno-nonportable-include-path
85+
build-depends:
86+
base
87+
, bytestring
88+
, configurator
89+
, directory
90+
, errors
91+
, filepath
92+
, megaparsec
93+
, mtl
94+
, optparse-applicative >=0.16.1.0
95+
, shellmet
96+
, template-haskell
97+
, temporary
98+
, text
99+
, unison-core1
100+
, unison-parser-typechecker
101+
, unison-prelude
102+
, unliftio
103+
if flag(optimized)
104+
ghc-options: -O2 -funbox-strict-fields
105+
if !os(windows)
106+
build-depends:
107+
unix
108+
default-language: Haskell2010

parser-typechecker/unison/ArgParse.hs renamed to cli/unison/ArgParse.hs

File renamed without changes.

parser-typechecker/unison/Compat.hs renamed to cli/unison/Compat.hs

File renamed without changes.

parser-typechecker/unison/Main.hs renamed to cli/unison/Main.hs

Lines changed: 34 additions & 25 deletions

parser-typechecker/unison/System/Path.hs renamed to cli/unison/System/Path.hs

File renamed without changes.

0 commit comments

Comments
 (0)