treewide: remove references to pythonPackages.scandir
This commit is contained in:
parent
7d4a0668d2
commit
df79f4922f
@ -7,7 +7,6 @@
|
||||
, glib
|
||||
, gtk3
|
||||
, libnotify
|
||||
, scandir ? null
|
||||
}:
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
@ -37,7 +36,6 @@ python3Packages.buildPythonApplication rec {
|
||||
chardet
|
||||
pygobject3
|
||||
requests
|
||||
scandir
|
||||
];
|
||||
|
||||
# Patch the many hardcoded uses of /usr/share/ and /usr/bin
|
||||
|
@ -5,7 +5,6 @@
|
||||
, setuptools
|
||||
, six
|
||||
, appdirs
|
||||
, scandir ? null
|
||||
, backports_os ? null
|
||||
, typing ? null
|
||||
, pytz
|
||||
@ -36,7 +35,6 @@ 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,7 +3,6 @@
|
||||
, fetchPypi
|
||||
, six
|
||||
, pythonOlder
|
||||
, scandir ? null
|
||||
, glibcLocales
|
||||
, mock
|
||||
, typing
|
||||
@ -19,7 +18,7 @@ buildPythonPackage rec {
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ six ]
|
||||
++ lib.optionals (pythonOlder "3.5") [ scandir typing ];
|
||||
++ lib.optionals (pythonOlder "3.5") [ typing ];
|
||||
checkInputs = [ glibcLocales ]
|
||||
++ lib.optional (pythonOlder "3.3") mock;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user