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

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Artturin
2024-09-25 06:05:01 +03:00
parent cd039ce1ae 210a5474f2
commit f0e657f3b1
4377 changed files with 17306 additions and 9614 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/python2-modules/cffi/default.nix
+1 -1
View File
@@ -1,7 +1,7 @@
{ lib, stdenv, cffi }:
if cffi == null then null else cffi.overridePythonAttrs {
disabledTests = lib.optionals stdenv.isDarwin [
disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
# cannot load library 'c'
"test_FILE"
"test_FILE_object"
pkgs/development/python2-modules/configparser/default.nix
+1 -1
View File
@@ -15,7 +15,7 @@ buildPythonPackage rec {
nativeBuildInputs = [ setuptools-scm ];
preConfigure = ''
export LC_ALL=${if stdenv.isDarwin then "en_US" else "C"}.UTF-8
export LC_ALL=${if stdenv.hostPlatform.isDarwin then "en_US" else "C"}.UTF-8
'';
meta = with lib; {
pkgs/development/python2-modules/futures/default.nix
+1 -1
View File
@@ -16,7 +16,7 @@ buildPythonPackage rec {
${python.interpreter} test_futures.py
'';
doCheck = !stdenv.isDarwin;
doCheck = !stdenv.hostPlatform.isDarwin;
meta = with lib; {
description = "Backport of the concurrent.futures package from Python 3.2";
pkgs/development/python2-modules/jinja2/default.nix
+1 -1
View File
@@ -22,7 +22,7 @@ buildPythonPackage rec {
# Multiple tests run out of stack space on 32bit systems with python2.
# See https://github.com/pallets/jinja/issues/1158
# warnings are no longer being filtered correctly for python2
doCheck = !stdenv.is32bit && isPy3k;
doCheck = !stdenv.hostPlatform.is32bit && isPy3k;
checkPhase = ''
pytest -v tests -W ignore::DeprecationWarning
pkgs/development/python2-modules/pygobject/default.nix
+1 -1
View File
@@ -13,7 +13,7 @@ buildPythonPackage rec {
outputs = [ "out" "devdoc" ];
patches = lib.optionals stdenv.isDarwin [
patches = lib.optionals stdenv.hostPlatform.isDarwin [
./pygobject-2.0-fix-darwin.patch
(fetchpatch {
url = "https://github.com/macports/macports-ports/raw/f2975d5bbbc2459c661905c5a850cc661fa32f55/python/py-gobject/files/py-gobject-dynamic_lookup-11.patch";
pkgs/development/python2-modules/pygtk/default.nix
+2 -2
View File
@@ -37,8 +37,8 @@ buildPythonPackage rec {
buildPhase = "buildPhase";
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-ObjC"
+ lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) " -lpython2.7";
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-ObjC"
+ lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) " -lpython2.7";
installPhase = "installPhase";