Skip to content

Fix Nix builds and update the lock file #641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Sep 29, 2025
Merged

Fix Nix builds and update the lock file #641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ad7b5ce
Fix clippy warnings
ipetkov Sep 28, 2025
3986a88
Fix doc example
ipetkov Sep 28, 2025
f94014d
Clean up tonic-web usage
ipetkov Sep 29, 2025
c3a2076
ci: run clippy with all features enabled
ipetkov Sep 29, 2025
3ca49b1
ci: run all crate tests in one invocation
ipetkov Sep 29, 2025
619831e
Fix nix builds
ipetkov Sep 29, 2025
c18561c
flake.lock: Update
ipetkov Sep 29, 2025
4d24115
flake: drop non-existent override
ipetkov Sep 26, 2025
c1d2f1e
Merge branch 'main' into push-vvysqzvryqyo
seanmonstar Sep 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 25 additions & 4 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
url = "github:oxalica/rust-overlay";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
};
};
};
Expand Down Expand Up @@ -66,12 +65,32 @@
pname = cargoTOML.package.name;
version = cargoTOML.package.version;

nativeBuildInputs = [ protobuf ];
nativeBuildInputs = [
installShellFiles
protobuf
];

RUSTFLAGS = "--cfg tokio_unstable";

inherit src;

cargoLock = { lockFile = "${src}/Cargo.lock"; };

checkFlags = [
# tests depend upon git repository at test execution time
"--skip bootstrap"
"--skip config::tests::args_example_changed"
"--skip config::tests::toml_example_changed"
"--skip cli_tests"
];

postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd tokio-console \
--bash <($out/bin/tokio-console --log-dir $(mktemp -d) gen-completion bash) \
--fish <($out/bin/tokio-console --log-dir $(mktemp -d) gen-completion fish) \
--zsh <($out/bin/tokio-console --log-dir $(mktemp -d) gen-completion zsh)
'';

meta = {
inherit (cargoTOML.package) description homepage license;
maintainers = cargoTOML.package.authors;
Expand All @@ -84,8 +103,7 @@
devShell = with pkgs;
mkShell {
name = "tokio-console-env";
buildInputs = tokio-console.buildInputs ++ lib.optional stdenv.isDarwin libiconv;
nativeBuildInputs = tokio-console.nativeBuildInputs;
inputsFrom = [ tokio-console ];
RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";
CARGO_TERM_COLOR = "always";
RUST_BACKTRACE = "full";
Expand All @@ -105,5 +123,8 @@
inherit tokio-console;
default = self.packages.${system}.tokio-console;
};
checks = {
inherit tokio-console;
};
});
}
Loading