From 6169a5e158d0a919ec26a8a67ad5c10b3ec5903d Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Sat, 22 Mar 2025 17:32:13 +0100 Subject: [PATCH 1/6] python3Packages.geeknote: drop Depends on the Python2 library evernote, and is disabled for any Python version that is not Python27. --- .../python-modules/geeknote/default.nix | 48 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 pkgs/development/python-modules/geeknote/default.nix diff --git a/pkgs/development/python-modules/geeknote/default.nix b/pkgs/development/python-modules/geeknote/default.nix deleted file mode 100644 index 1aeeabd92f295..0000000000000 --- a/pkgs/development/python-modules/geeknote/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchFromGitHub, - isPy27, - thrift, - beautifulsoup4, - markdown2, - sqlalchemy, - html2text, - evernote, -}: - -buildPythonPackage { - version = "2015-05-11"; - format = "setuptools"; - pname = "geeknote"; - disabled = !isPy27; - - src = fetchFromGitHub { - owner = "VitaliyRodnenko"; - repo = "geeknote"; - rev = "8489a87d044e164edb321ba9acca8d4631de3dca"; - sha256 = "0l16v4xnyqnsf84b1pma0jmdyxvmfwcv3sm8slrv3zv7zpmcm3lf"; - }; - - /* - build with tests fails with "Can not create application dirictory : - /homeless-shelter/.geeknotebuilder". - */ - doCheck = false; - - propagatedBuildInputs = [ - thrift - beautifulsoup4 - markdown2 - sqlalchemy - html2text - evernote - ]; - - meta = with lib; { - description = "Work with Evernote from command line"; - homepage = "http://www.geeknote.me"; - license = licenses.gpl1Only; - maintainers = with maintainers; [ hbunke ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 9b3bfa0d88b8e..3a7c989cd7ae0 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -262,6 +262,7 @@ mapAliases ({ gbulb = throw "gbulb has been removed as it is unmaintained and no longer compatible with PyGObject 3.50."; # added 2024-10-14 gcs-oauth2-boto-plugin = throw "gcs-oauth2-boto-plugin was removed as it depends on the removed boto package"; # Added 2024-09-22 gdtoolkit = throw "gdtoolkit has been promoted to a top-level attribute name: `pkgs.gdtoolkit`"; # added 2023-02-15 + geeknote = throw "geeknote depends on the Python2-only library evernote"; # Added 2025-03-22 GeoIP = geoip; # added 2023-02-19 gigalixir = throw "gigalixir has been promoted to a top-level attribute name: `pkgs.gigalixir`"; # Added 2022-10-02 gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f49f6b5d1ca98..9a0d830ac66bd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5236,8 +5236,6 @@ self: super: with self; { python3 = python; }); - geeknote = callPackage ../development/python-modules/geeknote { }; - gehomesdk = callPackage ../development/python-modules/gehomesdk { }; gekitchen = callPackage ../development/python-modules/gekitchen { }; From 9d77d960fd02b565314d978efefa12d2ec2d3364 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Sat, 22 Mar 2025 17:21:03 +0100 Subject: [PATCH 2/6] python3Packages.evernote: drop Intended for use with Python 2X, and the GitHub repository for building the wheel has not seen an update in 7 years. The repository referenced in Pypi's project description references a Python3 compatible SDK, but the link 404s. Should the link become active, then this project can be readded. --- .../python-modules/evernote/default.nix | 28 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 pkgs/development/python-modules/evernote/default.nix diff --git a/pkgs/development/python-modules/evernote/default.nix b/pkgs/development/python-modules/evernote/default.nix deleted file mode 100644 index 9d9b9cc9ad02e..0000000000000 --- a/pkgs/development/python-modules/evernote/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - isPy27, - oauth2, -}: - -buildPythonPackage rec { - pname = "evernote"; - version = "1.25.3"; - format = "setuptools"; - disabled = !isPy27; # some dependencies do not work with py3 - - src = fetchPypi { - inherit pname version; - sha256 = "796847e0b7517e729041c5187fa1665c3f6fc0491cb4d71fb95a62c4f22e64eb"; - }; - - propagatedBuildInputs = [ oauth2 ]; - - meta = with lib; { - description = "Evernote SDK for Python"; - homepage = "https://dev.evernote.com"; - license = licenses.asl20; - maintainers = with maintainers; [ hbunke ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 3a7c989cd7ae0..16fd0e2975478 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -208,6 +208,7 @@ mapAliases ({ et_xmlfile = et-xmlfile; # added 2023-10-16 etebase-server = throw "pkgs.python3.etebase-server has been removed, use pkgs.etebase-server"; # added 2024-07-16 ev3dev2 = python-ev3dev2; # added 2023-06-19 + evernote = throw "evernote is intended for use with Python 2.X"; eyeD3 = eyed3; # added 2024-01-03 Fabric = fabric; # addedd 2023-02-19 face_recognition = face-recognition; # added 2022-10-15 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9a0d830ac66bd..b0c49256ac2af 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4417,8 +4417,6 @@ self: super: with self; { events = callPackage ../development/python-modules/events { }; - evernote = callPackage ../development/python-modules/evernote { }; - evohome-async = callPackage ../development/python-modules/evohome-async { }; evolutionhttp = callPackage ../development/python-modules/evolutionhttp { }; From e3b683229306d3da00faa5ae63a99758963a4e5d Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Sun, 23 Mar 2025 01:09:12 +0100 Subject: [PATCH 3/6] python3Packages.modestmaps: drop modestmaps was never enabled for anything except Python27. As of 1.4.7, Python3 support has been added, but I doubt any there is any active interest in this package currently. It may be readded should interest renew itself. --- .../python-modules/modestmaps/default.nix | 27 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 pkgs/development/python-modules/modestmaps/default.nix diff --git a/pkgs/development/python-modules/modestmaps/default.nix b/pkgs/development/python-modules/modestmaps/default.nix deleted file mode 100644 index 24c4ef2b0bcd2..0000000000000 --- a/pkgs/development/python-modules/modestmaps/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - pillow, - isPy27, -}: - -buildPythonPackage rec { - pname = "modestmaps"; - version = "1.4.7"; - disabled = !isPy27; - - src = fetchPypi { - pname = "ModestMaps"; - inherit version; - sha256 = "698442a170f02923f8ea55f18526b56c17178162e44304f896a8a5fd65ab4457"; - }; - - propagatedBuildInputs = [ pillow ]; - - meta = with lib; { - description = "Library for building interactive maps"; - homepage = "http://modestmaps.com"; - license = licenses.bsd3; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 16fd0e2975478..24b863a2a6117 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -390,6 +390,7 @@ mapAliases ({ mitmproxy-wireguard = throw "mitmproxy-wireguard has been removed because it was replaced by upstream with mitmproxy-rs"; # added 2023-11-06 mkdocs-awesome-pages-plugin = mkdocs-awesome-nav; # added 2025-03-10 mkdocs-minify = mkdocs-minify-plugin; # added 2023-11-28 + modestmaps = throw "modestmaps is unmaintained and was never enabled for anything except Python27"; # Added 2025-03-23 mox = throw "mox was removed because it is unmaintained"; # added 2023-02-21 mox3 = throw "mox3 was removed because it is unmaintained"; # added 2024-08-30 mrkd = throw "mrkd has been promoted to a top-level attribute name: `pkgs.mrkd`"; # added 2023-08-01 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b0c49256ac2af..6b5796e83ff93 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8632,8 +8632,6 @@ self: super: with self; { moderngl-window = callPackage ../development/python-modules/moderngl-window { }; - modestmaps = callPackage ../development/python-modules/modestmaps { }; - mohawk = callPackage ../development/python-modules/mohawk { }; molbar = callPackage ../development/python-modules/molbar { }; From 2cc5727af97baace4f04f5915ba6e245b9b5a081 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Sun, 23 Mar 2025 01:15:06 +0100 Subject: [PATCH 4/6] gython3Packages.tilestache: drop tilestache is supposedly Python3 compatible but was marked as disabled for everything except Python27. Because of this, I'd rather move to remove it, and the package may be readded should interest renew itself. --- .../python-modules/tilestache/default.nix | 40 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 pkgs/development/python-modules/tilestache/default.nix diff --git a/pkgs/development/python-modules/tilestache/default.nix b/pkgs/development/python-modules/tilestache/default.nix deleted file mode 100644 index 23fe0e26ea7cb..0000000000000 --- a/pkgs/development/python-modules/tilestache/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - modestmaps, - pillow, - pycairo, - python-mapnik, - simplejson, - werkzeug, - isPy27, -}: - -buildPythonPackage rec { - pname = "tilestache"; - version = "1.51.14"; - format = "setuptools"; - disabled = !isPy27; - - src = fetchPypi { - pname = "TileStache"; - inherit version; - sha256 = "1qjrabl6qr7i6yj6v647ck92abcyklb0vmb6h6kj7x8v2cj5xbvk"; - }; - - propagatedBuildInputs = [ - modestmaps - pillow - pycairo - python-mapnik - simplejson - werkzeug - ]; - - meta = with lib; { - description = "Tile server for rendered geographic data"; - homepage = "http://tilestache.org"; - license = licenses.bsd3; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 24b863a2a6117..643b45e33527a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -710,6 +710,7 @@ mapAliases ({ tensorflow-estimator_2 = tensorflow-estimator; # added 2021-11-25 tensorflow-tensorboard = tensorboard; # added 2022-03-06 tensorflow-tensorboard_2 = tensorflow-tensorboard; # added 2021-11-25 + tilestache = throw "tilestache is unmaintained and Python3 compatibility is unknown"; # Added 2025-03-23 Theano = theano; # added 2023-02-19 TheanoWithCuda = theanoWithCuda; # added 2023-02-19 TheanoWithoutCuda = theanoWithoutCuda; # added 2023-02-19 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6b5796e83ff93..31f281d266cd9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16666,8 +16666,6 @@ self: super: with self; { tiler = callPackage ../development/python-modules/tiler { }; - tilestache = callPackage ../development/python-modules/tilestache { }; - tilt-ble = callPackage ../development/python-modules/tilt-ble { }; timeago = callPackage ../development/python-modules/timeago { }; From a4df9193336594a898de8385b79184da32868949 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Sun, 23 Mar 2025 01:31:26 +0100 Subject: [PATCH 5/6] python3Packages.python-wifi: drop The PyPi repository shows only Python2 support, and the package was disabled for everything that was not Python27. --- .../python-modules/python-wifi/default.nix | 30 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 32 deletions(-) delete mode 100644 pkgs/development/python-modules/python-wifi/default.nix diff --git a/pkgs/development/python-modules/python-wifi/default.nix b/pkgs/development/python-modules/python-wifi/default.nix deleted file mode 100644 index 2dfd18079c72a..0000000000000 --- a/pkgs/development/python-modules/python-wifi/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - isPy27, -}: - -buildPythonPackage rec { - pname = "python-wifi"; - version = "0.6.1"; - format = "setuptools"; - disabled = !isPy27; - - src = fetchPypi { - inherit pname version; - extension = "tar.bz2"; - sha256 = "149c3dznb63d82143cz5hqdim0mqjysz6p3yk0zv271vq3xnmzvv"; - }; - - meta = with lib; { - description = "Read & write wireless card capabilities using the Linux Wireless Extensions"; - homepage = "http://pythonwifi.tuxfamily.org/"; - # From the README: "pythonwifi is licensed under LGPLv2+, however, the - # examples (e.g. iwconfig.py and iwlist.py) are licensed under GPLv2+." - license = with licenses; [ - lgpl2Plus - gpl2Plus - ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 643b45e33527a..b5c0f3e5fc524 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -595,6 +595,7 @@ mapAliases ({ python-Levenshtein = levenshtein; python-pushover = throw "python-pushover has been removed, since it is unmaintained and is broken"; # added 2023-07-03 python-subunit = subunit; # added 2021-09-10 + python-wifi = throw "python-wifi does not support Python3"; pytest_xdist = pytest-xdist; # added 2021-01-04 python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 pytoml = throw "pytoml has been removed because it is unmaintained and is superseded by toml"; # Added 2023-04-11 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 31f281d266cd9..954ba1904f959 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13787,8 +13787,6 @@ self: super: with self; { python-whois = callPackage ../development/python-modules/python-whois { }; - python-wifi = callPackage ../development/python-modules/python-wifi { }; - python-wink = callPackage ../development/python-modules/python-wink { }; python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { }; From 76fba3ef796f012caba0cc4de148dda25557b120 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Sun, 23 Mar 2025 01:35:14 +0100 Subject: [PATCH 6/6] python3Packages.pychart: drop The package was never enabled for anything except Python27, the latest Pypi release is from 2009, and the homepage linked there has disappeared. --- .../python-modules/pychart/default.nix | 25 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/development/python-modules/pychart/default.nix diff --git a/pkgs/development/python-modules/pychart/default.nix b/pkgs/development/python-modules/pychart/default.nix deleted file mode 100644 index c6fa67c0912e6..0000000000000 --- a/pkgs/development/python-modules/pychart/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - isPy27, -}: - -buildPythonPackage rec { - pname = "pychart"; - version = "1.39"; - format = "setuptools"; - - disabled = !isPy27; - - src = fetchPypi { - inherit pname version; - sha256 = "882650928776a7ca72e67054a9e0ac98f78645f279c0cfb5910db28f03f07c2e"; - }; - - meta = with lib; { - description = "Library for creating high quality encapsulated Postscript, PDF, PNG, or SVG charts"; - homepage = "https://pypi.python.org/pypi/PyChart"; - license = licenses.gpl2; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index b5c0f3e5fc524..38e8d05eb3d24 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -492,6 +492,7 @@ mapAliases ({ pyalmond = throw "pyalmond has been removed, since its API endpoints have been shutdown"; # added 2023-02-02 pyblake2 = throw "pyblake2 is deprecated in favor of hashlib"; # added 2023-04-23 pyblock = throw "pyblock has been removed, since it is abandoned and broken"; # added 2023-06-20 + pychart = throw "pychart does not support Python3"; # added 2025-03-23 pycontracts = throw "pycontracts has been removed, since upstream is no longer active and it is broken on modern Python versions."; # added 2024-08-09 pydns = py3dns; # added 2024-10-25 pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 954ba1904f959..adb36a6e790bf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11816,8 +11816,6 @@ self: super: with self; { pychannels = callPackage ../development/python-modules/pychannels { }; - pychart = callPackage ../development/python-modules/pychart { }; - pychm = callPackage ../development/python-modules/pychm { }; pychromecast = callPackage ../development/python-modules/pychromecast { };