diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index 293b28e074c7..b351009d549c 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -14,8 +14,6 @@ python3.pkgs.buildPythonApplication rec { version = "1.9.5"; pyproject = true; - disabled = python3.pythonOlder "3.7"; - src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; diff --git a/pkgs/by-name/br/brutalmaze/package.nix b/pkgs/by-name/br/brutalmaze/package.nix index 6c246383e93f..93982705deb1 100644 --- a/pkgs/by-name/br/brutalmaze/package.nix +++ b/pkgs/by-name/br/brutalmaze/package.nix @@ -8,7 +8,6 @@ python312Packages.buildPythonApplication rec { pname = "brutalmaze"; version = "1.1.1"; pyproject = true; - disabled = python312Packages.pythonOlder "3.7"; src = fetchFromSourcehut { owner = "~cnx"; diff --git a/pkgs/by-name/dt/dt-schema/package.nix b/pkgs/by-name/dt/dt-schema/package.nix index 098f74517f05..446e47f7b9ef 100644 --- a/pkgs/by-name/dt/dt-schema/package.nix +++ b/pkgs/by-name/dt/dt-schema/package.nix @@ -10,7 +10,6 @@ let # see https://github.com/devicetree-org/dt-schema/issues/108 jsonschema = super.jsonschema.overridePythonAttrs (old: rec { version = "4.17.3"; - disabled = self.pythonOlder "3.7"; src = old.src.override { inherit version; diff --git a/pkgs/by-name/gd/gdtoolkit_4/package.nix b/pkgs/by-name/gd/gdtoolkit_4/package.nix index 23eabade70f8..253f4a131d93 100644 --- a/pkgs/by-name/gd/gdtoolkit_4/package.nix +++ b/pkgs/by-name/gd/gdtoolkit_4/package.nix @@ -37,8 +37,6 @@ python.pkgs.buildPythonApplication rec { hash = "sha256-Jam7Txm+Fq5zEkJZMmbWW5Ok4ThsPyi6NIeawQot0RE="; }; - disabled = python.pythonOlder "3.7"; - propagatedBuildInputs = with python.pkgs; [ docopt lark diff --git a/pkgs/by-name/mu/mutmut/package.nix b/pkgs/by-name/mu/mutmut/package.nix index 9fcec251b046..3604b653a107 100644 --- a/pkgs/by-name/mu/mutmut/package.nix +++ b/pkgs/by-name/mu/mutmut/package.nix @@ -20,8 +20,6 @@ python3Packages.buildPythonApplication rec { substituteInPlace requirements.txt --replace-fail 'junit-xml==1.8' 'junit-xml==1.9' ''; - disabled = python3Packages.pythonOlder "3.7"; - doCheck = false; build-system = with python3Packages; [ setuptools ]; diff --git a/pkgs/by-name/of/offpunk/package.nix b/pkgs/by-name/of/offpunk/package.nix index 462acbcc275e..01c0431ee483 100644 --- a/pkgs/by-name/of/offpunk/package.nix +++ b/pkgs/by-name/of/offpunk/package.nix @@ -17,8 +17,6 @@ python3Packages.buildPythonApplication rec { version = "2.8"; pyproject = true; - disabled = python3Packages.pythonOlder "3.7"; - src = fetchFromSourcehut { owner = "~lioploum"; repo = "offpunk"; diff --git a/pkgs/by-name/xc/xcat/package.nix b/pkgs/by-name/xc/xcat/package.nix index cff20eecb07c..728d997d364a 100644 --- a/pkgs/by-name/xc/xcat/package.nix +++ b/pkgs/by-name/xc/xcat/package.nix @@ -7,7 +7,6 @@ python3.pkgs.buildPythonApplication rec { pname = "xcat"; version = "1.2.0"; - disabled = python3.pythonOlder "3.7"; pyproject = true; src = fetchFromGitHub { diff --git a/pkgs/by-name/ze/zerobin/package.nix b/pkgs/by-name/ze/zerobin/package.nix index ba73962d9833..1ff4b914e546 100644 --- a/pkgs/by-name/ze/zerobin/package.nix +++ b/pkgs/by-name/ze/zerobin/package.nix @@ -17,8 +17,6 @@ python3Packages.buildPythonApplication rec { sha256 = "1dfy3h823ylz4w2vv3mrmnmiyvf6rvyvsp4j3llr074w9id0zy16"; }; - disabled = python3Packages.pythonOlder "3.7"; - nativeBuildInputs = [ python3Packages.doit python3Packages.pyscss diff --git a/pkgs/development/python-modules/asynctest/default.nix b/pkgs/development/python-modules/asynctest/default.nix index ffd3c0e7bdbf..62333d77a3a5 100644 --- a/pkgs/development/python-modules/asynctest/default.nix +++ b/pkgs/development/python-modules/asynctest/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, python, pythonAtLeast, }: @@ -26,9 +25,6 @@ buildPythonPackage rec { --replace "test_events_watched_outside_test_are_ignored" "xtest_events_watched_outside_test_are_ignored" ''; - # https://github.com/Martiusweb/asynctest/issues/132 - doCheck = pythonOlder "3.7"; - checkPhase = '' ${python.interpreter} -m unittest test ''; diff --git a/pkgs/development/python-modules/fipy/default.nix b/pkgs/development/python-modules/fipy/default.nix index c2dcdd60488d..40d8434a88d3 100644 --- a/pkgs/development/python-modules/fipy/default.nix +++ b/pkgs/development/python-modules/fipy/default.nix @@ -15,7 +15,6 @@ openssh, fetchFromGitHub, pythonAtLeast, - pythonOlder, }: buildPythonPackage rec { @@ -26,7 +25,7 @@ buildPythonPackage rec { # Python 3.12 is not yet supported. # https://github.com/usnistgov/fipy/issues/997 # https://github.com/usnistgov/fipy/pull/1023 - disabled = pythonOlder "3.7" || pythonAtLeast "3.12"; + disabled = pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "usnistgov"; diff --git a/pkgs/development/python-modules/jupyter-server-fileid/default.nix b/pkgs/development/python-modules/jupyter-server-fileid/default.nix index 7e39775da161..cb61e0d69844 100644 --- a/pkgs/development/python-modules/jupyter-server-fileid/default.nix +++ b/pkgs/development/python-modules/jupyter-server-fileid/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, hatchling, jupyter-events, @@ -16,8 +15,6 @@ buildPythonPackage rec { version = "0.9.3"; pyproject = true; - disables = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "jupyter-server"; repo = "jupyter_server_fileid"; diff --git a/pkgs/development/python-modules/lmtpd/default.nix b/pkgs/development/python-modules/lmtpd/default.nix index 9e50439a0a1f..5f7f89a357c1 100644 --- a/pkgs/development/python-modules/lmtpd/default.nix +++ b/pkgs/development/python-modules/lmtpd/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, pythonAtLeast, - pythonOlder, setuptools, }: @@ -13,7 +12,7 @@ buildPythonPackage rec { pyproject = true; # smtpd will be removed in version 3.12 - disabled = pythonOlder "3.7" || pythonAtLeast "3.12"; + disabled = pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/manifestoo-core/default.nix b/pkgs/development/python-modules/manifestoo-core/default.nix index e74437bf5405..1235fef6fb30 100644 --- a/pkgs/development/python-modules/manifestoo-core/default.nix +++ b/pkgs/development/python-modules/manifestoo-core/default.nix @@ -1,12 +1,9 @@ { buildPythonPackage, - typing-extensions, fetchPypi, lib, nix-update-script, hatch-vcs, - pythonOlder, - importlib-resources, }: buildPythonPackage rec { @@ -22,10 +19,6 @@ buildPythonPackage rec { nativeBuildInputs = [ hatch-vcs ]; - propagatedBuildInputs = - lib.optionals (pythonOlder "3.7") [ importlib-resources ] - ++ lib.optionals (pythonOlder "3.8") [ typing-extensions ]; - passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/development/python-modules/mezzanine/default.nix b/pkgs/development/python-modules/mezzanine/default.nix index 08be1bf506e2..1c3ba200b8bb 100644 --- a/pkgs/development/python-modules/mezzanine/default.nix +++ b/pkgs/development/python-modules/mezzanine/default.nix @@ -14,7 +14,6 @@ pytestCheckHook, pytest-cov-stub, pytest-django, - pythonOlder, pytz, requests, requests-oauthlib, @@ -28,7 +27,7 @@ buildPythonPackage rec { version = "6.1.1"; format = "setuptools"; - disabled = pythonOlder "3.7" || isPyPy; + disabled = isPyPy; src = fetchFromGitHub { owner = "stephenmcd"; diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix index b249f096b331..7188d5daac6d 100644 --- a/pkgs/development/python-modules/objgraph/default.nix +++ b/pkgs/development/python-modules/objgraph/default.nix @@ -6,7 +6,6 @@ graphvizPkgs, isPyPy, python, - pythonOlder, replaceVars, setuptools, }: @@ -16,7 +15,7 @@ buildPythonPackage rec { version = "3.6.2"; pyproject = true; - disabled = pythonOlder "3.7" || isPyPy; + disabled = isPyPy; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index 5a308bc148bc..e84f991ae68e 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -3,7 +3,6 @@ buildPythonPackage, fetchPypi, isPyPy, - pythonOlder, unixODBC, }: @@ -12,7 +11,7 @@ buildPythonPackage rec { version = "5.2.0"; format = "setuptools"; - disabled = pythonOlder "3.7" || isPyPy; # use pypypdbc instead + disabled = isPyPy; # use pypypdbc instead src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pyosmium/default.nix b/pkgs/development/python-modules/pyosmium/default.nix index 2928d134a2c3..7ad9f2b2cc3f 100644 --- a/pkgs/development/python-modules/pyosmium/default.nix +++ b/pkgs/development/python-modules/pyosmium/default.nix @@ -10,7 +10,6 @@ bzip2, zlib, pybind11, - pythonOlder, pytest-httpserver, pytestCheckHook, setuptools, @@ -26,7 +25,7 @@ buildPythonPackage rec { version = "4.0.2"; pyproject = true; - disabled = pythonOlder "3.7" || isPyPy; + disabled = isPyPy; src = fetchFromGitHub { owner = "osmcode"; diff --git a/pkgs/development/python-modules/raincloudy/default.nix b/pkgs/development/python-modules/raincloudy/default.nix index 58973cc8a0a0..120ffc25b80f 100644 --- a/pkgs/development/python-modules/raincloudy/default.nix +++ b/pkgs/development/python-modules/raincloudy/default.nix @@ -10,7 +10,6 @@ pytest-aiohttp, pytestCheckHook, pythonAtLeast, - pythonOlder, requests, requests-mock, setuptools, @@ -25,7 +24,7 @@ buildPythonPackage rec { pypriject = true; # https://github.com/vanstinator/raincloudy/issues/65 - disabled = pythonOlder "3.7" || pythonAtLeast "3.12"; + disabled = pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "vanstinator"; diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index f54e7bf9b29a..3b0165fed65a 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -10,7 +10,6 @@ praw, pyenchant, pytestCheckHook, - pythonOlder, pytz, sqlalchemy, xmltodict, @@ -23,7 +22,7 @@ buildPythonPackage rec { version = "8.0.4"; pyproject = true; - disabled = isPyPy || pythonOlder "3.7"; + disabled = isPyPy; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/tzdata/default.nix b/pkgs/development/python-modules/tzdata/default.nix index e489e3e4c41c..7989a6016e12 100644 --- a/pkgs/development/python-modules/tzdata/default.nix +++ b/pkgs/development/python-modules/tzdata/default.nix @@ -2,10 +2,8 @@ lib, buildPythonPackage, fetchPypi, - importlib-resources, pytest-subtests, pytestCheckHook, - pythonOlder, setuptools, }: @@ -24,8 +22,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-subtests - ] - ++ lib.optionals (pythonOlder "3.7") [ importlib-resources ]; + ]; pythonImportsCheck = [ "tzdata" ]; diff --git a/pkgs/development/python-modules/zimports/default.nix b/pkgs/development/python-modules/zimports/default.nix index 000338a49034..f76f386e6a0e 100644 --- a/pkgs/development/python-modules/zimports/default.nix +++ b/pkgs/development/python-modules/zimports/default.nix @@ -8,7 +8,6 @@ setuptools, pytestCheckHook, pythonAtLeast, - pythonOlder, }: buildPythonPackage rec { @@ -17,7 +16,7 @@ buildPythonPackage rec { format = "setuptools"; # upstream technically support 3.7 through 3.9, but 3.10 happens to work while 3.11 breaks with an import error - disabled = pythonOlder "3.7" || pythonAtLeast "3.11"; + disabled = pythonAtLeast "3.11"; src = fetchFromGitHub { owner = "sqlalchemyorg";