From e8d06d76e16542ddb897b00400d32c88cfe5860b Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sat, 6 Jan 2024 13:06:56 +0100 Subject: [PATCH] fix: remove some python overlays, these are now available in nixpkgs --- python-overlay.nix | 26 -------------------------- python/git-url-parse.nix | 14 -------------- python/posthog.nix | 22 ---------------------- python/premailer.nix | 22 ---------------------- python/pypdf2.nix | 13 ------------- python/pypika.nix | 15 --------------- python/python-youtube.nix | 27 --------------------------- python/rauth.nix | 14 -------------- 8 files changed, 153 deletions(-) delete mode 100644 python/git-url-parse.nix delete mode 100644 python/posthog.nix delete mode 100644 python/premailer.nix delete mode 100644 python/pypdf2.nix delete mode 100644 python/pypika.nix delete mode 100644 python/python-youtube.nix delete mode 100644 python/rauth.nix diff --git a/python-overlay.nix b/python-overlay.nix index f2fd814..8951ea3 100644 --- a/python-overlay.nix +++ b/python-overlay.nix @@ -13,20 +13,13 @@ final: prev: { # erpnext dependencies gocardless-pro = pyFinal.callPackage ./python/gocardless-pro.nix {}; - python-youtube = pyFinal.callPackage ./python/python-youtube.nix {}; redisearch = pyFinal.callPackage ./python/redisearch.nix {}; taxjar = pyFinal.callPackage ./python/taxjar.nix {}; # frappe dependencies email-reply-parser = pyFinal.callPackage ./python/email-reply-parser.nix {}; - git-url-parse = pyFinal.callPackage ./python/git-url-parse.nix {}; maxminddb-geolite2 = pyFinal.callPackage ./python/maxminddb-geolite2.nix {}; - posthog = pyFinal.callPackage ./python/posthog.nix {}; - premailer = pyFinal.callPackage ./python/premailer.nix {}; psycopg2-binary = pyFinal.callPackage ./python/psycopg2-binary.nix {}; - pypdf2 = pyFinal.callPackage ./python/pypdf2.nix {}; - pypika = pyFinal.callPackage ./python/pypika.nix {}; - rauth = pyFinal.callPackage ./python/rauth.nix {}; traceback-with-variables = pyFinal.callPackage ./python/traceback-with-variables.nix {}; # indirect dependencies @@ -36,15 +29,6 @@ final: prev: { rejson = pyFinal.callPackage ./python/rejson.nix {}; - - bleach = pyPrev.bleach.overridePythonAttrs (oldAttrs: (rec { - version = "3.3.1"; - src = pyPrev.fetchPypi { - inherit version; - inherit (oldAttrs) pname; - sha256 = "sha256-MGSDpal5VHQWCtV/zj3dG1BVHpge7Y4VpYLTTO8oqvo="; - }; - })); plaid-python = pyPrev.plaid-python.overridePythonAttrs (oldAttrs: (rec { version = "7.2.1"; src = pyPrev.fetchPypi { @@ -57,16 +41,6 @@ final: prev: { # Integration tests require API keys and internet access checkPhase = "pyPrev.test -rxs ./tests/unit"; })); - tweepy = pyPrev.tweepy.overridePythonAttrs (oldAttrs: (rec { - version = "3.10.0"; - src = pyPrev.fetchPypi { - inherit version; - inherit (oldAttrs) pname; - sha256 = "sha256-duaVS4BspHDdqHf1fbh5L/8GoL66DtQ+/DgFdx458Go="; - }; - doCheck = false; - pythonImportsCheck = []; - })); }; }; } diff --git a/python/git-url-parse.nix b/python/git-url-parse.nix deleted file mode 100644 index 8a50f97..0000000 --- a/python/git-url-parse.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ buildPythonPackage -, fetchPypi -, pbr -}: -buildPythonPackage rec { - pname = "git-url-parse"; - version = "1.2.2"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-e19OOusdaTr+7mejvUrAY/cgbC6ORuVZ8NoNqYRF8Rc="; - }; - propagatedBuildInputs = [pbr]; - doCheck = false; -} diff --git a/python/posthog.nix b/python/posthog.nix deleted file mode 100644 index a746f12..0000000 --- a/python/posthog.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ buildPythonPackage -, fetchPypi -, backoff -, monotonic -, python-dateutil -, requests -}: -buildPythonPackage rec { - pname = "posthog"; - version = "3.0.1"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-V9J5H/V1LOVroPm7iHb688qSCPHCxs6utaJQTDRJN2c="; - }; - propagatedBuildInputs = [ - backoff - monotonic - python-dateutil - requests - ]; - doCheck = false; -} diff --git a/python/premailer.nix b/python/premailer.nix deleted file mode 100644 index 0489bc0..0000000 --- a/python/premailer.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ buildPythonPackage -, fetchPypi -, cssselect -, cssutils -, lxml -, mock -, nose -, requests -, cachetools -}: -buildPythonPackage rec { - pname = "premailer"; - version = "3.8.0"; - - buildInputs = [ mock nose ]; - propagatedBuildInputs = [ cachetools cssselect cssutils lxml requests ]; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-TU4VckTO6UWgDBT+qp5qOusvryYj/2qLoIr99QX6DyU="; - }; -} diff --git a/python/pypdf2.nix b/python/pypdf2.nix deleted file mode 100644 index 0a318a8..0000000 --- a/python/pypdf2.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - buildPythonPackage, - fetchPypi, -}: -buildPythonPackage rec { - pname = "PyPDF2"; - version = "2.1.1"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-Vy8TFLZDMGed1vtwN4H+M9Dyi1n7LP661efrntypJzg="; - }; - propagatedBuildInputs = []; -} diff --git a/python/pypika.nix b/python/pypika.nix deleted file mode 100644 index da81dc3..0000000 --- a/python/pypika.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - buildPythonPackage, - fetchPypi, -}: -buildPythonPackage rec { - pname = "pypika"; - version = "0.48.9"; - src = fetchPypi { - pname = "PyPika"; - inherit version; - sha256 = "sha256-g4g2phdH58g4DNG3/2OGlLenM1NF0PVZsEss2DKtU3g="; - }; - propagatedBuildInputs = []; - doCheck = false; -} diff --git a/python/python-youtube.nix b/python/python-youtube.nix deleted file mode 100644 index 08940f7..0000000 --- a/python/python-youtube.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - buildPythonPackage, - fetchPypi, - - requests, - dataclasses-json, - isodate, - requests-oauthlib -}: -buildPythonPackage rec { - pname = "python-youtube"; - version = "0.8.0"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-Ud0Y+lmsK88SNh0uIjhOHgCgCG+SBv/FQkt3yc63tlo="; - }; - - # PyPI doesn't have test data in the source dist - doCheck = false; - - propagatedBuildInputs = [ - requests - dataclasses-json - isodate - requests-oauthlib - ]; -} diff --git a/python/rauth.nix b/python/rauth.nix deleted file mode 100644 index fb2b7f1..0000000 --- a/python/rauth.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ buildPythonPackage -, fetchPypi -, requests -}: -buildPythonPackage rec { - pname = "rauth"; - version = "0.7.3"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-UkzbwcKFYOrPyanUDFlSXrjQD98H+62GEH6iRBFHewo="; - }; - propagatedBuildInputs = [requests]; - doCheck = false; -}