Merge master into staging-next

2023-09-21 00:02:13 +00:00
parent b2f85dbf28 272be73a8f
commit 2b20c287ac
21 changed files with 570 additions and 325 deletions
@@ -45,9 +45,9 @@ in {
      major = "2";
      minor = "7";
      patch = "18";
-      suffix = ".6"; # ActiveState's Python 2 extended support
+      suffix = ".7"; # ActiveState's Python 2 extended support
    };
-    hash = "sha256-+I0QOBkuTHMIQz71lgNn1X1vjPsjJMtFbgC0xcGTwWY=";
+    hash = "sha256-zcjAoSq6491ePiDySBCKrLIyYoO/5fdH6aBTNg/NH8s=";
    inherit (darwin) configd;
    inherit passthruFun;
  };