Merge branch 'main' into reuse-om-config

juspay · Nov 14, 2024 · 6d9a2d5 · 6d9a2d5
2 parents a68d5d1 + 0ed2a38
commit 6d9a2d5
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 15 deletions.
diff --git a/crates/nix_rs/crate.nix b/crates/nix_rs/crate.nix
@@ -13,7 +13,7 @@ in
   crane = {
     args = {
       nativeBuildInputs = with pkgs; [
-        nix # Tests need nix cli
+        # nix # Tests need nix cli
       ];
       DEFAULT_FLAKE_SCHEMAS = lib.cleanSourceWith {
         name = "flake-schemas";

diff --git a/crates/nix_rs/src/command.rs b/crates/nix_rs/src/command.rs
@@ -43,6 +43,10 @@ pub struct NixCmd {
     /// Consider all previously downloaded files out-of-date.
     #[cfg_attr(feature = "clap", arg(long))]
     pub refresh: bool,
+
+    /// Accept `nixConfig` configuration in flake.nix
+    #[cfg_attr(feature = "clap", arg(long))]
+    pub accept_flake_config: bool,
 }
 
 impl Default for NixCmd {
@@ -54,6 +58,7 @@ impl Default for NixCmd {
             extra_experimental_features: vec![],
             extra_access_tokens: vec![],
             refresh: false,
+            accept_flake_config: true,
         }
     }
 }
@@ -205,6 +210,9 @@ impl NixCmd {
         if self.refresh {
             args.push("--refresh".to_string());
         }
+        if self.accept_flake_config {
+            args.push("--accept-flake-config".to_string());
+        }
         args
     }
 }

diff --git a/crates/omnix-gui/crate.nix b/crates/omnix-gui/crate.nix
@@ -32,7 +32,7 @@ in
         makeWrapper
         tailwindcss
         dioxus-cli
-        pkgs.nix # cargo tests need nix
+        # pkgs.nix # cargo tests need nix
       ];
       inherit (rust-project.crates."omnix-cli".crane.args)
         DEFAULT_FLAKE_SCHEMAS;

diff --git a/crates/omnix-health/crate.nix b/crates/omnix-health/crate.nix
@@ -25,7 +25,7 @@ in
         ;
       CACHIX_BIN = pkgs.cachix + /bin/cachix;
       nativeBuildInputs = with pkgs; [
-        nix # Tests need nix cli
+        # nix # Tests need nix cli
       ];
     } // lib.optionalAttrs pkgs.stdenv.isLinux {
       CARGO_BUILD_TARGET = "x86_64-unknown-linux-musl";

diff --git a/crates/omnix-init/registry/flake.lock b/crates/omnix-init/registry/flake.lock
diff --git a/doc/src/history.md b/doc/src/history.md
@@ -17,6 +17,7 @@
   - Support for CI steps
     - Run `nix flake check` on all subflakes (#200)
     - Ability to add a custom CI step. For example, to run arbitrary commands.
+  - Add `--accept-flake-config`
   - Add `--results=FILE` to store CI results as JSON in a file
   - Misc
     - Avoid running `nix-store` command multiple times (#224)