From df79f4922ff0a6a8ae1b68d1a1b2d038bf44a961 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 9 Dec 2022 08:33:28 -0800 Subject: [PATCH] treewide: remove references to pythonPackages.scandir --- pkgs/applications/misc/bleachbit/default.nix | 2 -- pkgs/development/python-modules/fs/default.nix | 2 -- pkgs/development/python-modules/pathlib2/default.nix | 3 +-- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix index d40a57323a13..7a667b187566 100644 --- a/pkgs/applications/misc/bleachbit/default.nix +++ b/pkgs/applications/misc/bleachbit/default.nix @@ -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 diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index 1d4326f74ee3..ca4fb75af304 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -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"; diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index f0f0163652ca..c382f74ae22b 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -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;