lib/types: make pattern of strMatching accessible (#350467)

NixOS · Dec 9, 2024 · 33fe023 · 33fe023
2 parents 27157b0 + 3fe041e
commit 33fe023
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 0 deletions.
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
@@ -190,6 +190,9 @@ checkConfigOutput '^420$' config.bare-submodule.deep ./declare-bare-submodule.ni
 checkConfigOutput '^2$' config.bare-submodule.deep ./declare-bare-submodule.nix ./declare-bare-submodule-deep-option.nix ./define-shorthandOnlyDefinesConfig-true.nix
 checkConfigError 'The option .bare-submodule.deep. in .*/declare-bare-submodule-deep-option.nix. is already declared in .*/declare-bare-submodule-deep-option-duplicate.nix' config.bare-submodule.deep ./declare-bare-submodule.nix ./declare-bare-submodule-deep-option.nix  ./declare-bare-submodule-deep-option-duplicate.nix
 
+# Check that strMatching can be merged
+checkConfigOutput '^"strMatching.*"$' options.sm.type.name ./strMatching-merge.nix
+
 # Check integer types.
 # unsigned
 checkConfigOutput '^42$' config.value ./declare-int-unsigned-value.nix ./define-value-int-positive.nix

diff --git a/lib/tests/modules/strMatching-merge.nix b/lib/tests/modules/strMatching-merge.nix
@@ -0,0 +1,15 @@
+{ lib, ... }:
+{
+  imports = [
+    {
+      options.sm = lib.mkOption {
+        type = lib.types.strMatching "\(.*\)";
+      };
+    }
+    {
+      options.sm = lib.mkOption {
+        type = lib.types.strMatching "\(.*\)";
+      };
+    }
+  ];
+}
diff --git a/lib/types.nix b/lib/types.nix
@@ -461,6 +461,11 @@ rec {
       descriptionClass = "noun";
       check = x: str.check x && builtins.match pattern x != null;
       inherit (str) merge;
+      functor = defaultFunctor "strMatching" // {
+        type = payload: strMatching payload.pattern;
+        payload = { inherit pattern; };
+        binOp = lhs: rhs: if lhs == rhs then lhs else null;
+      };
     };
 
     # Merge multiple definitions by concatenating them (with the given