Merge pull request #2163 from cachix/devenv-yaml-import

Implement configuration merging for devenv.yaml imports

Author: domenkozar

Cargo.lock

@@ -46,6 +46,7 @@ include_dir = "0.7.4"
 indexmap = "2.11.4"
 indoc = "2.0.6"
 lazy_static = "1.5.0"
+pathdiff = "0.2.3"
 miette = { version = "7.6.0", features = ["fancy"] }
 nix = { version = "0.30.1", features = ["signal", "process"] }
 once_cell = "1.21.3"

Cargo.toml

@@ -300,25 +300,6 @@ async fn run_tests_in_directory(args: &RunArgs) -> Result<Vec<TestResult>> {
         );
         eprintln!("{}", "-".repeat(50));
 
-        let mut config = devenv::config::Config::load_from(path)?;
-        for input in args.override_input.chunks_exact(2) {
-            config
-                .override_input_url(&input[0], &input[1])
-                .wrap_err(format!(
-                    "Failed to override input {} with {}",
-                    &input[0], &input[1]
-                ))?;
-        }
-
-        // Override the input for the devenv module
-        config
-            .add_input(
-                "devenv",
-                &format!("path:{}?dir=src/modules", cwd.display()),
-                &[],
-            )
-            .wrap_err("Failed to add devenv input")?;
-
         // Determine whether to use a temporary directory
         let (devenv_root, devenv_dotfile, _tmpdir) = if test_config.use_tmp_dir {
             // Create temp directory in system temp dir, not the current directory
@@ -367,6 +348,36 @@ async fn run_tests_in_directory(args: &RunArgs) -> Result<Vec<TestResult>> {
             (devenv_root, devenv_dotfile, None)
         };
 
+        // Run .patch.sh if it exists (must run before loading config)
+        let patch_script = PathBuf::from(".patch.sh");
+        if patch_script.exists() {
+            eprintln!("    Running .patch.sh");
+            let _ = Command::new("bash")
+                .arg(&patch_script)
+                .status()
+                .into_diagnostic()?;
+        }
+
+        // Now load config from the current directory (which might be temp dir)
+        let mut config = devenv::config::Config::load_from(&devenv_root)?;
+        for input in args.override_input.chunks_exact(2) {
+            config
+                .override_input_url(&input[0], &input[1])
+                .wrap_err(format!(
+                    "Failed to override input {} with {}",
+                    &input[0], &input[1]
+                ))?;
+        }
+
+        // Override the input for the devenv module
+        config
+            .add_input(
+                "devenv",
+                &format!("path:{}?dir=src/modules", cwd.display()),
+                &[],
+            )
+            .wrap_err("Failed to add devenv input")?;
+
         let options = DevenvOptions {
             config,
             devenv_root: Some(devenv_root.clone()),
@@ -377,18 +388,6 @@ async fn run_tests_in_directory(args: &RunArgs) -> Result<Vec<TestResult>> {
 
         eprintln!("  Running {dir_name}");
 
-        // A script to patch files in the working directory before the shell.
-        let patch_script = ".patch.sh";
-
-        // Run .patch.sh if it exists
-        if PathBuf::from(patch_script).exists() {
-            eprintln!("    Running {patch_script}");
-            let _ = Command::new("bash")
-                .arg(patch_script)
-                .status()
-                .into_diagnostic()?;
-        }
-
         // A script to run inside the shell before the test.
         let setup_script = ".setup.sh";
 

devenv-run-tests/src/main.rs

@@ -66,10 +66,10 @@
         ]
       },
       "locked": {
-        "lastModified": 1756770412,
+        "lastModified": 1759362264,
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "4524271976b625a4a605beefd893f270620fd751",
+        "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
         "type": "github"
       },
       "original": {
@@ -87,10 +87,10 @@
         ]
       },
       "locked": {
-        "lastModified": 1758108966,
+        "lastModified": 1759523803,
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
+        "rev": "cfc9f7bb163ad8542029d303e599c0f7eee09835",
         "type": "github"
       },
       "original": {
@@ -113,10 +113,10 @@
         ]
       },
       "locked": {
-        "lastModified": 1758108966,
+        "lastModified": 1759523803,
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
+        "rev": "cfc9f7bb163ad8542029d303e599c0f7eee09835",
         "type": "github"
       },
       "original": {
@@ -170,10 +170,10 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1758690382,
+        "lastModified": 1759381078,
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e643668fd71b949c53f8626614b21ff71a07379d",
+        "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee",
         "type": "github"
       },
       "original": {
@@ -248,10 +248,10 @@
         ]
       },
       "locked": {
-        "lastModified": 1758854041,
+        "lastModified": 1759631821,
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "02227ca8c229c968dbb5de95584cfb12b4313104",
+        "rev": "1d7cbdaad90f8a5255a89a6eddd8af24dc89cafe",
         "type": "github"
       },
       "original": {

devenv.lock

@@ -49,6 +49,7 @@ whoami.workspace = true
 xdg.workspace = true
 similar.workspace = true
 once_cell.workspace = true
+pathdiff.workspace = true
 shell-escape.workspace = true
 rmcp.workspace = true
 rmcp-macros.workspace = true

devenv/Cargo.toml

@@ -119,7 +119,7 @@ use_devenv() {
   default_watches=(".envrc" "$HOME/.direnvrc" "$HOME/.config/direnv/direnvrc")
 
   if [[ -d "$devenv_dir" ]]; then
-    default_watches+=("$devenv_dir/devenv.nix" "$devenv_dir/devenv.lock" "$devenv_dir/devenv.yaml" "$devenv_dir/devenv.local.nix")
+    default_watches+=("$devenv_dir/devenv.nix" "$devenv_dir/devenv.lock" "$devenv_dir/devenv.yaml" "$devenv_dir/devenv.local.nix" "$devenv_dir/devenv.local.yaml")
 
     if [[ -f "$devenv_dir/devenv.yaml" ]]; then
       if ! "${devenv_cmd[@]}" assemble; then

devenv/direnvrc

@@ -0,0 +1,6 @@
+nixpkgs:
+  cudaCapabilities: ["7.5", "7.5", "8.0"]
+  permittedInsecurePackages: ["pkg1", "pkg2", "pkg1"]
+imports:
+  - ./sub1
+  - ./sub2

devenv/fixtures/config/array-duplicates/devenv.yaml

@@ -0,0 +1,3 @@
+nixpkgs:
+  cudaCapabilities: ["8.0", "8.6", "8.0"]  # 8.0 is duplicate
+  permittedInsecurePackages: ["pkg2", "pkg3"]

devenv/fixtures/config/array-duplicates/sub1/devenv.yaml

@@ -0,0 +1,3 @@
+nixpkgs:
+  cudaCapabilities: ["7.5", "9.0"]  # 7.5 already in base
+  permittedInsecurePackages: ["pkg1", "pkg4", "pkg4"]  # pkg1 already in base, pkg4 duplicate

devenv/fixtures/config/array-duplicates/sub2/devenv.yaml

@@ -0,0 +1,7 @@
+allowUnfree: false
+allowBroken: false
+impure: false
+imports:
+  - ./first
+  - ./second
+  - ./third