Merge staging-next-21.11 into staging-21.11

pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix

@@ -69,7 +69,10 @@ in {
           melpaBuild {
             inherit pname ename commit;
             version = if isNull version then "" else
-              lib.concatStringsSep "." (map toString version);
+              lib.concatStringsSep "." (map toString
+                # Hack: Melpa archives contains versions with parse errors such as [ 4 4 -4 413 ] which should be 4.4-413
+                # This filter method is still technically wrong, but it's computationally cheap enough and tapers over the issue
+                (builtins.filter (n: n >= 0) version));
             # TODO: Broken should not result in src being null (hack to avoid eval errors)
             src = if (isNull sha256 || broken) then null else
               lib.getAttr fetcher (fetcherGenerators args sourceArgs);

pkgs/development/interpreters/python/cpython/default.nix

@@ -240,6 +240,7 @@ in with passthru; stdenv.mkDerivation {
   ] ++ optionals (pythonAtLeast "3.9" && stdenv.isDarwin) [
     # Stop checking for TCL/TK in global macOS locations
     ./3.9/darwin-tcl-tk.patch
+  ] ++ optionals (isPy39 && stdenv.isDarwin) [
     # ctypes.util.find_library() now finds macOS 11+ system libraries when built on older macOS systems
     # https://github.com/python/cpython/pull/28053
     ./3.9/bpo-44689-ctypes.util.find_library-now-finds-macOS-1.patch