From 454965b97588653ff957c33cf6ef543ef787367b Mon Sep 17 00:00:00 2001 From: teutat3s Date: Thu, 18 May 2023 17:36:51 +0200 Subject: [PATCH] Even more WIP --- python/bleach.nix | 15 +++++++++++---- python/cairocffi.nix | 13 ------------- python/email-reply-parser.nix | 1 + python/frappe.nix | 4 ++-- python/git-url-parse.nix | 9 +++++---- python/maxminddb-geolite2.nix | 8 ++++---- python/posthog.nix | 16 ++++++++++++---- python/psycopg2-binary.nix | 1 + python/pypdf2.nix | 4 ++-- python/pypika.nix | 1 + python/rauth.nix | 9 +++++---- python/traceback-with-variables.nix | 6 +++--- python/weasyprint.nix | 14 -------------- 13 files changed, 47 insertions(+), 54 deletions(-) delete mode 100644 python/cairocffi.nix delete mode 100644 python/weasyprint.nix diff --git a/python/bleach.nix b/python/bleach.nix index d0516e0..bdd5f11 100644 --- a/python/bleach.nix +++ b/python/bleach.nix @@ -1,6 +1,8 @@ -{ - buildPythonPackage, - fetchPypi, +{ buildPythonPackage +, fetchPypi +, six +, packaging +, webencodings }: buildPythonPackage rec { pname = "bleach"; @@ -9,5 +11,10 @@ buildPythonPackage rec { inherit pname version; sha256 = "sha256-MGSDpal5VHQWCtV/zj3dG1BVHpge7Y4VpYLTTO8oqvo="; }; - propagatedBuildInputs = []; + propagatedBuildInputs = [ + packaging + six + webencodings + ]; + doCheck = false; } diff --git a/python/cairocffi.nix b/python/cairocffi.nix deleted file mode 100644 index 93dada4..0000000 --- a/python/cairocffi.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - buildPythonPackage, - fetchPypi, -}: -buildPythonPackage rec { - pname = "cairocffi"; - version = "1.2.0"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-mpebUAxkyBef7ChvM36P5kTsovLNBYYM4LYtJfIuoUA="; - }; - propagatedBuildInputs = []; -} diff --git a/python/email-reply-parser.nix b/python/email-reply-parser.nix index bf465c6..34709c5 100644 --- a/python/email-reply-parser.nix +++ b/python/email-reply-parser.nix @@ -11,4 +11,5 @@ buildPythonPackage rec { sha256 = "sha256-nb8+ymmZCTIjTwnn9QqnN1ZXT8H4jojDJP7Bp0HuanQ="; }; propagatedBuildInputs = []; + doCheck = false; } diff --git a/python/frappe.nix b/python/frappe.nix index 38de8e1..84413ab 100644 --- a/python/frappe.nix +++ b/python/frappe.nix @@ -86,8 +86,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "akshaymankar"; repo = "frappe"; - rev = "38708ba7c1e3eb0efd74d2876b79f6b17d8818dc"; - sha256 = "sha256-eee6IS/Ep/DSDCPdnyrqBea/ag0kNnN5Id3YQMNz5js="; + rev = "d4d3cbc12d3e40f104500866a2bf468d128e2e32"; + sha256 = "sha256-+z/IeK3bFGYxnvWCR6GTgik25lSReJvRCbV7MsoUA/g="; }; propagatedBuildInputs = [ babel diff --git a/python/git-url-parse.nix b/python/git-url-parse.nix index 49a69d2..8a50f97 100644 --- a/python/git-url-parse.nix +++ b/python/git-url-parse.nix @@ -1,6 +1,6 @@ -{ - buildPythonPackage, - fetchPypi, +{ buildPythonPackage +, fetchPypi +, pbr }: buildPythonPackage rec { pname = "git-url-parse"; @@ -9,5 +9,6 @@ buildPythonPackage rec { inherit pname version; sha256 = "sha256-e19OOusdaTr+7mejvUrAY/cgbC6ORuVZ8NoNqYRF8Rc="; }; - propagatedBuildInputs = []; + propagatedBuildInputs = [pbr]; + doCheck = false; } diff --git a/python/maxminddb-geolite2.nix b/python/maxminddb-geolite2.nix index 573d0d6..ce5c651 100644 --- a/python/maxminddb-geolite2.nix +++ b/python/maxminddb-geolite2.nix @@ -1,6 +1,6 @@ -{ - buildPythonPackage, - fetchPypi, +{ buildPythonPackage +, fetchPypi +, maxminddb }: buildPythonPackage rec { pname = "maxminddb-geolite2"; @@ -9,5 +9,5 @@ buildPythonPackage rec { inherit pname version; sha256 = "sha256-K9EYxVZ/OoMj1sXaI6bm1Sz8Cc2Zh7VOtxLPYAGpbgM="; }; - propagatedBuildInputs = []; + propagatedBuildInputs = [maxminddb]; } diff --git a/python/posthog.nix b/python/posthog.nix index ac0aac5..3f99233 100644 --- a/python/posthog.nix +++ b/python/posthog.nix @@ -1,6 +1,9 @@ -{ - buildPythonPackage, - fetchPypi, +{ buildPythonPackage +, fetchPypi +, backoff +, monotonic +, python-dateutil +, requests }: buildPythonPackage rec { pname = "posthog"; @@ -9,5 +12,10 @@ buildPythonPackage rec { inherit pname version; sha256 = "sha256-V9J5H/V1LOVroPm7iHb688qSCPHCxs6utaJQTDRJN2c="; }; - propagatedBuildInputs = []; + propagatedBuildInputs = [ + backoff + monotonic + python-dateutil + requests + ]; } diff --git a/python/psycopg2-binary.nix b/python/psycopg2-binary.nix index 316e651..8632075 100644 --- a/python/psycopg2-binary.nix +++ b/python/psycopg2-binary.nix @@ -12,4 +12,5 @@ buildPythonPackage rec { }; nativeBuildInputs = [postgresql]; propagatedBuildInputs = []; + doCheck = false; } diff --git a/python/pypdf2.nix b/python/pypdf2.nix index a0178f6..0a318a8 100644 --- a/python/pypdf2.nix +++ b/python/pypdf2.nix @@ -3,11 +3,11 @@ fetchPypi, }: buildPythonPackage rec { - pname = "pypdf2"; + pname = "PyPDF2"; version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = ""; + sha256 = "sha256-Vy8TFLZDMGed1vtwN4H+M9Dyi1n7LP661efrntypJzg="; }; propagatedBuildInputs = []; } diff --git a/python/pypika.nix b/python/pypika.nix index 5d5d5d7..da81dc3 100644 --- a/python/pypika.nix +++ b/python/pypika.nix @@ -11,4 +11,5 @@ buildPythonPackage rec { sha256 = "sha256-g4g2phdH58g4DNG3/2OGlLenM1NF0PVZsEss2DKtU3g="; }; propagatedBuildInputs = []; + doCheck = false; } diff --git a/python/rauth.nix b/python/rauth.nix index 69ed094..fb2b7f1 100644 --- a/python/rauth.nix +++ b/python/rauth.nix @@ -1,6 +1,6 @@ -{ - buildPythonPackage, - fetchPypi, +{ buildPythonPackage +, fetchPypi +, requests }: buildPythonPackage rec { pname = "rauth"; @@ -9,5 +9,6 @@ buildPythonPackage rec { inherit pname version; sha256 = "sha256-UkzbwcKFYOrPyanUDFlSXrjQD98H+62GEH6iRBFHewo="; }; - propagatedBuildInputs = []; + propagatedBuildInputs = [requests]; + doCheck = false; } diff --git a/python/traceback-with-variables.nix b/python/traceback-with-variables.nix index bdbc6c2..f11fc2c 100644 --- a/python/traceback-with-variables.nix +++ b/python/traceback-with-variables.nix @@ -1,6 +1,5 @@ -{ - buildPythonPackage, - fetchPypi, +{ buildPythonPackage +, fetchPypi }: buildPythonPackage rec { pname = "traceback-with-variables"; @@ -10,4 +9,5 @@ buildPythonPackage rec { sha256 = "sha256-owx5t8IG+yVZZ/P10SXOEUs9rk/ZLSaPkB3TXuI/nMA="; }; propagatedBuildInputs = []; + doCheck = false; } diff --git a/python/weasyprint.nix b/python/weasyprint.nix deleted file mode 100644 index e86c4fc..0000000 --- a/python/weasyprint.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - buildPythonPackage, - fetchPypi, -}: -buildPythonPackage rec { - pname = "weasyprint"; - version = "52.5"; - src = fetchPypi { - pname = "WeasyPrint"; - inherit version; - sha256 = "sha256-s36gLXXKBLq9e+ytc0FCa+MyrlYNjwLWZL+h6a+xhIE="; - }; - propagatedBuildInputs = []; -}