Tidy up manifests and inclusion of workspace dependencies
All checks were successful
Build / Check format (push) Successful in 48s
Build / Build pacwrap (push) Successful in 1m40s

- `alpm` and `pacwrap-core` defined as workspace dependencies being
  imported by each crate.
- Set workspace resolver version to `2`
This commit is contained in:
Xavier Moffett 2024-10-31 16:17:56 -04:00
parent ed2a8ac1ca
commit 80c6042c3b
Signed by: Sapphirus
GPG key ID: A6C061B2CEA1A7AC
4 changed files with 27 additions and 18 deletions

View file

@ -1,17 +1,12 @@
[workspace]
resolver = "1"
resolver = "2"
members = ["pacwrap", "pacwrap-agent", "pacwrap-core"]
[profile.release]
lto = "thin"
opt-level = "s"
[workspace.package]
version = "0.8.7-pre"
edition = "2021"
rust-version = "1.72"
readme = "README.md"
default-run = "pacwrap"
license = "GPL-3.0-only"
authors = [ "Xavier Moffett <sapphirus@azorium.net>" ]
@ -20,3 +15,11 @@ categories = [ "command-line-utilities", "virtualization", "filesystem", "concur
homepage = "https://pacwrap.sapphirus.org/"
repository = "https://github.com/pacwrap/pacwrap"
[workspace.dependencies]
pacwrap-core = { version = "0.8.7-pre", path = "pacwrap-core" }
alpm = { version = "4.0.1", features = ["checkver"] }
[profile.release]
lto = "thin"
opt-level = "s"

View file

@ -16,11 +16,12 @@ homepage.workspace = true
repository.workspace = true
[dependencies]
pacwrap-core = { path = "../pacwrap-core" }
# Serialization
serde = { version = "1.0", features = ["derive"] }
bincode = "1.3.3"
# Packaging
alpm = { version = "4.0.1", features = ["checkver"] }
[dependencies.alpm]
workspace = true
[dependencies.pacwrap-core]
workspace = true

View file

@ -38,7 +38,6 @@ libseccomp = "0.3.0"
signal-hook = "0.3.15"
# Packaging
alpm = { version = "4.0.1", features = ["checkver"] }
pacmanconf = "2.0.0"
tar = "0.4"
zstd = "0.13.0"
@ -52,3 +51,6 @@ indicatif = "0.17.5"
#Cryptography
sha2 = "0.10.8"
[dependencies.alpm]
workspace = true

View file

@ -1,6 +1,7 @@
[package]
name = "pacwrap"
description = "A package manager which facilitates Arch-based bubblewrap containers."
default-run = "pacwrap"
version.workspace = true
@ -17,8 +18,7 @@ homepage.workspace = true
repository.workspace = true
[dependencies]
pacwrap-core = { path = "../pacwrap-core/" }
indexmap = { version = "2.0.0", features = ["serde", "rayon"] }
indexmap = "2.0.0"
nix = "0.22.3, <= 0.22.3"
simplebyteunit = "0.2.1"
@ -27,13 +27,16 @@ command-fds = "0.2.2"
signal-hook = "0.3.15"
os_pipe = "1.1.4"
# Packaging
alpm = { version = "4.0.1", features = ["checkver"] }
# Miscellaneous
sha2 = "0.10.8"
regex = "1.10.3"
rand = "0.8.5"
[build-dependencies]
pacwrap-core = { path = "../pacwrap-core/" }
[dependencies.alpm]
workspace = true
[dependencies.pacwrap-core]
workspace = true
[build-dependencies.pacwrap-core]
workspace = true