Commit 6ea94a2c authored by Fabián Heredia Montiel's avatar Fabián Heredia Montiel Committed by Robert Schütz
Browse files

treewide: revert removal of references to pythonPackages.scandir 

This reverts commit df79f492

Closes https://github.com/NixOS/nixpkgs/issues/205742
parent 8549e49c

pkgs/development/python-modules/fs/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -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";

pkgs/development/python-modules/pathlib2/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -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;