Merge pull request #654 from JakeStanger/dependabot/cargo/serde_json-1.0.119

build(deps): bump serde_json from 1.0.117 to 1.0.119
Merge pull request #653 from JakeStanger/dependabot/cargo/clap-4.5.8
2024-10-05 18:58:04 +03:00 · 2024-07-02 14:39:13 +01:00 · 2024-07-02 14:38:56 +01:00 · 2024-07-02 14:38:35 +01:00 · 2024-07-01 14:44:08 +00:00 · 2024-07-01 14:43:55 +00:00
3 changed files with 17 additions and 13 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -456,9 +456,9 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "4.5.7"
+version = "4.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f"
+checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d"
 dependencies = [
 "clap_builder",
 "clap_derive",
@ -466,9 +466,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.5.7"
+version = "4.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f"
+checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708"
 dependencies = [
 "anstream",
 "anstyle",
@ -478,9 +478,9 @@ dependencies = [

 [[package]]
 name = "clap_derive"
-version = "4.5.5"
+version = "4.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
+checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085"
 dependencies = [
 "heck 0.5.0",
 "proc-macro2",
@ -2798,9 +2798,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.117"
+version = "1.0.119"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+checksum = "e8eddb61f0697cc3989c5d64b452f5488e2b8a60fd7d5076a3045076ffef8cb0"
 dependencies = [
 "itoa",
 "ryu",
--- a/Cargo.toml
+++ b/Cargo.toml
@ -113,10 +113,10 @@ ctrlc = "3.4.2"
 cfg-if = "1.0.0"

 # cli
-clap = { version = "4.5.7", optional = true, features = ["derive"] }
+clap = { version = "4.5.8", optional = true, features = ["derive"] }

 # ipc
-serde_json = { version = "1.0.117", optional = true }
+serde_json = { version = "1.0.119", optional = true }

 # http
 reqwest = { version = "0.12.5", default-features = false, features = ["default-tls", "http2"], optional = true }
--- a/flake.nix
+++ b/flake.nix
@ -162,7 +162,7 @@
            };

            style = lib.mkOption {
-              type = lib.types.lines;
+              type = lib.types.either (lib.types.lines) (lib.types.path);
              default = "";
              description = "The stylesheet to apply to ironbar.";
            };
@ -189,8 +189,12 @@
                source = jsonFormat.generate "ironbar-config" cfg.config;
              };

-              "ironbar/style.css" =
-                lib.mkIf (cfg.style != "") { text = cfg.style; };
+              "ironbar/style.css" = lib.mkIf (cfg.style != "") (
+                if builtins.isPath cfg.style || lib.isStorePath cfg.style then
+                  { source = cfg.style; }
+                else
+                  { text = cfg.style; }
+              );
            };

            systemd.user.services.ironbar = lib.mkIf cfg.systemd {
Author	SHA1	Message	Date
Jake Stanger	bcaa13deae	Merge pull request #654 from JakeStanger/dependabot/cargo/serde_json-1.0.119 build(deps): bump serde_json from 1.0.117 to 1.0.119	2024-07-02 14:39:13 +01:00
Jake Stanger	91f02c8ed1	Merge pull request #653 from JakeStanger/dependabot/cargo/clap-4.5.8 build(deps): bump clap from 4.5.7 to 4.5.8	2024-07-02 14:38:56 +01:00
Alpha-Ursae-Minoris	92ae1a8d73	feat(nix): home-manager option to read style.css file	2024-07-02 14:38:35 +01:00
dependabot[bot]	da7c190c42	build(deps): bump serde_json from 1.0.117 to 1.0.119 Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.117 to 1.0.119. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.117...v1.0.119) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-07-01 14:44:08 +00:00
dependabot[bot]	9d7f0ff6dc	build(deps): bump clap from 4.5.7 to 4.5.8 Bumps [clap](https://github.com/clap-rs/clap) from 4.5.7 to 4.5.8. - [Release notes](https://github.com/clap-rs/clap/releases) - [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md) - [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v4.5.7...v4.5.8) --- updated-dependencies: - dependency-name: clap dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-07-01 14:43:55 +00:00