Skip to content

De-duplicate deps and symlink license #457

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
bilelmoussaoui merged 2 commits into from
Apr 1, 2026
Merged

De-duplicate deps and symlink license #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
391c887
Sort & de-duplicate deps using workspace features
bilelmoussaoui Apr 1, 2026
d9c7b91
Symlink license in all the crates
bilelmoussaoui Apr 1, 2026
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
24 changes: 12 additions & 12 deletions Cargo.lock
View file
Open in desktop

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

22 changes: 16 additions & 6 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,32 @@ rust-version = "1.88"
exclude = ["org.freedesktop.Secrets.xml"]

[workspace.dependencies]
zvariant = { version = "5.8", default-features = false, features = ["gvariant", "serde_bytes"]}
ashpd = {version = "0.13", default-features = false}
ashpd = { version = "0.13", default-features = false }
base64 = "0.22"
cbc = "0.1"
clap = { version = "4.5", features = ["cargo", "derive"] }
endi = "1.1"
clap = { version = "4.5", features = [ "cargo", "derive" ] }
futures-channel = "0.3"
futures-lite = "2.6"
futures-util = "0.3"
hkdf = "0.12"
libc = "0.2"
md-5 = "0.10"
num = "0.4.0"
num-bigint-dig = { version = "0.9", features = ["zeroize"] }
oo7 = { path = "client", version = "0.6.0-alpha", default-features = false, features = ["unstable", "tracing"]}
oo7 = { path = "client", version = "0.6.0-alpha", default-features = false, features = ["unstable", "tracing"] }
openssl = "0.10"
pbkdf2 = { version = "0.12", default-features = false }
rpassword = "7.4"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
tokio = { version = "1.50", default-features = false }
serde_repr = "0.1"
sha2 = "0.10"
tempfile = "3.26"
tokio = { version = "1.50", default-features = false }
tracing = "0.1"
tracing-subscriber = "0.3"
zbus = { version = "5.14.0", default-features = false }
zbus_macros = {version = "5.11", features = ["gvariant"]}
zbus_macros = { version = "5.11", features = ["gvariant"] }
zeroize = { version = "1", features = ["zeroize_derive"] }
zvariant = { version = "5.8", default-features = false, features = ["gvariant", "serde_bytes"] }
1 change: 1 addition & 0 deletions cargo-credential/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../LICENSE
12 changes: 6 additions & 6 deletions cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ rust-version.workspace = true
version.workspace = true

[dependencies]
anstyle = "1.0.13"
time = { version = "0.3", default-features = false, features = ["alloc", "formatting", "local-offset"] }
anstyle = "1.0"
clap.workspace = true
hex = "0.4"
oo7 = { workspace = true, features = ["tokio"] }
rpassword = "7.4.0"
tokio = { workspace = true, features = [ "macros", "rt"] }
serde_json = { workspace = true }
serde = { workspace = true }
rpassword.workspace = true
serde.workspace = true
serde_json.workspace = true
time = { version = "0.3", default-features = false, features = ["alloc", "formatting", "local-offset"] }
tokio = { workspace = true, features = ["macros", "rt"] }

[features]
default = ["native_crypto"]
Expand Down
26 changes: 13 additions & 13 deletions client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@ version.workspace = true
[dependencies]
aes = { version = "0.8", features = ["zeroize"], optional = true }
ashpd = { workspace = true, features = ["secret"] }
async-fs = { version = "2.2.0", optional = true }
async-io = { version = "2.6.0", optional = true }
async-lock = { version = "3.4.2", optional = true }
blocking = { version = "1.5.1", optional = true }
cbc = { version = "0.1", features = ["zeroize"], optional = true }
async-fs = { version = "2.2", optional = true }
async-io = { version = "2.6", optional = true }
async-lock = { version = "3.4", optional = true }
blocking = { version = "1.5", optional = true }
cbc = { workspace = true, features = ["zeroize"], optional = true }
endi.workspace = true
futures-lite = { workspace = true, optional = true }
futures-util.workspace = true
getrandom = "0.4"
oo7-macros = { path = "../macros", version = "0.6.0-alpha", optional = true }
hkdf = { version = "0.12", optional = true }
md-5 = { version = "0.10", optional = true }
num = "0.4.0"
hkdf = { workspace = true, optional = true }
md-5 = { workspace = true, optional = true }
num.workspace = true
num-bigint-dig.workspace = true
openssl = { version = "0.10", optional = true }
pbkdf2 = { version = "0.12", optional = true }
oo7-macros = { path = "../macros", version = "0.6.0-alpha", optional = true }
openssl = { workspace = true, optional = true }
pbkdf2 = { workspace = true, optional = true, features = ["hmac"] }
serde.workspace = true
serde_bytes = "0.11"
sha2 = { version = "0.10", optional = true }
sha2 = { workspace = true, optional = true }
subtle = { version = "2.5", optional = true }
tokio = { workspace = true, features = [
"sync",
Expand All @@ -50,7 +50,7 @@ zeroize.workspace = true
oo7-daemon = { path = "../server", features = ["test-util"], default-features = false, version = "0.6.0-alpha" }
tempfile.workspace = true
tokio = { workspace = true, features = ["macros", "rt-multi-thread", "time"] }
tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] }
tracing-subscriber = { workspace = true, features = ["env-filter", "fmt"] }

[features]
default = ["tokio", "native_crypto"]
Expand Down
8 changes: 4 additions & 4 deletions kwallet/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ license.workspace = true
rust-version.workspace = true

[dependencies]
clap.workspace = true
kwallet-parser = { version = "0.6.0-alpha", path = "../parser" }
oo7 = { workspace = true, features = ["tokio", "native_crypto"] }
clap = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
rpassword = "7.3"
rpassword.workspace = true
serde.workspace = true
serde_json.workspace = true
tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }
1 change: 1 addition & 0 deletions kwallet/cli/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../LICENSE
18 changes: 9 additions & 9 deletions kwallet/parser/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ rust-version.workspace = true
exclude.workspace = true

[dependencies]
base64.workspace = true
blowfish = "0.9"
cbc = "0.1"
cbc.workspace = true
cipher = { version = "0.4", features = ["block-padding"] }
ecb = "0.1"
md-5 = "0.10"
md-5.workspace = true
pbkdf2 = { workspace = true, default-features = false, features = ["simple"] }
serde.workspace = true
serde_json.workspace = true
sha1 = "0.10"
sha2 = "0.10"
pbkdf2 = { version = "0.12", default-features = false, features = ["simple"] }
cipher = { version = "0.4", features = ["block-padding"] }
zeroize = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
base64 = { workspace = true }
sha2.workspace = true
zeroize.workspace = true

[dev-dependencies]
hex = "0.4"
1 change: 1 addition & 0 deletions kwallet/parser/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../LICENSE
4 changes: 2 additions & 2 deletions macros/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ version.workspace = true
proc-macro = true

[dependencies]
syn = { version = "2.0", features = ["full"] }
quote = "1.0"
proc-macro2 = "1.0"
quote = "1.0"
syn = { version = "2.0", features = ["full"] }
1 change: 1 addition & 0 deletions macros/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../LICENSE
16 changes: 8 additions & 8 deletions pam/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ name = "pam_oo7"
crate-type = ["cdylib"]

[dependencies]
libc = "0.2"
libc.workspace = true
serde.workspace = true
serde_repr.workspace = true
tokio = { workspace = true, features = ["rt", "rt-multi-thread", "net", "io-util", "sync", "time"] }
serde = { workspace = true }
serde_repr = "0.1"
zvariant = { workspace = true }
tracing = { workspace = true }
tracing-subscriber = { workspace = true, features = ["env-filter"] }
tracing.workspace = true
tracing-journald = "0.3"
zeroize = { workspace = true }
tracing-subscriber = { workspace = true, features = ["env-filter"] }
zeroize.workspace = true
zvariant.workspace = true

[dev-dependencies]
tempfile = { workspace = true }
tempfile.workspace = true
tokio = { workspace = true, features = ["rt", "rt-multi-thread", "net", "io-util", "sync", "time", "macros"] }
1 change: 1 addition & 0 deletions pam/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../LICENSE
2 changes: 1 addition & 1 deletion python/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ crate-type = ["cdylib"]
oo7_rs = { package = "oo7", path = "../client", version = "0.6.0-alpha" }
pyo3 = { version = "0.28", features = ["extension-module", "abi3-py38"] }
pyo3-async-runtimes = { version = "0.28", features = ["tokio-runtime"] }
tokio = { version = "1", features = ["rt-multi-thread"] }
tokio = { workspace = true, features = ["rt-multi-thread"] }
1 change: 1 addition & 0 deletions python/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../LICENSE
26 changes: 13 additions & 13 deletions server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,31 +20,31 @@ path = "src/lib.rs"
test = false

[dependencies]
ashpd = {workspace = true, features = ["backend", "secret", "tracing"]}
base64 = {version = "0.22", optional = true}
ashpd = { workspace = true, features = ["backend", "secret", "tracing"] }
base64 = { version = "0.22", optional = true }
clap.workspace = true
enumflags2 = "0.7"
formatx = "0.2"
gettext-rs = {version = "0.7", features = ["gettext-system"]}
hkdf = { version = "0.12", optional = true }
gettext-rs = { version = "0.7", features = ["gettext-system"] }
hkdf = { workspace = true, optional = true }
kwallet-parser = { version = "0.6.0-alpha", path = "../kwallet/parser", optional = true }
libc = "0.2"
rustix = { version = "1.1", default-features = false, features = ["process", "std", "thread", "mm"] }
num = "0.4.0"
libc.workspace = true
num.workspace = true
num-bigint-dig.workspace = true
openssl = { version = "0.10", optional = true }
oo7 = { workspace = true, features = ["tokio"] }
rpassword = "7.4"
openssl = { workspace = true, optional = true }
rpassword.workspace = true
rustix = { version = "1.1", default-features = false, features = ["process", "std", "thread", "mm"] }
serde.workspace = true
serde_repr = "0.1"
sha2 = { version = "0.10", optional = true }
serde_repr.workspace = true
sha2 = { workspace = true, optional = true }
tempfile = { workspace = true, optional = true }
tokio = { workspace = true, features = ["full"] }
tokio-stream = "0.1"
tracing = "0.1"
tracing.workspace = true
tracing-subscriber.workspace = true
zbus = { workspace = true, features = ["p2p"] }
zeroize.workspace = true
tempfile = { workspace = true, optional = true }

[features]
test-util = ["dep:tempfile"]
Expand Down
1 change: 0 additions & 1 deletion server/LICENSE
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions server/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../LICENSE
Loading