Skip to content

Commit

Permalink
Merge #225906: python310: 3.10.9 -> 3.10.11; python311: 3.11.1 -> 3.11.3
Browse files Browse the repository at this point in the history
...into staging-22.11
  • Loading branch information
vcunat committed Apr 13, 2023
2 parents 9519470 + b3fb0f5 commit bd6dd72
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
8 changes: 4 additions & 4 deletions pkgs/development/interpreters/python/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,10 @@
sourceVersion = {
major = "3";
minor = "10";
patch = "9";
patch = "11";
suffix = "";
};
sha256 = "sha256-WuA+MIJgFkuro5kh/bTb+ObQPYI1qTnUWCsz8LXkaoM=";
sha256 = "sha256-PDvDBIMDchyQSgPrgya2Mekh8RzDvimIRWpC8RXa8Ew=";
};
};

Expand Down Expand Up @@ -195,10 +195,10 @@ in {
sourceVersion = {
major = "3";
minor = "11";
patch = "1";
patch = "3";
suffix = "";
};
sha256 = "sha256-hYeRkvLP/VbLFsCSkFlJ6/Pl45S392RyNSljeQHftY8=";
sha256 = "sha256-il25nJYafs8nx1lWGJyWAslodR8R2+riuQDb/xwIW14=";
inherit (darwin) configd;
inherit passthruFun;
};
Expand Down
5 changes: 3 additions & 2 deletions pkgs/development/interpreters/python/tests.nix
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ let
# Use virtualenv from a Nix env.
nixenv-virtualenv = rec {
env = runCommand "${python.name}-virtualenv" {} ''
${pythonVirtualEnv.interpreter} -m virtualenv $out
${pythonVirtualEnv.interpreter} -m virtualenv venv
mv venv $out
'';
interpreter = "${env}/bin/${python.executable}";
is_venv = "False";
Expand Down Expand Up @@ -173,7 +174,7 @@ let
}
) {};
pythonWithRequests = requests.pythonModule.withPackages (ps: [ requests ]);
in
in lib.optionalAttrs stdenv.isLinux
{
condaExamplePackage = runCommand "import-requests" {} ''
${pythonWithRequests.interpreter} -c "import requests" > $out
Expand Down
2 changes: 2 additions & 0 deletions pkgs/development/python-modules/asgiref/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ buildPythonPackage rec {
"test_multiprocessing"
];

__darwinAllowLocalNetworking = true;

pythonImportsCheck = [ "asgiref" ];

meta = with lib; {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ buildPythonPackage {
"test_fqdn"
];

__darwinAllowLocalNetworking = true;

pythonImportsCheck = [
"ephemeral_port_reserve"
];
Expand Down

0 comments on commit bd6dd72

Please sign in to comment.