Compare commits

..

5 Commits

Author SHA1 Message Date
cb824cf00d Remove the lint command
Can't quite make it work right now. It will have to come later.
2025-04-08 22:08:58 -04:00
365dfab1f1 Try changing the calling convention 2025-04-08 22:06:15 -04:00
60fa2a4016 Set up a linting task 2025-04-08 22:05:00 -04:00
6a51ca7991 Bump to Rust 1.86
This fixes the weird glib build problems that I was running into
2025-04-08 21:54:50 -04:00
21bcece361 Comment out many projects and ensure a fundamental subset are working 2025-03-31 11:18:30 -04:00
14 changed files with 511 additions and 16461 deletions

View File

@ -24,8 +24,6 @@ jobs:
steps:
- name: Checkout repository code
uses: actions/checkout@v4
- name: Where am I?
run: pwd
- name: Build the apps
run: /run/current-system/sw/bin/nix --extra-experimental-features "nix-command flakes" build .#all
- name: Check the end of the build

4159
Cargo.lock generated

File diff suppressed because it is too large Load Diff

12613
Cargo.nix

File diff suppressed because it is too large Load Diff

View File

@ -1,40 +1,74 @@
[workspace]
resolver = "2"
members = [
"authdb",
"bike-lights/core",
"bike-lights/simulator",
"changeset",
"config",
"config-derive",
"coordinates",
"cyber-slides",
# "authdb",
# "bike-lights/core",
# "bike-lights/simulator",
# "changeset",
# "config",
# "config-derive",
# "coordinates",
# "cyber-slides",
"cyberpunk",
"cyberpunk-splash",
"dashboard",
"emseries",
"file-service",
# "dashboard",
# "emseries",
# "file-service",
"fitnesstrax/app",
"fitnesstrax/core",
"fluent-ergonomics",
"geo-types",
"gm-control-panel",
"gm-dash/server",
"hex-grid",
"icon-test",
# "fitnesstrax/core",
# "fluent-ergonomics",
# "geo-types",
# "gm-control-panel",
# "gm-dash/server",
# "hex-grid",
# "icon-test",
"l10n-db",
"memorycache",
"nom-training",
"otg/core",
"otg/gtk",
"pico-st7789",
"result-extended",
"screenplay",
"sgf",
"timezone-testing",
"tree",
# "memorycache",
# "nom-training",
# "otg/core",
# "otg/gtk",
# "pico-st7789",
# "result-extended",
# "screenplay",
# "sgf",
# "timezone-testing",
# "tree",
"visions/server",
"visions/types",
# "visions/types",
"visions/ui",
# "bike-lights/bike",
]
[workspace.dependencies]
adw = { version = "0.5", package = "libadwaita", features = [ "v1_4" ] }
async-channel = { version = "2.1" }
async-std = { version = "1.13" }
async-trait = { version = "0.1" }
axum = { version = "0.8", features = ["macros"] }
cairo-rs = { version = "0.18" }
chrono = { version = "0.4" }
chrono-tz = { version = "0.8" }
dimensioned = { version = "0.8", features = [ "serde" ] }
gdk = { version = "0.7", package = "gdk4" }
gio = { version = "0.18" }
glib = { version = "0.18" }
gloo-console = { version = "0.3.0" }
gloo-net = { version = "0.6.0" }
gtk = { version = "0.7", package = "gtk4", features = [ "v4_10" ] }
serde = { version = "1.0", features = ["derive", "serde_derive"] }
serde-wasm-bindgen = { version = "0.6.5" }
serde_json = { version = "1.0.138" }
thiserror = { version = "2.0" }
tokio = { version = "1.43", features = ["full", "rt"] }
tower-http = { version = "0.6", features = ["cors"] }
uuid = { version = "1.13", features = ["v4"] }
wasm-bindgen = { version = "0.2.100" }
wasm-bindgen-futures = { version = "0.4.50" }
web-sys = { version = "0.3.77" }
yew = { git = "https://github.com/yewstack/yew/", features = ["csr"] }
# cairo-rs = { version = "0.18" }
# gio = { version = "0.18" }
# glib = { version = "0.18" }
# gtk = { version = "0.7", package = "gtk4" }

View File

@ -13,4 +13,8 @@ tasks:
lint:
cmds:
- cargo watch -x clippy
- cargo clippy
test:
cmds:
- cargo test

4
crate-hashes.json Normal file
View File

@ -0,0 +1,4 @@
{
"git+https://github.com/yewstack/yew/#yew-macro@0.21.0": "1g47mpyzd2mib73cjrbmcivrp7kr16f6hbrmpaap56kbc518khwf",
"git+https://github.com/yewstack/yew/#yew@0.21.0": "1g47mpyzd2mib73cjrbmcivrp7kr16f6hbrmpaap56kbc518khwf"
}

View File

@ -7,9 +7,9 @@ license = "GPL-3.0-only"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
async-std = "1.13.0"
cairo-rs = { version = "0.18" }
async-std = { workspace = true }
cairo-rs = { workspace = true }
cyberpunk = { path = "../cyberpunk" }
gio = { version = "0.18" }
glib = { version = "0.18" }
gtk = { version = "0.7", package = "gtk4" }
gio = { workspace = true }
glib = { workspace = true }
gtk = { workspace = true }

View File

@ -6,7 +6,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
cairo-rs = { version = "0.18" }
gio = { version = "0.18" }
glib = { version = "0.18" }
gtk = { version = "0.7", package = "gtk4" }
cairo-rs = { workspace = true }
gio = { workspace = true }
glib = { workspace = true }
gtk = { workspace = true }

View File

@ -6,20 +6,20 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
adw = { version = "0.5", package = "libadwaita", features = [ "v1_4" ] }
async-channel = { version = "2.1" }
async-trait = { version = "0.1" }
chrono = { version = "0.4" }
chrono-tz = { version = "0.8" }
dimensioned = { version = "0.8", features = [ "serde" ] }
adw = { workspace = true }
async-channel = { workspace = true }
async-trait = { workspace = true }
chrono = { workspace = true }
chrono-tz = { workspace = true }
dimensioned = { workspace = true }
emseries = { path = "../../emseries" }
ft-core = { path = "../core" }
gio = { version = "0.18" }
glib = { version = "0.18" }
gdk = { version = "0.7", package = "gdk4" }
gtk = { version = "0.7", package = "gtk4", features = [ "v4_10" ] }
thiserror = { version = "1.0" }
tokio = { version = "1.34", features = [ "full" ] }
gio = { workspace = true }
glib = { workspace = true }
gdk = { workspace = true }
gtk = { workspace = true }
thiserror = { workspace = true }
tokio = { workspace = true }
[build-dependencies]
glib-build-tools = "0.18"

View File

@ -6,12 +6,12 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
chrono = { version = "0.4" }
chrono-tz = { version = "0.8" }
dimensioned = { version = "0.8", features = [ "serde" ] }
chrono = { workspace = true }
chrono-tz = { workspace = true }
dimensioned = { workspace = true }
emseries = { path = "../../emseries" }
serde = { version = "1", features = [ "derive" ] }
serde_json = { version = "1" }
serde = { workspace = true }
serde_json = { workspace = true }
[dev-dependencies]
tempfile = "*"

View File

@ -57,7 +57,6 @@
packages."x86_64-linux" =
let
pkgs = import nixpkgs { system = "x86_64-linux"; };
gtkNativeInputs = [
pkgs.pkg-config
pkgs.gtk4
@ -95,13 +94,13 @@
all = pkgs.symlinkJoin {
name = "all";
paths = [
cyber-slides
# cyber-slides
cyberpunk-splash
dashboard
# dashboard
# file-service
fitnesstrax
l10n-db
otg-gtk
# otg-gtk
];
};

View File

@ -1,4 +1,4 @@
[toolchain]
channel = "1.85.0"
channel = "1.86.0"
targets = [ "wasm32-unknown-unknown", "thumbv6m-none-eabi" ]
components = [ "rustfmt", "rust-analyzer", "clippy" ]

View File

@ -4,12 +4,11 @@ version = "0.1.0"
edition = "2021"
[dependencies]
axum = { version = "0.8.1", features = ["macros"] }
visions-types = { path = "../types" }
serde = { version = "1.0.217", features = ["derive", "serde_derive"] }
tokio = { version = "1.43.0", features = ["full", "rt"] }
tower-http = { version = "0.6.2", features = ["cors"] }
typeshare = "1.0.4"
uuid = { version = "1.13.1", features = ["v4"] }
axum = { workspace = true }
visions-types = { path = "../types" }
serde = { workspace = true }
tokio = { workspace = true }
tower-http = { workspace = true }
uuid = { workspace = true }
result-extended = { path = "../../result-extended" }
thiserror = "2.0.11"
thiserror = { workspace = true }

View File

@ -4,14 +4,14 @@ version = "0.1.0"
edition = "2021"
[dependencies]
visions-types = { path = "../types" }
gloo-console = "0.3.0"
gloo-net = "0.6.0"
serde = { version = "1.0.217", features = ["derive"] }
serde-wasm-bindgen = "0.6.5"
serde_json = "1.0.138"
wasm-bindgen = "0.2.100"
wasm-bindgen-futures = "0.4.50"
web-sys = "0.3.77"
yew = { git = "https://github.com/yewstack/yew/", features = ["csr"] }
gloo-console = { workspace = true }
gloo-net = { workspace = true }
serde = { workspace = true }
serde-wasm-bindgen = { workspace = true }
serde_json = { workspace = true }
visions-types = { path = "../types" }
wasm-bindgen = { workspace = true }
wasm-bindgen-futures = { workspace = true }
web-sys = { workspace = true }
yew = { workspace = true }