Merge remote-tracking branch 'origin/master' into staging-next

Conflicts:
-	pkgs/development/python-modules/aiohappyeyeballs/default.nix
This commit is contained in:
Martin Weinelt
2024-01-08 16:34:52 +01:00
51 changed files with 558 additions and 396 deletions
@@ -344,7 +344,7 @@ in with passthru; stdenv.mkDerivation ({
'';
license = lib.licenses.psfl;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ fridh thiagokokada ];
maintainers = with lib.maintainers; [ fridh ];
knownVulnerabilities = [
"Python 2.7 has reached its end of life after 2020-01-01. See https://www.python.org/doc/sunset-python-2/."
# Quote: That means that we will not improve it anymore after that day,