Closer to a full flake build via naersk.

Blocked on NixOS/nix#4423, build doesn't see
submodules.

flake.nix

@@ -12,8 +12,15 @@
     flake-utils.lib.eachDefaultSystem (system:
       let
         pkgs = import nixpkgs { inherit system; overlays = [ rust-overlay.overlay ]; };
-        naerskLib = pkgs.callPackage naersk {
-          inherit (pkgs.rust-bin.stable.latest.default) rustc cargo;
+        rust = (pkgs.rustChannelOf {
+            date = "2021-05-01";
+            channel = "nightly";
+        }).minimal; # cargo, rustc and rust-std
+        naerskLib = naersk.lib."${system}".override {
+          # naersk can't build with stable?!
+          # inherit (pkgs.rust-bin.stable.latest) rustc cargo;
+          rustc = rust;
+          cargo = rust;
         };
       in rec {
         packages.helix = naerskLib.buildPackage {

helix-term/Cargo.toml

@@ -22,8 +22,7 @@ once_cell = "1.4"
 smol = "1"
 smol-timeout = "0.6"
 num_cpus = "1"
-# tui = { version = "0.12", default-features = false, features = ["crossterm"] }
-tui = { git = "https://github.com/fdehau/tui-rs", default-features = false, features = ["crossterm"] }
+tui = { version = "0.15", default-features = false, features = ["crossterm"] }
 crossterm = { version = "0.19", features = ["event-stream"] }
 clap = { version = "3.0.0-beta.2 ", default-features = false, features = ["std", "cargo"] }
 

helix-view/Cargo.toml

@@ -16,8 +16,7 @@ helix-core = { path = "../helix-core" }
 helix-lsp = { path = "../helix-lsp"}
 
 # Conversion traits
-# tui = { version = "0.12", default-features = false, features = ["crossterm"], optional = true}
-tui = { git = "https://github.com/fdehau/tui-rs", default-features = false, features = ["crossterm"], optional = true}
+tui = { version = "0.15", default-features = false, features = ["crossterm"], optional = true}
 crossterm = { version = "0.19", features = ["event-stream"], optional = true }
 once_cell = "1.4"
 url = "2"