diff --git a/pkgs/by-name/al/alerta/package.nix b/pkgs/by-name/al/alerta/package.nix index 5211f0bb37fe..aa6d71e48641 100644 --- a/pkgs/by-name/al/alerta/package.nix +++ b/pkgs/by-name/al/alerta/package.nix @@ -25,8 +25,6 @@ python3.pkgs.buildPythonApplication rec { doCheck = false; - disabled = python3.pythonOlder "3.6"; - meta = { homepage = "https://alerta.io"; description = "Alerta Monitoring System command-line interface"; diff --git a/pkgs/by-name/go/gorilla-cli/package.nix b/pkgs/by-name/go/gorilla-cli/package.nix index 55686538c4ad..589f33e292e7 100644 --- a/pkgs/by-name/go/gorilla-cli/package.nix +++ b/pkgs/by-name/go/gorilla-cli/package.nix @@ -17,8 +17,6 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-3h3QtBDKswTDL7zNM2C4VWiGCqknm/bxhP9sw4ieIcQ="; }; - disabled = python3.pythonOlder "3.6"; - build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/ni/nimbo/package.nix b/pkgs/by-name/ni/nimbo/package.nix index 42d2a9bd8d00..661db2d69d89 100644 --- a/pkgs/by-name/ni/nimbo/package.nix +++ b/pkgs/by-name/ni/nimbo/package.nix @@ -11,7 +11,6 @@ python3.pkgs.buildPythonApplication rec { pname = "nimbo"; version = "0.3.0"; format = "setuptools"; - disabled = python3.pythonOlder "3.6"; src = fetchFromGitHub { owner = "nimbo-sh"; diff --git a/pkgs/by-name/py/pylode/package.nix b/pkgs/by-name/py/pylode/package.nix index 7356f3b5b987..099007f6a661 100644 --- a/pkgs/by-name/py/pylode/package.nix +++ b/pkgs/by-name/py/pylode/package.nix @@ -9,8 +9,6 @@ python3.pkgs.buildPythonApplication rec { version = "2.13.3"; pyproject = true; - disabled = python3.pythonOlder "3.6"; - src = fetchFromGitHub { owner = "RDFLib"; repo = "pylode"; diff --git a/pkgs/by-name/sh/shot-scraper/package.nix b/pkgs/by-name/sh/shot-scraper/package.nix index 5052334b68ed..4818f015a263 100644 --- a/pkgs/by-name/sh/shot-scraper/package.nix +++ b/pkgs/by-name/sh/shot-scraper/package.nix @@ -9,8 +9,6 @@ python3.pkgs.buildPythonApplication rec { version = "1.8"; pyproject = true; - disabled = python3.pkgs.pythonOlder "3.6"; - src = fetchFromGitHub { owner = "simonw"; repo = "shot-scraper"; diff --git a/pkgs/by-name/us/usbrip/package.nix b/pkgs/by-name/us/usbrip/package.nix index 9ec88c6d4cad..11e25d1053b6 100644 --- a/pkgs/by-name/us/usbrip/package.nix +++ b/pkgs/by-name/us/usbrip/package.nix @@ -9,8 +9,6 @@ python3.pkgs.buildPythonApplication { version = "0-unstable-2021-07-02"; pyproject = true; - disabled = python3.pythonOlder "3.6"; - src = fetchFromGitHub { owner = "snovvcrash"; repo = "usbrip"; diff --git a/pkgs/by-name/xx/xxh/package.nix b/pkgs/by-name/xx/xxh/package.nix index e9a9b4da45c1..70e6e5b5e098 100644 --- a/pkgs/by-name/xx/xxh/package.nix +++ b/pkgs/by-name/xx/xxh/package.nix @@ -9,7 +9,6 @@ python3.pkgs.buildPythonApplication rec { pname = "xxh"; version = "0.8.14"; pyproject = true; - disabled = python3.pkgs.pythonOlder "3.6"; src = fetchFromGitHub { owner = "xxh"; diff --git a/pkgs/development/python-modules/augmax/default.nix b/pkgs/development/python-modules/augmax/default.nix index 2ddb285b7061..9573bd29a870 100644 --- a/pkgs/development/python-modules/augmax/default.nix +++ b/pkgs/development/python-modules/augmax/default.nix @@ -5,7 +5,6 @@ jax, jaxlib, lib, - pythonOlder, setuptools, }: @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "0.3.3"; pyproject = true; - disbaled = pythonOlder "3.6"; - src = fetchFromGitHub { owner = "khdlr"; repo = "augmax"; diff --git a/pkgs/development/python-modules/bwapy/default.nix b/pkgs/development/python-modules/bwapy/default.nix index 11b27dcfd2c5..6de156ff9d2e 100644 --- a/pkgs/development/python-modules/bwapy/default.nix +++ b/pkgs/development/python-modules/bwapy/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, pythonAtLeast, - pythonOlder, fetchPypi, bwa, cffi, @@ -15,7 +14,7 @@ buildPythonPackage rec { format = "setuptools"; # uses the removed imp module - disabled = pythonOlder "3.6" || pythonAtLeast "3.12"; + disabled = pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/future-fstrings/default.nix b/pkgs/development/python-modules/future-fstrings/default.nix index 6e2782b698ee..949532f3a24a 100644 --- a/pkgs/development/python-modules/future-fstrings/default.nix +++ b/pkgs/development/python-modules/future-fstrings/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, }: buildPythonPackage rec { @@ -25,6 +24,5 @@ buildPythonPackage rec { mainProgram = "future-fstrings-show"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ nyanloutre ]; - broken = pythonOlder "3.6"; # dependency tokenize-rt not packaged }; } diff --git a/pkgs/development/python-modules/irctokens/default.nix b/pkgs/development/python-modules/irctokens/default.nix index 4155ef180a28..ac9afc7274ff 100644 --- a/pkgs/development/python-modules/irctokens/default.nix +++ b/pkgs/development/python-modules/irctokens/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, pyyaml, unittestCheckHook, @@ -13,8 +12,6 @@ buildPythonPackage rec { version = "2.0.2"; pyproject = true; - disabled = pythonOlder "3.6"; # f-strings - src = fetchFromGitHub { owner = "jesopo"; repo = "irctokens"; diff --git a/pkgs/development/python-modules/pandas-datareader/default.nix b/pkgs/development/python-modules/pandas-datareader/default.nix index aaf21fa3b025..08c97850568a 100644 --- a/pkgs/development/python-modules/pandas-datareader/default.nix +++ b/pkgs/development/python-modules/pandas-datareader/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, pythonAtLeast, fetchPypi, setuptools, @@ -15,7 +14,7 @@ buildPythonPackage rec { version = "0.10.0"; pyproject = true; - disabled = pythonOlder "3.6" || pythonAtLeast "3.12"; + disabled = pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/preprocess-cancellation/default.nix b/pkgs/development/python-modules/preprocess-cancellation/default.nix index 3c21dd84ec48..f19608992fe0 100644 --- a/pkgs/development/python-modules/preprocess-cancellation/default.nix +++ b/pkgs/development/python-modules/preprocess-cancellation/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, poetry-core, shapely, @@ -11,7 +10,6 @@ buildPythonPackage rec { pname = "preprocess-cancellation"; version = "0.2.1"; - disabled = pythonOlder "3.6"; # >= 3.6 pyproject = true; # No tests in PyPI diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix index 022aca1ca197..3e844a037dc9 100644 --- a/pkgs/development/python-modules/python-socks/default.nix +++ b/pkgs/development/python-modules/python-socks/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { version = "2.7.3"; pyproject = true; - disabled = pythonOlder "3.6.2"; - __darwinAllowLocalNetworking = true; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/pytomlpp/default.nix b/pkgs/development/python-modules/pytomlpp/default.nix index 02cd9bc95a61..4866d8469ee5 100644 --- a/pkgs/development/python-modules/pytomlpp/default.nix +++ b/pkgs/development/python-modules/pytomlpp/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, pybind11, pytestCheckHook, python-dateutil, @@ -40,8 +39,7 @@ buildPythonPackage rec { matplotlib ]; - # pelican requires > 2.7 - doCheck = !pythonOlder "3.6"; + doCheck = true; disabledTests = [ # incompatible with pytest7 diff --git a/pkgs/development/python-modules/pytz-deprecation-shim/default.nix b/pkgs/development/python-modules/pytz-deprecation-shim/default.nix index dc52cab267e7..d9258a6ebc82 100644 --- a/pkgs/development/python-modules/pytz-deprecation-shim/default.nix +++ b/pkgs/development/python-modules/pytz-deprecation-shim/default.nix @@ -2,9 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonAtLeast, - pythonOlder, - python-dateutil, setuptools, tzdata, hypothesis, @@ -26,9 +23,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = - (lib.optionals (pythonOlder "3.6") [ python-dateutil ]) - ++ (lib.optionals (pythonAtLeast "3.6") [ tzdata ]); + propagatedBuildInputs = [ tzdata ]; nativeCheckInputs = [ hypothesis diff --git a/pkgs/development/python-modules/skybellpy/default.nix b/pkgs/development/python-modules/skybellpy/default.nix index 767e020d9be3..76e58efe547a 100644 --- a/pkgs/development/python-modules/skybellpy/default.nix +++ b/pkgs/development/python-modules/skybellpy/default.nix @@ -7,7 +7,6 @@ pytest-timeout, pytestCheckHook, pythonAtLeast, - pythonOlder, requests, requests-mock, setuptools, @@ -19,7 +18,7 @@ buildPythonPackage rec { pyproject = true; # Still uses distrutils, https://github.com/MisterWil/skybellpy/issues/22 - disabled = pythonOlder "3.6" || pythonAtLeast "3.12"; + disabled = pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "MisterWil"; diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 370ad401586f..d4d8e8fa85c5 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -13,7 +13,6 @@ # Python deps buildPythonPackage, pythonAtLeast, - pythonOlder, python, # Python libraries numpy, @@ -132,7 +131,7 @@ let } ]; - withTensorboard = (pythonOlder "3.6") || tensorboardSupport; + withTensorboard = tensorboardSupport; cudaComponents = with cudaPackages; [ (cuda_nvcc.__spliced.buildHost or cuda_nvcc) diff --git a/pkgs/development/python-modules/vmprof/default.nix b/pkgs/development/python-modules/vmprof/default.nix index 181a319b8321..7a5d69e3a6fb 100644 --- a/pkgs/development/python-modules/vmprof/default.nix +++ b/pkgs/development/python-modules/vmprof/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, pythonAtLeast, fetchFromGitHub, setuptools, @@ -18,7 +17,7 @@ buildPythonPackage rec { version = "0.4.17"; pyproject = true; - disabled = pythonOlder "3.6" || pythonAtLeast "3.12"; + disabled = pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "vmprof"; diff --git a/pkgs/development/python2-modules/pytest/default.nix b/pkgs/development/python2-modules/pytest/default.nix index 21a1967e837c..3adb0a7d4aad 100644 --- a/pkgs/development/python2-modules/pytest/default.nix +++ b/pkgs/development/python2-modules/pytest/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchPypi, attrs, hypothesis, @@ -16,7 +15,6 @@ atomicwrites, mock, writeText, - pathlib2, wcwidth, packaging, isPyPy, @@ -52,8 +50,7 @@ buildPythonPackage rec { wcwidth packaging ] - ++ lib.optionals (!isPy3k) [ funcsigs ] - ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ]; + ++ lib.optionals (!isPy3k) [ funcsigs ]; doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460 checkPhase = '' diff --git a/pkgs/development/python2-modules/typing/default.nix b/pkgs/development/python2-modules/typing/default.nix index 5cc48c6b12e8..66104f8dc24d 100644 --- a/pkgs/development/python2-modules/typing/default.nix +++ b/pkgs/development/python2-modules/typing/default.nix @@ -2,11 +2,8 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, isPy3k, - isPyPy, unittestCheckHook, - pythonAtLeast, }: let @@ -23,12 +20,7 @@ buildPythonPackage rec { sha256 = "13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130"; }; - disabled = pythonAtLeast "3.5"; - - # Error for Python3.6: ImportError: cannot import name 'ann_module' - # See https://github.com/python/typing/pull/280 - # Also, don't bother on PyPy: AssertionError: TypeError not raised - doCheck = pythonOlder "3.6" && !isPyPy; + disabled = true; nativeCheckInputs = [ unittestCheckHook ];