fix: use a wildcard that doesn't match nested attrs

Author: mdaniels5757

by-name-config.nix

@@ -4,7 +4,7 @@
 # In the attrsets that make up by_name_dirs:
 #   * The aliases_path field is optional.
 #   * The ID field must be short and unique.
-#   * Exactly one attr_path_regex must be a wildcard ("[^\\.]*").
+#   * Exactly one attr_path_regex must be a wildcard ("^[^\\.]*$").
 #   * All non-wildcard attr_path_regexes must be mutually exclusive.
 #   * Exactly one unversioned_attr_prefix must be the empty string.
 #   * All non-wildcard unversioned_attr_prefixes must be mutually exclusive.
@@ -14,22 +14,22 @@
     # {
     #   id = "py";
     #   path = "pkgs/development/python-modules/by-name";
-    #   attr_path_regex = "^(python3\\d*Packages|python3\\d*.pkgs)\\..*";
+    #   attr_path_regex = "^(python3\\d*Packages|python3\\d*.pkgs)\\..*$";
     #   unversioned_attr_prefix = "python3Packages";
     #   all_packages_path = "/pkgs/top-level/python-packages.nix";
     #   aliases_path = "/pkgs/top-level/python-aliases.nix";
     # }
     {
       id = "tcl";
       path = "pkgs/development/tcl-modules/by-name";
-      attr_path_regex = "^(tcl\\d*Packages)\\..*";
+      attr_path_regex = "^(tcl\\d*Packages)\\..*$";
       unversioned_attr_prefix = "tclPackages";
       all_packages_path = "/pkgs/top-level/tcl-packages.nix";
     }
     {
       id = "main";
       path = "pkgs/by-name";
-      attr_path_regex = "[^\\.]*";
+      attr_path_regex = "^[^\\.]*$";
       unversioned_attr_prefix = "";
       all_packages_path = "/pkgs/top-level/all-packages.nix";
       aliases_path = "/pkgs/top-level/aliases.nix";

src/eval.nix

@@ -111,7 +111,8 @@ let
   # Information on all attributes that are in a `by-name` directory.
   byNameAttrsForDir =
     byNameDir:
-    pkgs.lib.foldl pkgs.lib.recursiveUpdate { } (
+    pkgs.lib.mergeAttrsList (
+    # pkgs.lib.foldl pkgs.lib.recursiveUpdate { } (
       map (
         package:
         let
@@ -141,7 +142,8 @@ let
   attrSetIsOrContainsDerivation =
     name: value:
     if (!((builtins.tryEval value).success) || !(builtins.isAttrs value)) then
-     (builtins.trace "attrSetIsOrContainsDerivation: returning false for ${name}. tryEval is ${pkgs.lib.boolToString ((builtins.tryEval value).success)}, and isAttrs is ${pkgs.lib.boolToString (builtins.isAttrs value)}" false)
+      false
+    #  (builtins.trace "attrSetIsOrContainsDerivation: returning false for ${name}. tryEval is ${pkgs.lib.boolToString ((builtins.tryEval value).success)}, and isAttrs is ${pkgs.lib.boolToString (builtins.isAttrs value)}" false)
     else
       (
         if pkgs.lib.isDerivation value then

src/eval.rs

@@ -261,8 +261,8 @@ pub fn check_values(
         .into());
     }
 
-    println!("{}:{}: result (stderr): {}", file!(), line!(), std::str::from_utf8(result.stderr.as_slice()).unwrap());
-    println!("{}:{}: result (stdout): {}", file!(), line!(), std::str::from_utf8(result.stdout.as_slice()).unwrap());
+    // println!("{}:{}: result (stderr): {}", file!(), line!(), std::str::from_utf8(result.stderr.as_slice()).unwrap());
+    // println!("{}:{}: result (stdout): {}", file!(), line!(), std::str::from_utf8(result.stdout.as_slice()).unwrap());
 
     // Parse the resulting JSON value
     let attributes: Vec<(Vec<String>, Attribute)> = serde_json::from_slice(&result.stdout)
@@ -277,7 +277,7 @@ pub fn check_values(
         attributes
             .into_iter()
             .map(|(attribute_name, attribute_value)| {
-                println!("{}:{}: attribute_name: {attribute_name:?}; attribute_value: {attribute_value:?}", file!(), line!());
+                // println!("{}:{}: attribute_name: {attribute_name:?}; attribute_value: {attribute_value:?}", file!(), line!());
                 let check_result = match attribute_value {
                     Attribute::NonByName(non_by_name_attribute) => handle_non_by_name_attribute(
                         nixpkgs_path,
@@ -303,7 +303,7 @@ pub fn check_values(
         elems
             .into_iter()
             .map(|(attribute_name, package)| {
-                println!("{}:{}: attribute_name: {}, package: {package:?}", file!(), line!(), attribute_name.join("."));
+                // println!("{}:{}: attribute_name: {}, package: {package:?}", file!(), line!(), attribute_name.join("."));
                 (attribute_name.join("."), package)
             })
             .collect()
@@ -564,7 +564,10 @@ fn handle_non_by_name_attribute(
     let uses_by_name =
         // Only process attributes that could belong to the current by name directory.
         match structure::expected_by_name_dir_for_package(attribute_name, config) {
-            None => {println!("{}:{}: attribute_name {attribute_name} has expected by-name dir None", file!(), line!()); NonApplicable},
+            None => {
+                // println!("{}:{}: attribute_name {attribute_name} has expected by-name dir None", file!(), line!());
+                NonApplicable
+            },
             // Some(by_name_dir) if by_name_dir.id !=  => {println!("{}:{}: attribute_name {attribute_name} has expected by-name dir Some({x}), which is not {}", file!(), line!(), by_name_dir.path); NonApplicable},
             Some(_) => {
                 // This is a big ol' match on various properties of the attribute

src/main.rs

@@ -192,7 +192,7 @@ fn process(
     main_nixpkgs: &Path,
     config: &Config,
 ) -> Status {
-    println!("{}:{}: base_nixpkgs {base_nixpkgs:?}, main_nixpkgs {main_nixpkgs:?}", file!(), line!());
+    // println!("{}:{}: base_nixpkgs {base_nixpkgs:?}, main_nixpkgs {main_nixpkgs:?}", file!(), line!());
     let (base_result, main_result) = std::thread::scope(|s| {
         let base_thread = s.spawn(move || check_nixpkgs(base_nixpkgs, config));
         let main_thread = s.spawn(move || check_nixpkgs(main_nixpkgs, config));

src/problem/npv_162.rs

@@ -29,7 +29,7 @@ impl fmt::Display for NewTopLevelPackageShouldBeByName {
             structure::expected_by_name_dir_for_package(package_name, config).unwrap().path;
         let relative_package_file =
             structure::relative_file_for_package(package_name, &by_name_path);
-        println!("{}:{}: package_name {package_name}, by_name_path {by_name_path}, relative_package_file {relative_package_file}", file!(), line!());
+        // println!("{}:{}: package_name {package_name}, by_name_path {by_name_path}, relative_package_file {relative_package_file}", file!(), line!());
         let call_package_arg = call_package_path
             .as_ref()
             .map_or_else(|| "...".into(), |path| format!("./{}", path));

src/structure.rs

@@ -147,9 +147,9 @@ pub fn expected_by_name_dir_for_package(
             let dir1 = matching_dirs[0];
             let dir2 = matching_dirs[1];
             // println!("{}:{}: attr_name is {attr_name}, dirs are {dir1:?} and {dir2:?}", file!(), line!());
-            if dir2.attr_path_regex.as_str() == "[^\\.]*" {
+            if dir2.attr_path_regex.as_str() == "^[^\\.]*$" {
                 Some(dir1.clone())
-            } else if dir1.attr_path_regex.as_str() == "[^\\.]*" {
+            } else if dir1.attr_path_regex.as_str() == "^[^\\.]*$" {
                 Some(dir2.clone())
             } else {
                 panic!("Multiple wildcard regexes, or overlapping regexes, detected.")