diff --git a/Cargo.lock b/Cargo.lock index 2c94501..dacc16c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -597,9 +597,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ae868b5a0f67631c14589f7e250c1ea2c574ee5ba21c6c8dd4b1485705a5a1" +checksum = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8" dependencies = [ "indexmap", "serde", @@ -621,9 +621,9 @@ dependencies = [ [[package]] name = "toml_parser" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97200572db069e74c512a14117b296ba0a80a30123fbbb5aa1f4a348f639ca30" +checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10" dependencies = [ "winnow", ] diff --git a/Cargo.toml b/Cargo.toml index 3a0a3ea..a6a421e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,18 +1,40 @@ -[workspace] -members = ["crates/*"] -resolver = "2" +[package] +name = "pacdef" +description = "multi-backend declarative package manager for Linux" +version = "1.6.0" -[workspace.package] -edition = "2021" +edition = "2024" license = "GPL-3.0-or-later" repository = "https://github.com/steven-omaha/pacdef" readme = "README.md" keywords = ["package-manager", "linux", "declarative", "cli"] categories = ["command-line-utilities"] -rust-version = "1.74" +rust-version = "1.85" -[workspace.dependencies] -pacdef = { path = "crates/pacdef" } +[dependencies] +anyhow = "1.0" +clap = { version = "4.5", features = ["derive"] } +const_format = { version = "0.2", default-features = false } +path-absolutize = "3.1" +regex = { version = "1.10", default-features = false, features = ["std"] } +termios = "0.3" +walkdir = "2.5" +libc = "0.2" +enum_dispatch = "0.3" +log = { version = "0.4", features = ["std"] } + +serde = { version = "1.0", features = ["derive"] } +serde_json = "1.0" +toml = "0.9" + +# backends +alpm = { version = "4.0", optional = true } +rust-apt = { version = "0.8", optional = true } + +[features] +default = [] +arch = ["dep:alpm"] +debian = ["dep:rust-apt"] [profile.release] lto = "off" diff --git a/crates/pacdef/build.rs b/build.rs similarity index 100% rename from crates/pacdef/build.rs rename to build.rs diff --git a/crates/pacdef/Cargo.toml b/crates/pacdef/Cargo.toml deleted file mode 100644 index a724cd4..0000000 --- a/crates/pacdef/Cargo.toml +++ /dev/null @@ -1,36 +0,0 @@ -[package] -name = "pacdef" -description = "multi-backend declarative package manager for Linux" -version = "1.6.0" - -edition.workspace = true -license.workspace = true -repository.workspace = true -readme.workspace = true -keywords.workspace = true -categories.workspace = true - -[dependencies] -anyhow = "1.0" -clap = { version = "4.5", features = ["derive"] } -const_format = { version = "0.2", default-features = false } -path-absolutize = "3.1" -regex = { version = "1.10", default-features = false, features = ["std"] } -termios = "0.3" -walkdir = "2.5" -libc = "0.2" -enum_dispatch = "0.3" -log = { version = "0.4", features = ["std"] } - -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" -toml = "0.9" - -# backends -alpm = { version = "4.0", optional = true } -rust-apt = { version = "0.8", optional = true } - -[features] -default = [] -arch = ["dep:alpm"] -debian = ["dep:rust-apt"] diff --git a/crates/pacdef/src/backend/actual/arch.rs b/src/backend/actual/arch.rs similarity index 100% rename from crates/pacdef/src/backend/actual/arch.rs rename to src/backend/actual/arch.rs diff --git a/crates/pacdef/src/backend/actual/debian.rs b/src/backend/actual/debian.rs similarity index 100% rename from crates/pacdef/src/backend/actual/debian.rs rename to src/backend/actual/debian.rs diff --git a/crates/pacdef/src/backend/actual/fedora.rs b/src/backend/actual/fedora.rs similarity index 100% rename from crates/pacdef/src/backend/actual/fedora.rs rename to src/backend/actual/fedora.rs diff --git a/crates/pacdef/src/backend/actual/flatpak.rs b/src/backend/actual/flatpak.rs similarity index 100% rename from crates/pacdef/src/backend/actual/flatpak.rs rename to src/backend/actual/flatpak.rs diff --git a/crates/pacdef/src/backend/actual/mod.rs b/src/backend/actual/mod.rs similarity index 100% rename from crates/pacdef/src/backend/actual/mod.rs rename to src/backend/actual/mod.rs diff --git a/crates/pacdef/src/backend/actual/python.rs b/src/backend/actual/python.rs similarity index 100% rename from crates/pacdef/src/backend/actual/python.rs rename to src/backend/actual/python.rs diff --git a/crates/pacdef/src/backend/actual/rust.rs b/src/backend/actual/rust.rs similarity index 100% rename from crates/pacdef/src/backend/actual/rust.rs rename to src/backend/actual/rust.rs diff --git a/crates/pacdef/src/backend/actual/rustup/helpers.rs b/src/backend/actual/rustup/helpers.rs similarity index 100% rename from crates/pacdef/src/backend/actual/rustup/helpers.rs rename to src/backend/actual/rustup/helpers.rs diff --git a/crates/pacdef/src/backend/actual/rustup/mod.rs b/src/backend/actual/rustup/mod.rs similarity index 100% rename from crates/pacdef/src/backend/actual/rustup/mod.rs rename to src/backend/actual/rustup/mod.rs diff --git a/crates/pacdef/src/backend/actual/rustup/types.rs b/src/backend/actual/rustup/types.rs similarity index 100% rename from crates/pacdef/src/backend/actual/rustup/types.rs rename to src/backend/actual/rustup/types.rs diff --git a/crates/pacdef/src/backend/actual/void.rs b/src/backend/actual/void.rs similarity index 100% rename from crates/pacdef/src/backend/actual/void.rs rename to src/backend/actual/void.rs diff --git a/crates/pacdef/src/backend/backend_trait.rs b/src/backend/backend_trait.rs similarity index 100% rename from crates/pacdef/src/backend/backend_trait.rs rename to src/backend/backend_trait.rs diff --git a/crates/pacdef/src/backend/mod.rs b/src/backend/mod.rs similarity index 100% rename from crates/pacdef/src/backend/mod.rs rename to src/backend/mod.rs diff --git a/crates/pacdef/src/backend/root.rs b/src/backend/root.rs similarity index 100% rename from crates/pacdef/src/backend/root.rs rename to src/backend/root.rs diff --git a/crates/pacdef/src/backend/todo_per_backend.rs b/src/backend/todo_per_backend.rs similarity index 100% rename from crates/pacdef/src/backend/todo_per_backend.rs rename to src/backend/todo_per_backend.rs diff --git a/crates/pacdef/src/cli.rs b/src/cli.rs similarity index 100% rename from crates/pacdef/src/cli.rs rename to src/cli.rs diff --git a/crates/pacdef/src/cmd.rs b/src/cmd.rs similarity index 100% rename from crates/pacdef/src/cmd.rs rename to src/cmd.rs diff --git a/crates/pacdef/src/config.rs b/src/config.rs similarity index 100% rename from crates/pacdef/src/config.rs rename to src/config.rs diff --git a/crates/pacdef/src/core.rs b/src/core.rs similarity index 100% rename from crates/pacdef/src/core.rs rename to src/core.rs diff --git a/crates/pacdef/src/env.rs b/src/env.rs similarity index 100% rename from crates/pacdef/src/env.rs rename to src/env.rs diff --git a/crates/pacdef/src/errors.rs b/src/errors.rs similarity index 100% rename from crates/pacdef/src/errors.rs rename to src/errors.rs diff --git a/crates/pacdef/src/grouping/group.rs b/src/grouping/group.rs similarity index 100% rename from crates/pacdef/src/grouping/group.rs rename to src/grouping/group.rs diff --git a/crates/pacdef/src/grouping/mod.rs b/src/grouping/mod.rs similarity index 100% rename from crates/pacdef/src/grouping/mod.rs rename to src/grouping/mod.rs diff --git a/crates/pacdef/src/grouping/package.rs b/src/grouping/package.rs similarity index 100% rename from crates/pacdef/src/grouping/package.rs rename to src/grouping/package.rs diff --git a/crates/pacdef/src/grouping/section.rs b/src/grouping/section.rs similarity index 100% rename from crates/pacdef/src/grouping/section.rs rename to src/grouping/section.rs diff --git a/crates/pacdef/src/lib.rs b/src/lib.rs similarity index 100% rename from crates/pacdef/src/lib.rs rename to src/lib.rs diff --git a/crates/pacdef/src/main.rs b/src/main.rs similarity index 100% rename from crates/pacdef/src/main.rs rename to src/main.rs diff --git a/crates/pacdef/src/path.rs b/src/path.rs similarity index 100% rename from crates/pacdef/src/path.rs rename to src/path.rs diff --git a/crates/pacdef/src/prelude.rs b/src/prelude.rs similarity index 100% rename from crates/pacdef/src/prelude.rs rename to src/prelude.rs diff --git a/crates/pacdef/src/review/datastructures.rs b/src/review/datastructures.rs similarity index 100% rename from crates/pacdef/src/review/datastructures.rs rename to src/review/datastructures.rs diff --git a/crates/pacdef/src/review/mod.rs b/src/review/mod.rs similarity index 100% rename from crates/pacdef/src/review/mod.rs rename to src/review/mod.rs diff --git a/crates/pacdef/src/review/strategy.rs b/src/review/strategy.rs similarity index 100% rename from crates/pacdef/src/review/strategy.rs rename to src/review/strategy.rs diff --git a/crates/pacdef/src/search.rs b/src/search.rs similarity index 100% rename from crates/pacdef/src/search.rs rename to src/search.rs diff --git a/crates/pacdef/src/ui.rs b/src/ui.rs similarity index 100% rename from crates/pacdef/src/ui.rs rename to src/ui.rs