savanni
/
monorepo
1
0
Fork 0
Code Issues 79 Pull Requests Projects 6 Releases Wiki Activity

Fitnesstrax 0.6.0 #201

Merged
savanni merged 1 commits from fitnesstrax/v0.6.0 into main 2024-02-20 12:42:33 +00:00
Conversation 0 Commits 1 Files Changed 4 +15 -4
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -936,7 +936,7 @@ checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6"
[[package]] [[package]]
name = "fitnesstrax" name = "fitnesstrax"
version = "0.5.0" version = "0.6.0"
dependencies = [ dependencies = [
"async-channel", "async-channel",
"async-trait", "async-trait",

13
Cargo.nix
View File

@ -2989,7 +2989,7 @@ rec {
}; };
"fitnesstrax" = rec { "fitnesstrax" = rec {
crateName = "fitnesstrax"; crateName = "fitnesstrax";
version = "0.5.0"; version = "0.6.0";
edition = "2021"; edition = "2021";
crateBin = [ crateBin = [
{ {
@ -3384,6 +3384,13 @@ rec {
crateName = "ft-core"; crateName = "ft-core";
version = "0.1.0"; version = "0.1.0";
edition = "2021"; edition = "2021";
crateBin = [
{
name = "legacy-importer";
path = "src/bin/legacy-importer.rs";
requiredFeatures = [ ];
}
];
# We can't filter paths with references in Nix 2.4 # We can't filter paths with references in Nix 2.4
# See https://github.com/NixOS/nix/issues/5410 # See https://github.com/NixOS/nix/issues/5410
src = if ((lib.versionOlder builtins.nixVersion "2.4pre20211007") || (lib.versionOlder "2.5" builtins.nixVersion )) src = if ((lib.versionOlder builtins.nixVersion "2.4pre20211007") || (lib.versionOlder "2.5" builtins.nixVersion ))
@ -3412,6 +3419,10 @@ rec {
packageId = "serde 1.0.193"; packageId = "serde 1.0.193";
features = [ "derive" ]; features = [ "derive" ];
} }
{
name = "serde_json";
packageId = "serde_json";
}
]; ];
devDependencies = [ devDependencies = [
{ {

2
fitnesstrax/app/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "fitnesstrax" name = "fitnesstrax"
version = "0.5.0" version = "0.6.0"
edition = "2021" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

2
fitnesstrax/app/src/main.rs
View File

@ -36,7 +36,7 @@ const RESOURCE_BASE_PATH: &str = "/com/luminescent-dreams/fitnesstrax/";
fn setup_app_about_action(app: &adw::Application) { fn setup_app_about_action(app: &adw::Application) {
let action = ActionEntry::builder("about") let action = ActionEntry::builder("about")
.activate(|app: &adw::Application, _, _| { .activate(|_app: &adw::Application, _, _| {
let window = about::AboutWindow::default(); let window = about::AboutWindow::default();
window.present(); window.present();
}).build(); }).build();