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

Merge branch 'staging-next' into staging

Browse Source 
Minor conflicts; I hope I didn't mess up:
	pkgs/development/tools/misc/binutils/default.nix
	pkgs/games/openjk/default.nix
This commit is contained in:
Vladimír Čunát
2022-04-14 09:53:21 +02:00
parent 43c910047f 069038f093
commit d5d94127fd
425 changed files with 11759 additions and 6081 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/interpreters/python/cpython/default.nix
+4 -2
View File
@@ -236,7 +236,7 @@ in with passthru; stdenv.mkDerivation {
else
./3.5/profile-task.patch
)
] ++ optionals (pythonAtLeast "3.9" && stdenv.isDarwin) [
] ++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.isDarwin) [
# Stop checking for TCL/TK in global macOS locations
./3.9/darwin-tcl-tk.patch
] ++ optionals (isPy3k && hasDistutilsCxxPatch) [
@@ -247,8 +247,10 @@ in with passthru; stdenv.mkDerivation {
(
if isPy35 then
./3.5/python-3.x-distutils-C++.patch
else if pythonAtLeast "3.7" then
else if pythonAtLeast "3.7" && pythonOlder "3.11" then
./3.7/python-3.x-distutils-C++.patch
else if pythonAtLeast "3.11" then
./3.11/python-3.x-distutils-C++.patch
else
fetchpatch {
url = "https://bugs.python.org/file48016/python-3.x-distutils-C++.patch";