git.iko.soy/helix
on master help sign in
Closer to a full flake build via naersk.
b6a22e9Blaž Hrastnik
Cargo.lock+38−42
compare with master
unifiedsplit
@@ -4,9 +4,9 @@ version = 3
4
4
5[[package]]
5[[package]]
6name = "aho-corasick"
6name = "aho-corasick"
7−version = "0.7.15"
7+version = "0.7.18"
8source = "registry+https://github.com/rust-lang/crates.io-index"
8source = "registry+https://github.com/rust-lang/crates.io-index"
9−checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
9+checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
10dependencies = [
10dependencies = [
11 "memchr",
11 "memchr",
12]
12]
@@ -30,16 +30,16 @@ dependencies = [
30
30
31[[package]]
31[[package]]
32name = "async-executor"
32name = "async-executor"
33−version = "1.4.0"
33+version = "1.4.1"
34source = "registry+https://github.com/rust-lang/crates.io-index"
34source = "registry+https://github.com/rust-lang/crates.io-index"
35−checksum = "eb877970c7b440ead138f6321a3b5395d6061183af779340b65e20c0fede9146"
35+checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965"
36dependencies = [
36dependencies = [
37 "async-task",
37 "async-task",
38 "concurrent-queue",
38 "concurrent-queue",
39 "fastrand",
39 "fastrand",
40 "futures-lite",
40 "futures-lite",
41 "once_cell",
41 "once_cell",
42− "vec-arena",
42+ "slab",
43]
43]
44
44
45[[package]]
45[[package]]
@@ -55,9 +55,9 @@ dependencies = [
55
55
56[[package]]
56[[package]]
57name = "async-io"
57name = "async-io"
58−version = "1.4.0"
58+version = "1.4.1"
59source = "registry+https://github.com/rust-lang/crates.io-index"
59source = "registry+https://github.com/rust-lang/crates.io-index"
60−checksum = "fcb9af4888a70ad78ecb5efcb0ba95d66a3cf54a88b62ae81559954c7588c7a2"
60+checksum = "4bbfd5cf2794b1e908ea8457e6c45f8f8f1f6ec5f74617bf4662623f47503c3b"
61dependencies = [
61dependencies = [
62 "concurrent-queue",
62 "concurrent-queue",
63 "fastrand",
63 "fastrand",
@@ -67,8 +67,8 @@ dependencies = [
67 "once_cell",
67 "once_cell",
68 "parking",
68 "parking",
69 "polling",
69 "polling",
70+ "slab",
70 "socket2",
71 "socket2",
71− "vec-arena",
72 "waker-fn",
72 "waker-fn",
73 "winapi",
73 "winapi",
74]
74]
@@ -84,9 +84,9 @@ dependencies = [
84
84
85[[package]]
85[[package]]
86name = "async-net"
86name = "async-net"
87−version = "1.5.0"
87+version = "1.6.0"
88source = "registry+https://github.com/rust-lang/crates.io-index"
88source = "registry+https://github.com/rust-lang/crates.io-index"
89−checksum = "06de475c85affe184648202401d7622afb32f0f74e02192857d0201a16defbe5"
89+checksum = "69b0a74e7f70af3c8cf1aa539edbd044795706659ac52b78a71dc1a205ecefdf"
90dependencies = [
90dependencies = [
91 "async-io",
91 "async-io",
92 "blocking",
92 "blocking",
@@ -96,15 +96,16 @@ dependencies = [
96
96
97[[package]]
97[[package]]
98name = "async-process"
98name = "async-process"
99−version = "1.0.2"
99+version = "1.1.0"
100source = "registry+https://github.com/rust-lang/crates.io-index"
100source = "registry+https://github.com/rust-lang/crates.io-index"
101−checksum = "ef37b86e2fa961bae5a4d212708ea0154f904ce31d1a4a7f47e1bbc33a0c040b"
101+checksum = "a8f38756dd9ac84671c428afbf7c9f7495feff9ec5b0710f17100098e5b354ac"
102dependencies = [
102dependencies = [
103 "async-io",
103 "async-io",
104 "blocking",
104 "blocking",
105 "cfg-if",
105 "cfg-if",
106 "event-listener",
106 "event-listener",
107 "futures-lite",
107 "futures-lite",
108+ "libc",
108 "once_cell",
109 "once_cell",
109 "signal-hook 0.3.8",
110 "signal-hook 0.3.8",
110 "winapi",
111 "winapi",
@@ -150,9 +151,9 @@ dependencies = [
150
151
151[[package]]
152[[package]]
152name = "bstr"
153name = "bstr"
153−version = "0.2.15"
154+version = "0.2.16"
154source = "registry+https://github.com/rust-lang/crates.io-index"
155source = "registry+https://github.com/rust-lang/crates.io-index"
155−checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d"
156+checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279"
156dependencies = [
157dependencies = [
157 "memchr",
158 "memchr",
158]
159]
@@ -222,9 +223,9 @@ dependencies = [
222
223
223[[package]]
224[[package]]
224name = "crossbeam-utils"
225name = "crossbeam-utils"
225−version = "0.8.3"
226+version = "0.8.4"
226source = "registry+https://github.com/rust-lang/crates.io-index"
227source = "registry+https://github.com/rust-lang/crates.io-index"
227−checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49"
228+checksum = "4feb231f0d4d6af81aed15928e58ecf5816aa62a2393e2c82f46973e92a9a278"
228dependencies = [
229dependencies = [
229 "autocfg",
230 "autocfg",
230 "cfg-if",
231 "cfg-if",
@@ -286,9 +287,9 @@ checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59"
286
287
287[[package]]
288[[package]]
288name = "fastrand"
289name = "fastrand"
289−version = "1.4.0"
290+version = "1.4.1"
290source = "registry+https://github.com/rust-lang/crates.io-index"
291source = "registry+https://github.com/rust-lang/crates.io-index"
291−checksum = "ca5faf057445ce5c9d4329e382b2ce7ca38550ef3b73a5348362d5f24e0c7fe3"
292+checksum = "77b705829d1e87f762c2df6da140b26af5839e1033aa84aa5f56bb688e4e1bdb"
292dependencies = [
293dependencies = [
293 "instant",
294 "instant",
294]
295]
@@ -669,15 +670,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
669
670
670[[package]]
671[[package]]
671name = "libc"
672name = "libc"
672−version = "0.2.93"
673+version = "0.2.94"
673source = "registry+https://github.com/rust-lang/crates.io-index"
674source = "registry+https://github.com/rust-lang/crates.io-index"
674−checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41"
675+checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"
675
676
676[[package]]
677[[package]]
677name = "lock_api"
678name = "lock_api"
678−version = "0.4.3"
679+version = "0.4.4"
679source = "registry+https://github.com/rust-lang/crates.io-index"
680source = "registry+https://github.com/rust-lang/crates.io-index"
680−checksum = "5a3c91c24eae6777794bb1997ad98bbb87daf92890acab859f7eaa4320333176"
681+checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb"
681dependencies = [
682dependencies = [
682 "scopeguard",
683 "scopeguard",
683]
684]
@@ -718,9 +719,9 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
718
719
719[[package]]
720[[package]]
720name = "memchr"
721name = "memchr"
721−version = "2.3.4"
722+version = "2.4.0"
722source = "registry+https://github.com/rust-lang/crates.io-index"
723source = "registry+https://github.com/rust-lang/crates.io-index"
723−checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
724+checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
724
725
725[[package]]
726[[package]]
726name = "mio"
727name = "mio"
@@ -917,9 +918,9 @@ dependencies = [
917
918
918[[package]]
919[[package]]
919name = "redox_syscall"
920name = "redox_syscall"
920−version = "0.2.6"
921+version = "0.2.7"
921source = "registry+https://github.com/rust-lang/crates.io-index"
922source = "registry+https://github.com/rust-lang/crates.io-index"
922−checksum = "8270314b5ccceb518e7e578952f0b72b88222d02e8f77f5ecf7abbb673539041"
923+checksum = "85dd92e586f7355c633911e11f77f3d12f04b1b1bd76a198bd34ae3af8341ef2"
923dependencies = [
924dependencies = [
924 "bitflags",
925 "bitflags",
925]
926]
@@ -936,9 +937,9 @@ dependencies = [
936
937
937[[package]]
938[[package]]
938name = "regex"
939name = "regex"
939−version = "1.4.5"
940+version = "1.5.3"
940source = "registry+https://github.com/rust-lang/crates.io-index"
941source = "registry+https://github.com/rust-lang/crates.io-index"
941−checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19"
942+checksum = "ce5f1ceb7f74abbce32601642fcf8e8508a8a8991e0621c7d750295b9095702b"
942dependencies = [
943dependencies = [
943 "aho-corasick",
944 "aho-corasick",
944 "memchr",
945 "memchr",
@@ -947,9 +948,9 @@ dependencies = [
947
948
948[[package]]
949[[package]]
949name = "regex-syntax"
950name = "regex-syntax"
950−version = "0.6.23"
951+version = "0.6.25"
951source = "registry+https://github.com/rust-lang/crates.io-index"
952source = "registry+https://github.com/rust-lang/crates.io-index"
952−checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548"
953+checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
953
954
954[[package]]
955[[package]]
955name = "ropey"
956name = "ropey"
@@ -1123,9 +1124,9 @@ dependencies = [
1123
1124
1124[[package]]
1125[[package]]
1125name = "syn"
1126name = "syn"
1126−version = "1.0.69"
1127+version = "1.0.71"
1127source = "registry+https://github.com/rust-lang/crates.io-index"
1128source = "registry+https://github.com/rust-lang/crates.io-index"
1128−checksum = "48fe99c6bd8b1cc636890bcc071842de909d902c81ac7dab53ba33c421ab8ffb"
1129+checksum = "ad184cc9470f9117b2ac6817bfe297307418819ba40552f9b3846f05c33d5373"
1129dependencies = [
1130dependencies = [
1130 "proc-macro2",
1131 "proc-macro2",
1131 "quote",
1132 "quote",
@@ -1226,8 +1227,9 @@ dependencies = [
1226
1227
1227[[package]]
1228[[package]]
1228name = "tui"
1229name = "tui"
1229−version = "0.14.0"
1230+version = "0.15.0"
1230−source = "git+https://github.com/fdehau/tui-rs#4e76bfa2ca8eb51719d611bb8d3d4094ab8ba398"
1231+source = "registry+https://github.com/rust-lang/crates.io-index"
1232+checksum = "861d8f3ad314ede6219bcb2ab844054b1de279ee37a9bc38e3d606f9d3fb2a71"
1231dependencies = [
1233dependencies = [
1232 "bitflags",
1234 "bitflags",
1233 "cassowary",
1235 "cassowary",
@@ -1277,9 +1279,9 @@ checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
1277
1279
1278[[package]]
1280[[package]]
1279name = "unicode-xid"
1281name = "unicode-xid"
1280−version = "0.2.1"
1282+version = "0.2.2"
1281source = "registry+https://github.com/rust-lang/crates.io-index"
1283source = "registry+https://github.com/rust-lang/crates.io-index"
1282−checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
1284+checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
1283
1285
1284[[package]]
1286[[package]]
1285name = "url"
1287name = "url"
@@ -1300,12 +1302,6 @@ version = "0.7.6"
1300source = "registry+https://github.com/rust-lang/crates.io-index"
1302source = "registry+https://github.com/rust-lang/crates.io-index"
1301checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
1303checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
1302
1304
1303−[[package]]
1304−name = "vec-arena"
1305−version = "1.1.0"
1306−source = "registry+https://github.com/rust-lang/crates.io-index"
1307−checksum = "34b2f665b594b07095e3ac3f718e13c2197143416fae4c5706cffb7b1af8d7f1"
1308−
1309[[package]]
1305[[package]]
1310name = "vec_map"
1306name = "vec_map"
1311version = "0.8.2"
1307version = "0.8.2"
flake.lock+16−16
@@ -2,11 +2,11 @@
2 "nodes": {
2 "nodes": {
3 "flake-utils": {
3 "flake-utils": {
4 "locked": {
4 "locked": {
5− "lastModified": 1617631617,
5+ "lastModified": 1619345332,
6− "narHash": "sha256-PARRCz55qN3gy07VJZIlFeOX420d0nGF0RzGI/9hVlw=",
6+ "narHash": "sha256-qHnQkEp1uklKTpx3MvKtY6xzgcqXDsz5nLilbbuL+3A=",
7 "owner": "numtide",
7 "owner": "numtide",
8 "repo": "flake-utils",
8 "repo": "flake-utils",
9− "rev": "b2c27d1a81b0dc266270fa8aeecebbd1807fc610",
9+ "rev": "2ebf2558e5bf978c7fb8ea927dfaed8fefab2e28",
10 "type": "github"
10 "type": "github"
11 },
11 },
12 "original": {
12 "original": {
@@ -35,11 +35,11 @@
35 "nixpkgs": "nixpkgs"
35 "nixpkgs": "nixpkgs"
36 },
36 },
37 "locked": {
37 "locked": {
38− "lastModified": 1614785451,
38+ "lastModified": 1618844365,
39− "narHash": "sha256-TPw8kQvr2UNCuvndtY+EjyXp6Q5GEW2l9UafXXh1XmI=",
39+ "narHash": "sha256-Z9t0rr+5OG/ru3jdg3jivfYVU4ydV/nqt8UwIut7uHs=",
40 "owner": "nmattia",
40 "owner": "nmattia",
41 "repo": "naersk",
41 "repo": "naersk",
42− "rev": "e0fe990b478a66178a58c69cf53daec0478ca6f9",
42+ "rev": "32e3ba39d9d83098b13720a4384bdda191dd0445",
43 "type": "github"
43 "type": "github"
44 },
44 },
45 "original": {
45 "original": {
@@ -50,10 +50,10 @@
50 },
50 },
51 "nixpkgs": {
51 "nixpkgs": {
52 "locked": {
52 "locked": {
53− "lastModified": 1617755977,
53+ "lastModified": 1619775165,
54− "narHash": "sha256-vkYi/Q25f9g2ZISS1IT27S+Vv1WDybdegs5SLsktAHw=",
54+ "narHash": "sha256-2qaBErjxuWpTIq6Yee5GJmhr84hmzBotLQ0ayg1VXg8=",
55− "path": "/nix/store/3sazzf324zxa6wc2dw1x02dh1v05g4s1-source",
55+ "path": "/nix/store/gs997rgx3pvdgcb54wd3fi9wbnznd9g4-source",
56− "rev": "4cb48cc25622334f17ec6b9bf56e83de0d521fb7",
56+ "rev": "849b29b4f76d66ec7aeeeed699b7e27ef3db7c02",
57 "type": "path"
57 "type": "path"
58 },
58 },
59 "original": {
59 "original": {
@@ -63,11 +63,11 @@
63 },
63 },
64 "nixpkgs_2": {
64 "nixpkgs_2": {
65 "locked": {
65 "locked": {
66− "lastModified": 1617899217,
66+ "lastModified": 1619464443,
67− "narHash": "sha256-gd5JHH7IkeoIQ/oiGZSqDpGdGt7DMRJTQ8JiD8+hdOQ=",
67+ "narHash": "sha256-R7WAb8EnkIJxxaF6GTHUPytjonhB4Zm0iatyWoW169A=",
68 "owner": "nixos",
68 "owner": "nixos",
69 "repo": "nixpkgs",
69 "repo": "nixpkgs",
70− "rev": "9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2",
70+ "rev": "8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17",
71 "type": "github"
71 "type": "github"
72 },
72 },
73 "original": {
73 "original": {
@@ -106,11 +106,11 @@
106 "nixpkgs": "nixpkgs_3"
106 "nixpkgs": "nixpkgs_3"
107 },
107 },
108 "locked": {
108 "locked": {
109− "lastModified": 1617935044,
109+ "lastModified": 1619835986,
110− "narHash": "sha256-14AECpzqqDaA0gJk/Auo4usKG8PfM4Dr9eDAC/Dm7JM=",
110+ "narHash": "sha256-RZ6opJgAJhcW6jou50D+V36BHu3WUc2uh4C42vx4kio=",
111 "owner": "oxalica",
111 "owner": "oxalica",
112 "repo": "rust-overlay",
112 "repo": "rust-overlay",
113− "rev": "5b846f742b2350c175311506e840a29cc0278700",
113+ "rev": "4f2051c76032e86338219f477e5ac9e522dd362a",
114 "type": "github"
114 "type": "github"
115 },
115 },
116 "original": {
116 "original": {
flake.nix+9−2
@@ -12,8 +12,15 @@
12 flake-utils.lib.eachDefaultSystem (system:
12 flake-utils.lib.eachDefaultSystem (system:
13 let
13 let
14 pkgs = import nixpkgs { inherit system; overlays = [ rust-overlay.overlay ]; };
14 pkgs = import nixpkgs { inherit system; overlays = [ rust-overlay.overlay ]; };
15− naerskLib = pkgs.callPackage naersk {
15+ rust = (pkgs.rustChannelOf {
16+ date = "2021-05-01";
17+ channel = "nightly";
18+ }).minimal; # cargo, rustc and rust-std
19+ naerskLib = naersk.lib."${system}".override {
20+ # naersk can't build with stable?!
16− inherit (pkgs.rust-bin.stable.latest.default) rustc cargo;
21+ # inherit (pkgs.rust-bin.stable.latest) rustc cargo;
22+ rustc = rust;
23+ cargo = rust;
17 };
24 };
18 in rec {
25 in rec {
19 packages.helix = naerskLib.buildPackage {
26 packages.helix = naerskLib.buildPackage {
helix-term/Cargo.toml+1−2
@@ -22,8 +22,7 @@ once_cell = "1.4"
22smol = "1"
22smol = "1"
23smol-timeout = "0.6"
23smol-timeout = "0.6"
24num_cpus = "1"
24num_cpus = "1"
25−# tui = { version = "0.12", default-features = false, features = ["crossterm"] }
26−tui = { git = "https://github.com/fdehau/tui-rs", default-features = false, features = ["crossterm"] }
25+tui = { version = "0.15", default-features = false, features = ["crossterm"] }
27crossterm = { version = "0.19", features = ["event-stream"] }
26crossterm = { version = "0.19", features = ["event-stream"] }
28clap = { version = "3.0.0-beta.2 ", default-features = false, features = ["std", "cargo"] }
27clap = { version = "3.0.0-beta.2 ", default-features = false, features = ["std", "cargo"] }
29
28
helix-view/Cargo.toml+1−2
@@ -16,8 +16,7 @@ helix-core = { path = "../helix-core" }
16helix-lsp = { path = "../helix-lsp"}
16helix-lsp = { path = "../helix-lsp"}
17
17
18# Conversion traits
18# Conversion traits
19−# tui = { version = "0.12", default-features = false, features = ["crossterm"], optional = true}
20−tui = { git = "https://github.com/fdehau/tui-rs", default-features = false, features = ["crossterm"], optional = true}
19+tui = { version = "0.15", default-features = false, features = ["crossterm"], optional = true}
21crossterm = { version = "0.19", features = ["event-stream"], optional = true }
20crossterm = { version = "0.19", features = ["event-stream"], optional = true }
22once_cell = "1.4"
21once_cell = "1.4"
23url = "2"
22url = "2"