From 9dba835bcf11a15e52c99aff3009bfa1be68c895 Mon Sep 17 00:00:00 2001 From: Lyle Mantooth Date: Sat, 20 May 2023 12:28:56 -0400 Subject: [PATCH] Use rustup for nightly, so we can download from `menteeth` registry. --- .cargo/config.toml | 8 ++++++++ flake.nix | 7 ++++--- rust-toolchain.toml | 2 ++ 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 .cargo/config.toml create mode 100644 rust-toolchain.toml diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 0000000..529b14d --- /dev/null +++ b/.cargo/config.toml @@ -0,0 +1,8 @@ +[unstable] +registry-auth = true + +[registries.menteeth] +index = "ssh://git@git.shipyard.rs/menteeth/crate-index.git" + +[net] +git-fetch-with-cli = true diff --git a/flake.nix b/flake.nix index 3129a67..888531f 100644 --- a/flake.nix +++ b/flake.nix @@ -37,16 +37,17 @@ src = if inShell then null else ./.; buildInputs = - [ rustc - cargo - openssl + [ openssl pkg-config ] ++ (if inShell then [ # In 'nix develop', provide some developer tools. rust-analyzer rustfmt + rustup clippy ] else [ + rustc + cargo (import-cargo.builders.importCargo { lockFile = ./Cargo.lock; inherit pkgs; diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000..9706c9a --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "nightly-2023-04-30"