Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs

1 files changed, 26 insertions, 13 deletions

diff --git a/nixpkgs/pkgs/development/python-modules/pylint-flask/default.nix b/nixpkgs/pkgs/development/python-modules/pylint-flask/default.nix
index 4a26e256d803..0928e0bd07e1 100644
--- a/nixpkgs/pkgs/development/python-modules/pylint-flask/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/pylint-flask/default.nix
@@ -1,37 +1,50 @@
-{ buildPythonPackage
+{ lib
+, astroid
+, buildPythonPackage
 , fetchPypi
-, isPy3k
-, lib
-
-# pythonPackages
+, pylint
 , pylint-plugin-utils
+, pythonOlder
+, setuptools
 }:
 
 buildPythonPackage rec {
   pname = "pylint-flask";
   version = "0.6";
-  format = "setuptools";
-  disabled = !isPy3k;
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "05qmwgkpvaa5k05abqjxfbrfk3wpdqb8ph690z7bzxvb47i7vngl";
+    hash = "sha256-9Nl94iFr97/OB8nAixZul4/p8nJd4qUKmEWpfefjFRc=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
+  buildInputs = [
+    pylint
+  ];
+
   propagatedBuildInputs = [
+    astroid
     pylint-plugin-utils
   ];
 
   # Tests require a very old version of pylint
-  #   also tests are only available at GitHub, with an old release tag
+  # also tests are only available at GitHub, with an old release tag
   doCheck = false;
 
+  pythonImportsCheck = [
+    "pylint_flask"
+  ];
+
   meta = with lib; {
     description = "A Pylint plugin to analyze Flask applications";
     homepage = "https://github.com/jschaf/pylint-flask";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [
-      kamadorueda
-    ];
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [ kamadorueda ];
   };
 }