Skip to content

Commit

Permalink
cli: re-enable 'watchman' support when 'packaging' is enabled
Browse files Browse the repository at this point in the history
Summary: 70f6e0a enabled watchman by default in the *default* features set, but
removed it from the 'packaging' set. But features are not 'additive' by default.
When building the Nix flake from this repository, it uses --features packaging,
which no longer enables watchman, because it was removed.

The easiest solution is probably just to ensure 'packaging' is always a superset
of 'default', but I'm not sure of a way to do this.

Signed-off-by: Austin Seipp <[email protected]>
Change-Id: Ia31d5b98e0324a2b19014a3cae25672d
  • Loading branch information
thoughtpolice committed Sep 8, 2023
1 parent 70f6e0a commit f328973
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,6 @@ testutils = { workspace = true }
[features]
default = ["watchman"]
bench = ["dep:criterion"]
packaging = []
packaging = ["watchman"]
vendored-openssl = ["git2/vendored-openssl", "jj-lib/vendored-openssl"]
watchman = ["jj-lib/watchman"]

0 comments on commit f328973

Please sign in to comment.