From b6a22e955b6146345674951859f6ef97e29355bc Mon Sep 17 00:00:00 2001 From: Blaž Hrastnik Date: Mon, 3 May 2021 22:39:53 +0900 Subject: Closer to a full flake build via naersk. Blocked on https://github.com/NixOS/nix/issues/4423, build doesn't see submodules. --- Cargo.lock | 80 ++++++++++++++++++++++++--------------------------- flake.lock | 32 ++++++++++----------- flake.nix | 11 +++++-- helix-term/Cargo.toml | 3 +- helix-view/Cargo.toml | 3 +- 5 files changed, 65 insertions(+), 64 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a6a728f9..b994ef23 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aho-corasick" -version = "0.7.15" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" dependencies = [ "memchr", ] @@ -30,16 +30,16 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb877970c7b440ead138f6321a3b5395d6061183af779340b65e20c0fede9146" +checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" dependencies = [ "async-task", "concurrent-queue", "fastrand", "futures-lite", "once_cell", - "vec-arena", + "slab", ] [[package]] @@ -55,9 +55,9 @@ dependencies = [ [[package]] name = "async-io" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb9af4888a70ad78ecb5efcb0ba95d66a3cf54a88b62ae81559954c7588c7a2" +checksum = "4bbfd5cf2794b1e908ea8457e6c45f8f8f1f6ec5f74617bf4662623f47503c3b" dependencies = [ "concurrent-queue", "fastrand", @@ -67,8 +67,8 @@ dependencies = [ "once_cell", "parking", "polling", + "slab", "socket2", - "vec-arena", "waker-fn", "winapi", ] @@ -84,9 +84,9 @@ dependencies = [ [[package]] name = "async-net" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06de475c85affe184648202401d7622afb32f0f74e02192857d0201a16defbe5" +checksum = "69b0a74e7f70af3c8cf1aa539edbd044795706659ac52b78a71dc1a205ecefdf" dependencies = [ "async-io", "blocking", @@ -96,15 +96,16 @@ dependencies = [ [[package]] name = "async-process" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef37b86e2fa961bae5a4d212708ea0154f904ce31d1a4a7f47e1bbc33a0c040b" +checksum = "a8f38756dd9ac84671c428afbf7c9f7495feff9ec5b0710f17100098e5b354ac" dependencies = [ "async-io", "blocking", "cfg-if", "event-listener", "futures-lite", + "libc", "once_cell", "signal-hook 0.3.8", "winapi", @@ -150,9 +151,9 @@ dependencies = [ [[package]] name = "bstr" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d" +checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279" dependencies = [ "memchr", ] @@ -222,9 +223,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49" +checksum = "4feb231f0d4d6af81aed15928e58ecf5816aa62a2393e2c82f46973e92a9a278" dependencies = [ "autocfg", "cfg-if", @@ -286,9 +287,9 @@ checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" [[package]] name = "fastrand" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca5faf057445ce5c9d4329e382b2ce7ca38550ef3b73a5348362d5f24e0c7fe3" +checksum = "77b705829d1e87f762c2df6da140b26af5839e1033aa84aa5f56bb688e4e1bdb" dependencies = [ "instant", ] @@ -669,15 +670,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.93" +version = "0.2.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41" +checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" [[package]] name = "lock_api" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3c91c24eae6777794bb1997ad98bbb87daf92890acab859f7eaa4320333176" +checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb" dependencies = [ "scopeguard", ] @@ -718,9 +719,9 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" [[package]] name = "memchr" -version = "2.3.4" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" +checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" [[package]] name = "mio" @@ -917,9 +918,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8270314b5ccceb518e7e578952f0b72b88222d02e8f77f5ecf7abbb673539041" +checksum = "85dd92e586f7355c633911e11f77f3d12f04b1b1bd76a198bd34ae3af8341ef2" dependencies = [ "bitflags", ] @@ -936,9 +937,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.4.5" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19" +checksum = "ce5f1ceb7f74abbce32601642fcf8e8508a8a8991e0621c7d750295b9095702b" dependencies = [ "aho-corasick", "memchr", @@ -947,9 +948,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.23" +version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] name = "ropey" @@ -1123,9 +1124,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.69" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48fe99c6bd8b1cc636890bcc071842de909d902c81ac7dab53ba33c421ab8ffb" +checksum = "ad184cc9470f9117b2ac6817bfe297307418819ba40552f9b3846f05c33d5373" dependencies = [ "proc-macro2", "quote", @@ -1226,8 +1227,9 @@ dependencies = [ [[package]] name = "tui" -version = "0.14.0" -source = "git+https://github.com/fdehau/tui-rs#4e76bfa2ca8eb51719d611bb8d3d4094ab8ba398" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "861d8f3ad314ede6219bcb2ab844054b1de279ee37a9bc38e3d606f9d3fb2a71" dependencies = [ "bitflags", "cassowary", @@ -1277,9 +1279,9 @@ checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" [[package]] name = "unicode-xid" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" [[package]] name = "url" @@ -1300,12 +1302,6 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" -[[package]] -name = "vec-arena" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34b2f665b594b07095e3ac3f718e13c2197143416fae4c5706cffb7b1af8d7f1" - [[package]] name = "vec_map" version = "0.8.2" diff --git a/flake.lock b/flake.lock index a927eb95..82e41f3f 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "flake-utils": { "locked": { - "lastModified": 1617631617, - "narHash": "sha256-PARRCz55qN3gy07VJZIlFeOX420d0nGF0RzGI/9hVlw=", + "lastModified": 1619345332, + "narHash": "sha256-qHnQkEp1uklKTpx3MvKtY6xzgcqXDsz5nLilbbuL+3A=", "owner": "numtide", "repo": "flake-utils", - "rev": "b2c27d1a81b0dc266270fa8aeecebbd1807fc610", + "rev": "2ebf2558e5bf978c7fb8ea927dfaed8fefab2e28", "type": "github" }, "original": { @@ -35,11 +35,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1614785451, - "narHash": "sha256-TPw8kQvr2UNCuvndtY+EjyXp6Q5GEW2l9UafXXh1XmI=", + "lastModified": 1618844365, + "narHash": "sha256-Z9t0rr+5OG/ru3jdg3jivfYVU4ydV/nqt8UwIut7uHs=", "owner": "nmattia", "repo": "naersk", - "rev": "e0fe990b478a66178a58c69cf53daec0478ca6f9", + "rev": "32e3ba39d9d83098b13720a4384bdda191dd0445", "type": "github" }, "original": { @@ -50,10 +50,10 @@ }, "nixpkgs": { "locked": { - "lastModified": 1617755977, - "narHash": "sha256-vkYi/Q25f9g2ZISS1IT27S+Vv1WDybdegs5SLsktAHw=", - "path": "/nix/store/3sazzf324zxa6wc2dw1x02dh1v05g4s1-source", - "rev": "4cb48cc25622334f17ec6b9bf56e83de0d521fb7", + "lastModified": 1619775165, + "narHash": "sha256-2qaBErjxuWpTIq6Yee5GJmhr84hmzBotLQ0ayg1VXg8=", + "path": "/nix/store/gs997rgx3pvdgcb54wd3fi9wbnznd9g4-source", + "rev": "849b29b4f76d66ec7aeeeed699b7e27ef3db7c02", "type": "path" }, "original": { @@ -63,11 +63,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1617899217, - "narHash": "sha256-gd5JHH7IkeoIQ/oiGZSqDpGdGt7DMRJTQ8JiD8+hdOQ=", + "lastModified": 1619464443, + "narHash": "sha256-R7WAb8EnkIJxxaF6GTHUPytjonhB4Zm0iatyWoW169A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2", + "rev": "8e4fe32876ca15e3d5eb3ecd3ca0b224417f5f17", "type": "github" }, "original": { @@ -106,11 +106,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1617935044, - "narHash": "sha256-14AECpzqqDaA0gJk/Auo4usKG8PfM4Dr9eDAC/Dm7JM=", + "lastModified": 1619835986, + "narHash": "sha256-RZ6opJgAJhcW6jou50D+V36BHu3WUc2uh4C42vx4kio=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5b846f742b2350c175311506e840a29cc0278700", + "rev": "4f2051c76032e86338219f477e5ac9e522dd362a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 23763dac..8ad3c90a 100644 --- a/flake.nix +++ b/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 { diff --git a/helix-term/Cargo.toml b/helix-term/Cargo.toml index a68b9d7d..8f3a28fd 100644 --- a/helix-term/Cargo.toml +++ b/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"] } diff --git a/helix-view/Cargo.toml b/helix-view/Cargo.toml index af322424..a49d440c 100644 --- a/helix-view/Cargo.toml +++ b/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" -- cgit v1.2.3-70-g09d2