git.delta.rocks / fleet / refs/commits / 78bc9187eaae

difftreelog

feat non-interactive run0

rwtspuopYaroslav Bolyukin2026-06-15parent: #210037f.patch.diff
in: push-kyumtlkprzyo

7 files changed

modifiedCargo.lockdiffbeforeafterboth
451451
452[[package]]452[[package]]
453name = "bifrostlink"453name = "bifrostlink"
454version = "0.2.6"454version = "0.2.7"
455source = "registry+https://github.com/rust-lang/crates.io-index"455source = "registry+https://github.com/rust-lang/crates.io-index"
456checksum = "2fb01af731c11dd31b23783a83a36a29f644cc1972481f6fa4f4fabc709079eb"456checksum = "0c8ce9dc1425ee2aaffd3324548f114acccd456b9b1ffb33fe9eb9a7be6475a8"
457dependencies = [457dependencies = [
458 "async-trait",458 "async-trait",
459 "async_fn_traits",459 "async_fn_traits",
465 "serde_json",465 "serde_json",
466 "tokio",466 "tokio",
467 "tracing",467 "tracing",
468 "uuid",
469]468]
470469
471[[package]]470[[package]]
472name = "bifrostlink-macros"471name = "bifrostlink-macros"
473version = "0.2.6"472version = "0.2.7"
474source = "registry+https://github.com/rust-lang/crates.io-index"473source = "registry+https://github.com/rust-lang/crates.io-index"
475checksum = "8c4b7a5fb38b36bd81910c17ebf369f9296e508d92b1277a768a63c8a2254fdb"474checksum = "a7d071add2d3b90486fe141edb2e811f7735155d320aee3936ebd67e535d6ac1"
476dependencies = [475dependencies = [
477 "proc-macro2",476 "proc-macro2",
478 "quote",477 "quote",
481480
482[[package]]481[[package]]
483name = "bifrostlink-ports"482name = "bifrostlink-ports"
484version = "0.2.6"483version = "0.2.7"
485source = "registry+https://github.com/rust-lang/crates.io-index"484source = "registry+https://github.com/rust-lang/crates.io-index"
486checksum = "977acfcb8ed3c24ab7c2f76fb3eeebff1533c72708733ce6020f2501980b7cf2"485checksum = "ccf6ba32d0ff83b27a242f9d2fca124ad215ddd9bf99144d66b7ca44a885de50"
487dependencies = [486dependencies = [
488 "bifrostlink",487 "bifrostlink",
489 "bytes",488 "bytes",
36543653
3655[[package]]3654[[package]]
3656name = "remowt-client"3655name = "remowt-client"
3657version = "0.1.7"3656version = "0.1.9"
3658source = "registry+https://github.com/rust-lang/crates.io-index"3657source = "registry+https://github.com/rust-lang/crates.io-index"
3659checksum = "34d59c0ce311b4b3c094b0b196a1004aa438b9947c3eace2ca4d2a0ac08fac59"3658checksum = "af0ab07d961f14fa5c4933899a5253341e2044dec71db6e341f80b16beff2c20"
3660dependencies = [3659dependencies = [
3661 "anyhow",3660 "anyhow",
3662 "bifrostlink",3661 "bifrostlink",
3663 "bifrostlink-ports",
3664 "bytes",3662 "bytes",
3665 "camino",3663 "camino",
3666 "futures",3664 "futures",
36793677
3680[[package]]3678[[package]]
3681name = "remowt-endpoints"3679name = "remowt-endpoints"
3682version = "0.1.7"3680version = "0.1.9"
3683source = "registry+https://github.com/rust-lang/crates.io-index"3681source = "registry+https://github.com/rust-lang/crates.io-index"
3684checksum = "cb203856cd5cff27504bd2023c59195b1f1ce1cf5d8ea836598993894eb1b9c0"3682checksum = "9a841eec11d4cc0593188062634f7ee34e87a2052a70c0fa40fbecb4aa8692c0"
3685dependencies = [3683dependencies = [
3686 "anyhow",
3687 "bifrostlink",3684 "bifrostlink",
3688 "bifrostlink-macros",
3689 "camino",3685 "camino",
3690 "nix",3686 "nix",
3691 "serde",3687 "serde",
3692 "tempfile",3688 "tempfile",
3693 "thiserror 2.0.18",3689 "thiserror 2.0.18",
3694 "tokio",3690 "tokio",
3695 "tracing",3691 "tracing",
3696 "uuid",
3697 "zbus",3692 "zbus",
3698]3693]
36993694
37163711
3717[[package]]3712[[package]]
3718name = "remowt-link-shared"3713name = "remowt-link-shared"
3719version = "0.1.7"3714version = "0.1.9"
3720source = "registry+https://github.com/rust-lang/crates.io-index"3715source = "registry+https://github.com/rust-lang/crates.io-index"
3721checksum = "98ebba5be028a2dfb7f1858bb0ff74037262753eaae4dc6e5d9ae241c4567668"3716checksum = "d5036c5e2d5f47bb7ecb25542268f865c298c2b747d74269ff6b2b387574071a"
3722dependencies = [3717dependencies = [
3723 "bifrostlink",3718 "bifrostlink",
3724 "bytes",3719 "bytes",
37323727
3733[[package]]3728[[package]]
3734name = "remowt-plugin"3729name = "remowt-plugin"
3735version = "0.1.7"3730version = "0.1.9"
3736source = "registry+https://github.com/rust-lang/crates.io-index"3731source = "registry+https://github.com/rust-lang/crates.io-index"
3737checksum = "ef73ef3eea5bb6152d01019b5062e51ef258a1ac1c7a6f8cdcdf6fe1eb192cdd"3732checksum = "5ca599e67dc675d8dd59abfe8f08679f7f3c6fd7aa84507ab426839985a142ab"
3738dependencies = [3733dependencies = [
3739 "anyhow",3734 "anyhow",
3740 "bifrostlink",3735 "bifrostlink",
3741 "bifrostlink-ports",3736 "bifrostlink-ports",
3742 "remowt-link-shared",3737 "remowt-link-shared",
3743 "serde_json",3738 "serde_json",
3744 "tokio",3739 "tokio",
3745 "tracing",
3746 "tracing-subscriber",3740 "tracing-subscriber",
3747]3741]
37483742
37573751
3758[[package]]3752[[package]]
3759name = "remowt-ui-prompt"3753name = "remowt-ui-prompt"
3760version = "0.1.7"3754version = "0.1.9"
3761source = "registry+https://github.com/rust-lang/crates.io-index"3755source = "registry+https://github.com/rust-lang/crates.io-index"
3762checksum = "acf28ba68e6f8087657157695e9ab42b82a21130e77f6dffd27781062109325d"3756checksum = "2610933566f9b057dc47145b7bfc5876c4139eb766fc2fe9f2ce60baf1856c8c"
3763dependencies = [3757dependencies = [
3764 "anyhow",3758 "anyhow",
3765 "bifrostlink",3759 "bifrostlink",
3766 "bifrostlink-macros",3760 "bifrostlink-macros",
3767 "serde",3761 "serde",
3768 "serde_json",
3769 "thiserror 2.0.18",3762 "thiserror 2.0.18",
3770 "tokio",3763 "tokio",
3771 "tracing",3764 "tracing",
modifiedcmds/fleet/src/cmds/rollback.rsdiffbeforeafterboth
--- a/cmds/fleet/src/cmds/rollback.rs
+++ b/cmds/fleet/src/cmds/rollback.rs
@@ -62,7 +62,6 @@
 			warn!("failed to list generations available locally: {e}");
 		})
 		.unwrap_or_default();
-	dbg!(&stored_locally);
 	stored_locally.retain(|g| !on_machine_store_paths.contains(&g.store_path));
 	for ele in stored_locally.iter_mut() {
 		ele.current = false;
modifiedcrates/fleet-base/src/host.rsdiffbeforeafterboth
--- a/crates/fleet-base/src/host.rs
+++ b/crates/fleet-base/src/host.rs
@@ -250,7 +250,7 @@
 		}
 		let bundle = agent_bundle()?;
 		let conn = if self.local {
-			Remowt::connect_local(&bundle)
+			Remowt::connect_local(&bundle, "remowt-fleet".to_owned())
 				.await
 				.context("starting local remowt agent")?
 		} else {
@@ -259,7 +259,7 @@
 				.get()
 				.cloned()
 				.unwrap_or_else(|| self.name.clone());
-			Remowt::connect(&dest, &bundle)
+			Remowt::connect(&dest, &bundle, "remowt-fleet".to_owned())
 				.await
 				.map_err(|e| anyhow!("remowt error while connecting to {}: {e:#?}", self.name))?
 		};
modifiedcrates/nix-eval/src/drv.rsdiffbeforeafterboth
--- a/crates/nix-eval/src/drv.rs
+++ b/crates/nix-eval/src/drv.rs
@@ -104,6 +104,12 @@
 				.into_iter()
 				.map(|(k, v)| (sd.join(&k), v.outputs))
 				.collect();
+			let input_srcs: Vec<Utf8PathBuf> = parsed
+				.inputs
+				.srcs
+				.into_iter()
+				.map(|k| sd.join(&k))
+				.collect();
 
 			for dep_path in input_drvs.keys() {
 				if visited.insert(dep_path.clone()) {
@@ -122,7 +128,7 @@
 				DrvNode {
 					name: extract_drv_name(&path),
 					input_drvs,
-					input_srcs: parsed.inputs.srcs,
+					input_srcs,
 					outputs,
 				},
 			);
modifiedflake.lockdiffbeforeafterboth
--- a/flake.lock
+++ b/flake.lock
@@ -188,9 +188,9 @@
         ]
       },
       "locked": {
-        "lastModified": 1781471358,
-        "rev": "c69dddc33f8e2081ef685ae20a7278f92cfcd32e",
-        "revCount": 37,
+        "lastModified": 1781491431,
+        "rev": "c8dca760c1f13e8b65677bac7b21abb487d745c0",
+        "revCount": 40,
         "type": "git",
         "url": "file:/home/lach/build/remowt-agents"
       },
modifiedmodules/nixos/module-list.nixdiffbeforeafterboth
--- a/modules/nixos/module-list.nix
+++ b/modules/nixos/module-list.nix
@@ -4,5 +4,6 @@
   ./rollback.nix
   ./nix-sign.nix
   ./online.nix
+  ./polkit.nix
   ./top-level.nix
 ]
addedmodules/nixos/polkit.nixdiffbeforeafterboth
--- /dev/null
+++ b/modules/nixos/polkit.nix
@@ -0,0 +1,15 @@
+{ ... }:
+{
+  users.groups.fleet-pusher = { };
+
+  security.polkit.extraConfig = ''
+    polkit.addRule(function(action, subject) {
+      if (action.id == "org.freedesktop.systemd1.manage-units" && subject.isInGroup("fleet-pusher")) {
+        const unit = action.lookup("unit");
+        if (unit && unit.indexOf("remowt-fleet-") == 0) {
+          return polkit.Result.YES;
+        }
+      }
+    });
+  '';
+}