aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFuwn <[email protected]>2024-09-14 10:16:31 +0000
committerFuwn <[email protected]>2024-09-14 10:16:31 +0000
commite7afbb482c19c37d4fd6411a533f2ce619af5b3f (patch)
tree0496be385408059292f94910d78bf8da750a0ee7
parentchore(nix): flake-based development shell (diff)
downloadseptember-e7afbb482c19c37d4fd6411a533f2ce619af5b3f.tar.xz
september-e7afbb482c19c37d4fd6411a533f2ce619af5b3f.zip
chore: move development shell to just
-rw-r--r--Makefile.toml29
-rw-r--r--flake.nix15
-rw-r--r--justfile20
3 files changed, 33 insertions, 31 deletions
diff --git a/Makefile.toml b/Makefile.toml
deleted file mode 100644
index 64fd91d..0000000
--- a/Makefile.toml
+++ /dev/null
@@ -1,29 +0,0 @@
-[tasks.fmt]
-args = ["fmt"]
-command = "cargo"
-toolchain = "nightly"
-
-[tasks.check]
-args = ["check", "--all-features"]
-command = "cargo"
-
-[tasks.clippy]
-args = ["clippy"]
-command = "cargo"
-
-[tasks.checkf]
-dependencies = ["fmt", "check"]
-
-[tasks.checkfc]
-dependencies = ["fmt", "check", "clippy"]
-
-[tasks.run]
-args = ["run"]
-command = "cargo"
-dependencies = ["checkfc"]
-
-[tasks.docker-build]
-args = ["build", "-t", "fuwn/september:latest", "."]
-command = "docker"
-dependencies = ["checkfc"]
-
diff --git a/flake.nix b/flake.nix
index 493b0fc..3913f69 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,8 +30,19 @@
stdenv = stdenvAdapters.useMoldLinker clangStdenv;
}
{
- nativeBuildInputs = [
- rust-bin.stable.latest.default
+ buildInputs = [
+ # https://github.com/oxalica/rust-overlay/issues/136#issuecomment-1716902831
+ (lib.hiPrio (
+ rust-bin.stable.latest.minimal.override {
+ extensions = [ "rust-docs" ];
+ }
+ ))
+ (rust-bin.selectLatestNightlyWith (
+ toolchain:
+ toolchain.minimal.override {
+ extensions = [ "rustfmt" ];
+ }
+ ))
cargo-make
openssl
pkg-config
diff --git a/justfile b/justfile
new file mode 100644
index 0000000..1ffc866
--- /dev/null
+++ b/justfile
@@ -0,0 +1,20 @@
+default:
+ @just --list
+
+fmt:
+ cargo fmt
+
+check:
+ cargo check --all-features
+
+checkf:
+ @just fmt
+ @just check
+
+checkfc:
+ @just checkf
+ cargo clippy
+
+run:
+ @just checkfc
+ cargo run