Commit Graph

135 Commits

Author SHA1 Message Date
Alvaro Carrasco
a0c45bedb7 Fixing just the terminal-size dep 2022-07-04 13:18:36 -06:00
Alvaro Carrasco
4158fefc05 Fixing haskeline dep to the version that fixes apple m1 bugs 2022-07-04 12:42:19 -06:00
Arya Irani
5115a3c383
Update stack.yaml 2022-07-03 18:56:49 -04:00
Alvaro Carrasco
49a997d4f0
Upgrade terminal-size to fix apple m1 terminal bug
Fixes text wrapping bug on apple m1 (previous version reported 0 width terminal)
2022-07-03 16:44:27 -06:00
Mitchell Rosen
261c6b3657 update ki hash 2022-06-28 14:21:03 -04:00
Mitchell Rosen
7baebea928 begin implementing concurrent pull 2022-06-23 10:25:01 -04:00
Arya Irani
3b31b95308
Merge pull request #3125 from unisonweb/travis/update-indices
Update type and term indices after push and pull
2022-06-17 13:44:18 -04:00
Arya Irani
1d0ab1d4f3 Merge remote-tracking branch 'origin/trunk' into arya/ooo-sync
# Conflicts:
#	hie.yaml
#	parser-typechecker/package.yaml
#	unison-hashing-v2/package.yaml
#	unison-hashing-v2/unison-hashing-v2.cabal
2022-06-16 15:06:42 -04:00
Travis Staton
535eaf98a9 Add unison-codebase-sqlite-hashing-v2 package
unison-codebase-sqlite is now parameterized by the hashing functions
2022-06-16 14:29:11 -04:00
Arya Irani
0437ca0c74 remove haskeline fork
resolves https://github.com/unisonweb/unison/pull/1836
closes https://github.com/judah/haskeline/pull/115
2022-06-15 11:54:25 -04:00
Arya Irani
50a66c0cf8 Merge branch 'arya/ooo-sync' of github.com:unisonweb/unison into arya/ooo-sync 2022-06-13 17:58:57 -04:00
Travis Staton
65d735dc14 merge trunk 2022-06-13 10:54:37 -04:00
Arya Irani
2e003b1313 tweak sqlite package version comment 2022-06-11 17:05:18 -04:00
Mitchell Rosen
45c135cc89 ⅄ trunk → arya/ooo-sync 2022-06-10 18:30:29 -04:00
Mitchell Rosen
06bdfa1e4e bump direct-sqlite dep 2022-06-10 14:04:16 -04:00
Mitchell Rosen
382816e7b4 extract unison-hashing-v2 package from unison-parser-typechecker 2022-06-09 23:42:07 -04:00
Mitchell Rosen
8aa9805f9a replace Share.Hash with U.Util.Hash32 2022-06-04 13:31:37 -04:00
Travis Staton
784a524432 Bump megaparsec dependency 2022-06-03 12:02:56 -04:00
Mitchell Rosen
28425c6d2e ⅄ trunk → arya/ooo-sync 2022-05-05 15:06:36 -04:00
mergify[bot]
86bb6dfbf1
Merge pull request #3063 from unisonweb/arya/Wno-type-defaults
restore `-Wtype-defaults`
2022-05-05 18:34:44 +00:00
Arya Irani
1d90f45169 add sha256 hash for fuzzyfind-3.0.0 2022-04-30 11:36:25 -04:00
Arya Irani
690e5723d1 Merge remote-tracking branch 'origin/arya/Wno-type-defaults' into arya/ooo-sync 2022-04-29 19:13:24 -04:00
Arya Irani
d8f1a7870b restore -Wtype-defaults 2022-04-29 19:06:53 -04:00
Mitchell Rosen
a06e6352d0 extract unison-util-base32hex package 2022-04-12 15:51:03 -04:00
Chris Penner
52da285bf6
Add unison-share-api package with Sync APIs (#3018) 2022-04-01 10:14:01 -06:00
Chris Penner
2742128905
Merge pull request #2994 from juhp/juhp-patch-1
stack.yaml: update to final lts-18.28 snapshot
2022-03-31 14:57:07 -06:00
Chris Penner
f1a7bc210c
Authenticate UCM with Codebase Servers. (#3000)
* The auth.login command is hidden until it's officially supported.
2022-03-30 13:19:48 -06:00
Jens Petersen
1b575f26c4
stack.yaml: update to final lts-18.28 snapshot 2022-03-23 11:49:31 +08:00
Chris Penner
763e0ec834 Split off pretty-printer package 2022-03-09 11:14:22 -06:00
Arya Irani
b82aca00bc fork and patch Shellmet 2022-02-17 00:30:06 -07:00
Mitchell Rosen
5e833c3a33 add unison-sqlite package 2021-11-15 20:32:08 -05:00
iamevn
28d1840899 move package cli -> unison-cli
the haskell language server was giving me some errors about not being able to find a local cli package, renaming it to unison-cli fixed that and seems to be consistent with other naming conventions.
2021-10-22 23:17:40 -07:00
Dan Doel
e4080aa84c Remove dependencies on compact 2021-10-13 16:37:05 -04:00
Chris Penner
5de74416f9 Split off cli 2021-10-12 12:42:58 -06:00
Arya Irani
f867b2824e lts-18.13 2021-10-08 02:40:27 -04:00
Mitchell Rosen
29edc5c335
Merge pull request #2462 from unisonweb/21-10-05-unify-types
Eliminate second copy of `Relation` type
2021-10-06 18:59:03 -04:00
Dan Doel
0b152a99cc Merge branch 'trunk' into topic/standalone-binaries 2021-10-06 00:19:22 -04:00
Mitchell Rosen
0f5c270ca2 ⅄ trunk → 21-10-05-unify-types 2021-10-05 22:25:25 -04:00
Mitchell Rosen
65fccf5eff remove unison-hashable package, move Relation instances into Unison.Hashable 2021-10-05 22:18:18 -04:00
Mitchell Rosen
e00c2cdb02 add unison-hashable, unison-prelude, unison-util-relation packages 2021-10-05 17:54:01 -04:00
Simon Højberg
bf75003777 Simplify the codebase server token with NanoID
Change the generated codebase server token to be a NanoID of 6
characters. A length of 6 was chosen to have a small enough chance of
collision (given the use case of the token, this could maybe be even
smaller) and minimal impact on how URLs look. NanoIDs also don't include
a lot of special characters (just _ and -), making them great for URls.
2021-10-05 11:16:10 -04:00
Dan Doel
123ee3d450 Merge branch 'trunk' into topic/standalone-binaries 2021-10-01 14:57:10 -04:00
Dan Doel
b36cf3e622 Add compact to stack extra-deps 2021-09-30 11:30:59 -04:00
Arya Irani
0275982380 update to lts-18.9, ghc 8.10.7 2021-09-06 20:15:59 -04:00
Arya Irani
3570c20dac
temporary downgrade to stackage 18.6
Just until there is a haskell-language-server binary release that is compatible with it. 

See https://github.com/haskell/vscode-haskell#supported-ghc-versions

/cc @hojberg @rlmark @pchiusano
2021-08-30 21:32:12 -04:00
Simon Højberg
5fd402d38f Update stack resolver to LTS Haskell 18.7
Update LTS Haskell 18.7 (the newest, released on 2021-08-20) which
includes ghc-8.10.6.

More details: https://www.stackage.org/lts-18.7
2021-08-24 10:19:29 -04:00
Chris Penner
c9423e2f7f Use optparse-applicative for all argument parsing 2021-07-31 13:34:44 -06:00
Arya Irani
dff0ba1cbe update stackage lts to 17.15 2021-06-15 00:13:15 -06:00
Arya Irani
51716a121e
pass -f-terminfo to haskeline
Closes #2085
2021-06-07 09:22:18 -06:00
Arya Irani
90b93b05b7
Merge branch 'trunk' into wip/codebase2-cleanup 2021-05-03 22:06:30 -06:00