From f1330ea7db025f54b76161416d09059f4d7e451f Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Fri, 12 Sep 2025 15:01:46 +0200 Subject: [PATCH 1/3] python313Packages.flake8-import-order: fix src --- .../development/python-modules/flake8-import-order/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix index 9dd465ada993..52216802e8da 100644 --- a/pkgs/development/python-modules/flake8-import-order/default.nix +++ b/pkgs/development/python-modules/flake8-import-order/default.nix @@ -17,7 +17,8 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; + inherit version; + pname = "flake8_import_order"; hash = "sha256-Ezs8VUl2MeQjUHT8mKlQeLuoF4MjefIqMfCtJFW8sLI="; }; From c402e11ffb226df670b0878be96edd521ae4d18a Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Fri, 12 Sep 2025 15:04:55 +0200 Subject: [PATCH 2/3] python313Packages.flake8-import-order: fix license, refactor --- .../flake8-import-order/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix index 52216802e8da..021db4025821 100644 --- a/pkgs/development/python-modules/flake8-import-order/default.nix +++ b/pkgs/development/python-modules/flake8-import-order/default.nix @@ -6,15 +6,13 @@ pycodestyle, pylama, pytestCheckHook, - pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "flake8-import-order"; version = "0.19.2"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchPypi { inherit version; @@ -22,7 +20,9 @@ buildPythonPackage rec { hash = "sha256-Ezs8VUl2MeQjUHT8mKlQeLuoF4MjefIqMfCtJFW8sLI="; }; - propagatedBuildInputs = [ pycodestyle ]; + build-system = [ setuptools ]; + + dependencies = [ pycodestyle ]; nativeCheckInputs = [ flake8 @@ -33,14 +33,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "flake8_import_order" ]; - meta = with lib; { + meta = { description = "Flake8 and pylama plugin that checks the ordering of import statements"; homepage = "https://github.com/PyCQA/flake8-import-order"; changelog = "https://github.com/PyCQA/flake8-import-order/blob/${version}/CHANGELOG.rst"; - license = with licenses; [ - lgpl3 - mit - ]; + license = lib.licenses.lgpl3Only; maintainers = [ ]; }; } From 9b7b290696dbe0a7a5f599d52ff7dbb35082a1f7 Mon Sep 17 00:00:00 2001 From: Tom Hunze Date: Sun, 14 Sep 2025 22:21:51 +0200 Subject: [PATCH 3/3] python313Packages.flake8-import-order: fetch src from GitHub --- .../python-modules/flake8-import-order/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix index 021db4025821..b64afe82c6b7 100644 --- a/pkgs/development/python-modules/flake8-import-order/default.nix +++ b/pkgs/development/python-modules/flake8-import-order/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, flake8, pycodestyle, pylama, @@ -14,10 +14,11 @@ buildPythonPackage rec { version = "0.19.2"; pyproject = true; - src = fetchPypi { - inherit version; - pname = "flake8_import_order"; - hash = "sha256-Ezs8VUl2MeQjUHT8mKlQeLuoF4MjefIqMfCtJFW8sLI="; + src = fetchFromGitHub { + owner = "PyCQA"; + repo = "flake8-import-order"; + tag = version; + hash = "sha256-mXw3+pQMr2Ut1prj9sCZc4jyErDOyWJgq6OBPU1nZxs="; }; build-system = [ setuptools ];