git.delta.rocks / jrsonnet / refs/commits / f39d78019a7e

--- a/crates/fleet-base/src/opts.rs
+++ b/crates/fleet-base/src/opts.rs
@@ -87,6 +87,13 @@
 	/// binfmt-declared qemu instead of trying to crosscompile
 	#[clap(long, default_value = env!("NIX_SYSTEM"))]
 	pub local_system: String,
+
+	/// By default fleet continues on single derivation build failure
+	/// this flag makes command fail immediately
+	///
+	/// Opposite of Nix's --keep-going
+	#[clap(long)]
+	pub fail_fast: bool,
 }
 
 impl FleetOpts {
@@ -204,6 +211,7 @@
 			directory.as_os_str().to_owned(),
 			nix_args.clone(),
 			self.local_system.clone(),
+			self.fail_fast,
 		)
 		.await?;
 		let nix_session = pool.get().await?;

12	pub async fn new(flake: OsString, nix_args: Vec<OsString>, nix_system: String) -> Result<Self> {12	pub async fn new(
13		flake: OsString,
14		nix_args: Vec<OsString>,
15		nix_system: String,
16		fail_fast: bool,
17	) -> Result<Self> {
13		let inner = tokio::task::block_in_place(|| {18		let inner = tokio::task::block_in_place(|| {
14			r2d2::Builder::<NixSessionPoolInner>::new()19			r2d2::Builder::<NixSessionPoolInner>::new()
17					flake,22					flake,
18					nix_args,23					nix_args,
19					nix_system,24					nix_system,
25					fail_fast,
20				})26				})
21		})?;27		})?;
22		Ok(Self(inner))28		Ok(Self(inner))
30pub(crate) struct NixSessionPoolInner {36pub(crate) struct NixSessionPoolInner {
31	flake: OsString,37	flake: OsString,
32	nix_args: Vec<OsString>,38	nix_args: Vec<OsString>,
39	fail_fast: bool,
33	pub(crate) nix_system: String,40	pub(crate) nix_system: String,
34}41}
3542
41			.get()48			.get()
42			.expect("missed tokio runtime init!")49			.expect("missed tokio runtime init!")
43			.enter();50			.enter();
44		Ok(futures::executor::block_on(NixSessionInner::new(51		futures::executor::block_on(NixSessionInner::new(
45			self.flake.as_os_str(),52			self.flake.as_os_str(),
46			self.nix_args.iter().map(OsString::as_os_str),53			self.nix_args.iter().map(OsString::as_os_str),
47			self.nix_system.clone(),54			self.nix_system.clone(),
55			self.fail_fast,
48		))?)56		))
49	}57	}
5058
51	fn is_valid(&self, conn: &mut Self::Connection) -> std::result::Result<(), Self::Error> {59	fn is_valid(&self, conn: &mut Self::Connection) -> std::result::Result<(), Self::Error> {

--- a/crates/nix-eval/src/session.rs
+++ b/crates/nix-eval/src/session.rs
@@ -225,6 +225,7 @@
 		flake: &OsStr,
 		extra_args: impl IntoIterator<Item = &OsStr>,
 		nix_system: String,
+		fail_fast: bool,
 	) -> Result<Self> {
 		let mut cmd = Command::new("nix");
 		cmd.arg("repl")
@@ -232,6 +233,9 @@
 			.arg(flake)
 			.arg("--log-format")
 			.arg("internal-json");
+		if !fail_fast {
+			cmd.arg("--keep-going");
+		}
 		for arg in extra_args {
 			cmd.arg(arg);
 		}

--- a/flake.nix
+++ b/flake.nix
@@ -136,7 +136,7 @@
                 inherit (packages) fleet-install-secrets;
               })
               // {
-                checks.formatting = treefmt.check self;
+                formatting = treefmt.check self;
               };
             # TODO: It should be possible to move lib.mkIf to default attribute, instead of disabling the whole
             # devShells block, yet nix flake check fails here, due to no default shell found. It is nix or flake-parts bug?