gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #215401 from mweinelt/python-3.10.10-3.11.2

Browse Source 
python310: 3.10.9 -> 3.10.10; python311: 3.11.1 -> 3.11.2
This commit is contained in:
Martin Weinelt
2023-02-13 13:26:00 +00:00
committed by GitHub
parent 29c2637dda d704ee72c9
commit d87b0e29ff
5 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/interpreters/python/cpython/default.nix
+3 -3
View File
@@ -30,7 +30,7 @@
, pkgsHostHost
, pkgsTargetTarget
, sourceVersion
, sha256
, hash
, passthruFun
, bash
, stripConfig ? false
@@ -215,7 +215,7 @@ in with passthru; stdenv.mkDerivation {
src = fetchurl {
url = with sourceVersion; "https://www.python.org/ftp/python/${major}.${minor}.${patch}/Python-${version}.tar.xz";
inherit sha256;
inherit hash;
};
prePatch = optionalString stdenv.isDarwin ''
@@ -235,7 +235,7 @@ in with passthru; stdenv.mkDerivation {
url = "https://github.com/python/cpython/commit/3fae04b10e2655a20a3aadb5e0d63e87206d0c67.diff";
revert = true;
excludes = [ "Misc/NEWS.d/*" ];
sha256 = "sha256-PmkXf2D9trtW1gXZilRIWgdg2Y47JfELq1z4DuG3wJY=";
hash = "sha256-PmkXf2D9trtW1gXZilRIWgdg2Y47JfELq1z4DuG3wJY=";
})
] ++ [
# Disable the use of ldconfig in ctypes.util.find_library (since
pkgs/development/interpreters/python/default.nix
+31 -30
View File
@@ -117,23 +117,24 @@
};
sources = {
python39 = {
sourceVersion = {
major = "3";
minor = "9";
patch = "16";
suffix = "";
};
sha256 = "sha256-It3cCZJG3SdgZlVh6K23OU6gzEOnJoTGSA+TgPd4ZDk=";
};
python310 = {
sourceVersion = {
major = "3";
minor = "10";
patch = "9";
patch = "10";
suffix = "";
};
sha256 = "sha256-WuA+MIJgFkuro5kh/bTb+ObQPYI1qTnUWCsz8LXkaoM=";
hash = "sha256-BBnpCFv1G3pnIAmz9Q2/GFms3xi6cl0OwZqlyFA/DqM=";
};
python311 = {
sourceVersion = {
major = "3";
minor = "11";
patch = "2";
suffix = "";
};
hash = "sha256-KeS49fFlhUKowT4t0nc1jJxI8rL3MYZS7xZ15AK50q8=";
};
};
@@ -147,7 +148,7 @@ in {
patch = "18";
suffix = ".6"; # ActiveState's Python 2 extended support
};
sha256 = "sha256-+I0QOBkuTHMIQz71lgNn1X1vjPsjJMtFbgC0xcGTwWY=";
hash = "sha256-+I0QOBkuTHMIQz71lgNn1X1vjPsjJMtFbgC0xcGTwWY=";
inherit (darwin) configd;
inherit passthruFun;
};
@@ -160,16 +161,23 @@ in {
patch = "16";
suffix = "";
};
sha256 = "sha256-2F27N3QTJHPYCB3LFY80oQzK16kLlsflDqS7YfXORWI=";
hash = "sha256-2F27N3QTJHPYCB3LFY80oQzK16kLlsflDqS7YfXORWI=";
inherit (darwin) configd;
inherit passthruFun;
};
python39 = callPackage ./cpython ({
python39 = callPackage ./cpython {
self = __splicedPackages.python39;
sourceVersion = {
major = "3";
minor = "9";
patch = "16";
suffix = "";
};
hash = "sha256-It3cCZJG3SdgZlVh6K23OU6gzEOnJoTGSA+TgPd4ZDk=";
inherit (darwin) configd;
inherit passthruFun;
} // sources.python39);
};
python310 = callPackage ./cpython ({
self = __splicedPackages.python310;
@@ -177,18 +185,11 @@ in {
inherit passthruFun;
} // sources.python310);
python311 = callPackage ./cpython {
python311 = callPackage ./cpython ({
self = __splicedPackages.python311;
sourceVersion = {
major = "3";
minor = "11";
patch = "1";
suffix = "";
};
sha256 = "sha256-hYeRkvLP/VbLFsCSkFlJ6/Pl45S392RyNSljeQHftY8=";
inherit (darwin) configd;
inherit passthruFun;
};
} // sources.python311);
python312 = callPackage ./cpython {
self = __splicedPackages.python312;
@@ -198,7 +199,7 @@ in {
patch = "0";
suffix = "a5";
};
sha256 = "sha256-1m73o0L+OjVvnO47uXrcHl+0hA9rbP994P991JX4Mjs=";
hash = "sha256-1m73o0L+OjVvnO47uXrcHl+0hA9rbP994P991JX4Mjs=";
inherit (darwin) configd;
inherit passthruFun;
};
@@ -241,7 +242,7 @@ in {
patch = "11";
};
sha256 = "sha256-ERevtmgx2k6m852NIIR4enRon9AineC+MB+e2bJVCTw=";
hash = "sha256-ERevtmgx2k6m852NIIR4enRon9AineC+MB+e2bJVCTw=";
pythonVersion = "2.7";
db = db.override { dbmSupport = !stdenv.isDarwin; };
python = __splicedPackages.pythonInterpreters.pypy27_prebuilt;
@@ -258,7 +259,7 @@ in {
patch = "11";
};
sha256 = "sha256-sPMWb7Klqt/VzrnbXN1feSmg7MygK0omwNrgSS98qOo=";
hash = "sha256-sPMWb7Klqt/VzrnbXN1feSmg7MygK0omwNrgSS98qOo=";
pythonVersion = "3.9";
db = db.override { dbmSupport = !stdenv.isDarwin; };
python = __splicedPackages.pypy27;
@@ -270,7 +271,7 @@ in {
pypy38 = __splicedPackages.pypy39.override {
self = __splicedPackages.pythonInterpreters.pypy38;
pythonVersion = "3.8";
sha256 = "sha256-TWdpv8pzc06GZv1wUDt86wam4lkRDmFzMbs4mcpOYFg=";
hash = "sha256-TWdpv8pzc06GZv1wUDt86wam4lkRDmFzMbs4mcpOYFg=";
};
pypy37 = throw "pypy37 has been removed from nixpkgs since it is no longer supported upstream"; # Added 2023-01-04
@@ -284,7 +285,7 @@ in {
patch = "11";
};
sha256 = {
hash = {
aarch64-linux = "sha256-6pJNod7+kyXvdg4oiwT5hGFOQFWA9TIetqXI9Tm9QVo=";
x86_64-linux = "sha256-uo7ZWKkFwHNaTP/yh1wlCJlU3AIOCH2YKw/6W52jFs0=";
aarch64-darwin = "sha256-zFaWq0+TzTSBweSZC13t17pgrAYC+hiQ02iImmxb93E=";
@@ -302,7 +303,7 @@ in {
minor = "3";
patch = "11";
};
sha256 = {
hash = {
aarch64-linux = "sha256-CRddxlLtiV2Y6a1j0haBK/PufjmNkAqb+espBrqDArk=";
x86_64-linux = "sha256-1QYXLKEQcSdBdddOnFgcMWZDLQF5sDZHDjuejSDq5YE=";
aarch64-darwin = "sha256-ka11APGjlTHb76CzRaPc/5J/+ZcWVOjS6e98WuMR9X4=";
pkgs/development/interpreters/python/tests.nix
+3 -2
View File
@@ -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";
@@ -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
pkgs/development/python-modules/asgiref/default.nix
+2
View File
@@ -35,6 +35,8 @@ buildPythonPackage rec {
"test_multiprocessing"
];
__darwinAllowLocalNetworking = true;
pythonImportsCheck = [ "asgiref" ];
meta = with lib; {
pkgs/development/python-modules/ephemeral-port-reserve/default.nix
+2
View File
@@ -29,6 +29,8 @@ buildPythonPackage {
"test_fqdn"
];
__darwinAllowLocalNetworking = true;
pythonImportsCheck = [
"ephemeral_port_reserve"
];