1 files changed, 27 insertions, 29 deletions
diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix
index 5941243645ef..9d1fded19c1b 100644
--- a/pkgs/development/python-modules/fs/default.nix
+++ b/pkgs/development/python-modules/fs/default.nix
@@ -1,56 +1,50 @@
 {
   lib,
-  glibcLocales,
+  stdenv,
+  appdirs,
   buildPythonPackage,
   fetchPypi,
-  setuptools,
-  six,
-  appdirs,
-  scandir ? null,
-  backports_os ? null,
-  typing ? null,
-  pytz,
-  enum34,
-  pyftpdlib,
-  psutil,
+  glibcLocales,
   mock,
-  pythonAtLeast,
-  isPy3k,
+  psutil,
+  pyftpdlib,
   pytestCheckHook,
-  stdenv,
+  pythonAtLeast,
+  pythonOlder,
+  pytz,
+  setuptools,
+  six,
 }:
 
 buildPythonPackage rec {
   pname = "fs";
   version = "2.4.16";
-  format = "setuptools";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-rpfH1RIT9LcLapWCklMCiQkN46fhWEHhCPvhRPBp0xM=";
   };
 
+  build-system = [ setuptools ];
+
   buildInputs = [ glibcLocales ];
 
-  # strong cycle with parameterized
-  doCheck = false;
+  dependencies = [
+    six
+    appdirs
+    pytz
+    setuptools
+  ];
+
   nativeCheckInputs = [
     pyftpdlib
     mock
     psutil
     pytestCheckHook
   ];
-  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";
 
@@ -58,11 +52,14 @@ buildPythonPackage rec {
     HOME=$(mktemp -d)
   '';
 
+  # strong cycle with parameterized
+  doCheck = false;
+
   pytestFlagsArray = [ "--ignore=tests/test_opener.py" ];
 
   disabledTests =
     [ "user_data_repr" ]
-    ++ lib.optionals (stdenv.isDarwin) [
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
       # remove if https://github.com/PyFilesystem/pyfilesystem2/issues/430#issue-707878112 resolved
       "test_ftpfs"
     ]
@@ -77,6 +74,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Filesystem abstraction";
     homepage = "https://github.com/PyFilesystem/pyfilesystem2";
+    changelog = "https://github.com/PyFilesystem/pyfilesystem2/blob/v${version}/CHANGELOG.md";
     license = licenses.bsd3;
     maintainers = with maintainers; [ lovek323 ];
     platforms = platforms.unix;