From 5a93c4fdcddc4865504e1f6a327330d6b5513a17 Mon Sep 17 00:00:00 2001 From: Savanni D'Gerinel Date: Fri, 9 Feb 2024 09:48:34 -0500 Subject: [PATCH] Bump the fitnesstrax version to 0.4.0 --- Cargo.lock | 2 +- Cargo.nix | 57 +++++++++++++++++++++++++++++++++++++- fitnesstrax/app/Cargo.toml | 2 +- 3 files changed, 58 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fc0a3d4..6bf9537 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -936,7 +936,7 @@ checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" [[package]] name = "fitnesstrax" -version = "0.3.0" +version = "0.4.0" dependencies = [ "async-channel", "async-trait", diff --git a/Cargo.nix b/Cargo.nix index 953acc3..e9f3042 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -185,6 +185,16 @@ rec { # File a bug if you depend on any for non-debug work! debug = internal.debugCrate { inherit packageId; }; }; + "icon-test" = rec { + packageId = "icon-test"; + build = internal.buildRustCrateWithFeatures { + packageId = "icon-test"; + }; + + # Debug support which might change between releases. + # File a bug if you depend on any for non-debug work! + debug = internal.debugCrate { inherit packageId; }; + }; "ifc" = rec { packageId = "ifc"; build = internal.buildRustCrateWithFeatures { @@ -2979,7 +2989,7 @@ rec { }; "fitnesstrax" = rec { crateName = "fitnesstrax"; - version = "0.3.0"; + version = "0.4.0"; edition = "2021"; crateBin = [ { @@ -3023,6 +3033,11 @@ rec { name = "ft-core"; packageId = "ft-core"; } + { + name = "gdk4"; + packageId = "gdk4"; + rename = "gdk"; + } { name = "gio"; packageId = "gio"; @@ -5713,6 +5728,46 @@ rec { } ]; + }; + "icon-test" = rec { + crateName = "icon-test"; + version = "0.1.0"; + edition = "2021"; + crateBin = [ + { + name = "icon-test"; + path = "src/main.rs"; + requiredFeatures = [ ]; + } + ]; + # We can't filter paths with references in Nix 2.4 + # See https://github.com/NixOS/nix/issues/5410 + src = if ((lib.versionOlder builtins.nixVersion "2.4pre20211007") || (lib.versionOlder "2.5" builtins.nixVersion )) + then lib.cleanSourceWith { filter = sourceFilter; src = ./icon-test; } + else ./icon-test; + dependencies = [ + { + name = "gio"; + packageId = "gio"; + } + { + name = "glib"; + packageId = "glib"; + } + { + name = "gtk4"; + packageId = "gtk4"; + rename = "gtk"; + features = [ "v4_10" ]; + } + { + name = "libadwaita"; + packageId = "libadwaita"; + rename = "adw"; + features = [ "v1_4" ]; + } + ]; + }; "idna 0.1.5" = rec { crateName = "idna"; diff --git a/fitnesstrax/app/Cargo.toml b/fitnesstrax/app/Cargo.toml index 2e7a012..64a1e2b 100644 --- a/fitnesstrax/app/Cargo.toml +++ b/fitnesstrax/app/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "fitnesstrax" -version = "0.3.0" +version = "0.4.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html -- 2.44.1