dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

treewide: revert removal of references to pythonPackages.scandir

Browse Source 
This reverts commit df79f4922f

Closes https://github.com/NixOS/nixpkgs/issues/205742
This commit is contained in:
Fabián Heredia Montiel 2022-12-12 11:23:03 -06:00 committed by Robert Schütz
parent 8549e49c18
commit 6ea94a2cf8
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/python-modules/fs/default.nix
View File

@ -5,6 +5,7 @@
, setuptools
, six
, appdirs
, scandir ? null
, backports_os ? null
, typing ? null
, pytz
@ -35,6 +36,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ six appdirs pytz setuptools ]
++ lib.optionals (!isPy3k) [ backports_os ]
++ lib.optionals (!pythonAtLeast "3.6") [ typing ]
++ lib.optionals (!pythonAtLeast "3.5") [ scandir ]
++ lib.optionals (!pythonAtLeast "3.5") [ enum34 ];
LC_ALL="en_US.utf-8";

3
pkgs/development/python-modules/pathlib2/default.nix
View File

@ -3,6 +3,7 @@
, fetchPypi
, six
, pythonOlder
, scandir ? null
, glibcLocales
, mock
, typing
@ -18,7 +19,7 @@ buildPythonPackage rec {
};
propagatedBuildInputs = [ six ]
++ lib.optionals (pythonOlder "3.5") [ typing ];
++ lib.optionals (pythonOlder "3.5") [ scandir typing ];
checkInputs = [ glibcLocales ]
++ lib.optional (pythonOlder "3.3") mock;