Make repo into a workspace

This commit is contained in:
Viv Lim 2022-10-04 00:03:40 -07:00
parent 20851c17bd
commit beebdb55fe
11 changed files with 2207 additions and 31 deletions

3
.gitignore vendored
View File

@ -1,2 +1,3 @@
/target
/result
*/result
*/bespoke.toml

4
Cargo.lock generated
View File

@ -1529,9 +1529,9 @@ dependencies = [
[[package]]
name = "smallvec"
version = "1.9.0"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1"
checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
[[package]]
name = "socket2"

View File

@ -1,26 +1,4 @@
[package]
name = "bespoke"
description = "bespoke webservices for personal use"
homepage = "vvn.space"
version = "0.1.0"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
axum = { version = "0.5", features = ["headers"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.68"
tokio = { version = "1.0", features = ["full"] }
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
config = { version = "0.13.1", features = ["toml"] }
oauth2="4.2.3"
async-session = "3.0.0"
reqwest = { version = "0.11", default-features = false, features = ["json"] }
headers = "0.3"
async-trait = "0.1.57"
http = "0.2"
tera = "1.17"
anyhow = "*"
clap = { version = "4.0", features = [ "derive" ]}
[workspace]
members = [
"server"
]

View File

@ -15,12 +15,12 @@
outputs = { self, nixpkgs, naersk, rust-overlay, flake-utils, ... }:
let
cargoToml = (builtins.fromTOML (builtins.readFile ./Cargo.toml));
cargoToml = (builtins.fromTOML (builtins.readFile ./server/Cargo.toml));
in (flake-utils.lib.eachDefaultSystem (system:
let
# overlay containing a package built from this repo's Cargo.toml
mypkgoverlay = final: prev: {
"${cargoToml.package.name}" = final.callPackage ./. { inherit naersk; };
"${cargoToml.package.name}" = final.callPackage ./server/. { inherit naersk; };
};
overlays = [ (import rust-overlay) mypkgoverlay ];
pkgs = import nixpkgs {

2171
server/Cargo.lock generated Normal file

File diff suppressed because it is too large Load Diff

26
server/Cargo.toml Normal file
View File

@ -0,0 +1,26 @@
[package]
name = "bespoke"
description = "bespoke webservices for personal use"
homepage = "vvn.space"
version = "0.1.0"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
axum = { version = "0.5", features = ["headers"] }
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.68"
tokio = { version = "1.0", features = ["full"] }
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
config = { version = "0.13.1", features = ["toml"] }
oauth2="4.2.3"
async-session = "3.0.0"
reqwest = { version = "0.11", default-features = false, features = ["json"] }
headers = "0.3"
async-trait = "0.1.57"
http = "0.2"
tera = "1.17"
anyhow = "*"
clap = { version = "4.0", features = [ "derive" ]}