Merge branch 'main' into update-nixpkgs

figsoda · web-flow · commit 3388454bf2db · 2026-01-23T18:48:12.000-05:00
diff --git a/nix_update/hashes.py b/nix_update/hashes.py
@@ -11,7 +11,7 @@
 
 def to_sri(hashstr: str) -> str:
     """Convert a hash string to SRI format if needed."""
-    if "-" in hashstr:
+    if "-" in hashstr or ":" in hashstr:
         return hashstr
     length = len(hashstr)
     if length == MD5_HASH_LENGTH:
diff --git a/tests/test_version_regex_no_rev.py b/tests/test_version_regex_no_rev.py
@@ -17,7 +17,7 @@ def test_main(testpkgs_git: Path) -> None:
             "--commit",
             "net-news-wire",
             "--version-regex",
-            "^mac-(\\d+\\.\\d+\\.\\d+(?:b\\d+)?)$",
+            r"^mac-(\d+\.\d+(\.\d+)?(?:b\d+)?)$",
         ],
     )
     version = get_nix_value(testpkgs_git, "net-news-wire.version")

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ def test_main(testpkgs_git: Path) -> None:`
`17`	`17`	`"--commit",`
`18`	`18`	`"net-news-wire",`
`19`	`19`	`"--version-regex",`
`20`		`- "^mac-(\\d+\\.\\d+\\.\\d+(?:b\\d+)?)$",`
	`20`	`+ r"^mac-(\d+\.\d+(\.\d+)?(?:b\d+)?)$",`
`21`	`21`	`],`
`22`	`22`	`)`
`23`	`23`	`version = get_nix_value(testpkgs_git, "net-news-wire.version")`