From 4cdccdd91358bba6db986ee0eb74a3aee179a55c Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 14 Jan 2023 23:34:44 +0000 Subject: [PATCH] baserow/backend: initial pynixify --- nix/pkgs/baserow/backend/pynixify/overlay.nix | 142 ++++++------- .../packages/{drf-jwt => anyio}/default.nix | 11 +- .../pynixify/packages/autobahn/default.nix | 26 --- .../packages/baserow-backend/default.nix | 192 +++++++++++------- .../pynixify/packages/celery/default.nix | 7 +- .../pynixify/packages/certifi/default.nix | 6 +- .../default.nix | 9 +- .../pynixify/packages/daphne/default.nix | 2 +- .../djangorestframework-simplejwt/default.nix | 29 +++ .../packages/djangorestframework/default.nix | 25 +++ .../default.nix | 10 +- .../packages/importlib-resources/default.nix | 21 -- .../{attrs => incremental}/default.nix | 10 +- .../pynixify/packages/jsonschema/default.nix | 4 +- .../packages/{idna => oauthlib}/default.nix | 11 +- .../packages/{pyjwt => pillow}/default.nix | 8 +- .../packages/prompt-toolkit/default.nix | 27 --- .../{msgpack => psycopg2}/default.nix | 10 +- .../{pyparsing => python-crontab}/default.nix | 14 +- .../pynixify/packages/pytz/default.nix | 4 +- .../pynixify/packages/redis/default.nix | 25 +++ .../packages/{click => sqlparse}/default.nix | 6 +- .../pynixify/packages/tqdm/default.nix | 4 +- .../packages/typing-extensions/default.nix | 4 +- .../pynixify/packages/uvloop/default.nix | 23 --- .../pynixify/packages/watchgod/default.nix | 23 --- .../{urllib3 => websockets}/default.nix | 10 +- .../packages/{amqp => xmlschema}/default.nix | 14 +- 28 files changed, 344 insertions(+), 333 deletions(-) rename nix/pkgs/baserow/backend/pynixify/packages/{drf-jwt => anyio}/default.nix (55%) delete mode 100644 nix/pkgs/baserow/backend/pynixify/packages/autobahn/default.nix rename nix/pkgs/baserow/backend/pynixify/packages/{importlib-metadata => cryptography}/default.nix (66%) create mode 100644 nix/pkgs/baserow/backend/pynixify/packages/djangorestframework-simplejwt/default.nix create mode 100644 nix/pkgs/baserow/backend/pynixify/packages/djangorestframework/default.nix rename nix/pkgs/baserow/backend/pynixify/packages/{python-dotenv => elementpath}/default.nix (60%) delete mode 100644 nix/pkgs/baserow/backend/pynixify/packages/importlib-resources/default.nix rename nix/pkgs/baserow/backend/pynixify/packages/{attrs => incremental}/default.nix (61%) rename nix/pkgs/baserow/backend/pynixify/packages/{idna => oauthlib}/default.nix (58%) rename nix/pkgs/baserow/backend/pynixify/packages/{pyjwt => pillow}/default.nix (74%) delete mode 100644 nix/pkgs/baserow/backend/pynixify/packages/prompt-toolkit/default.nix rename nix/pkgs/baserow/backend/pynixify/packages/{msgpack => psycopg2}/default.nix (64%) rename nix/pkgs/baserow/backend/pynixify/packages/{pyparsing => python-crontab}/default.nix (52%) create mode 100644 nix/pkgs/baserow/backend/pynixify/packages/redis/default.nix rename nix/pkgs/baserow/backend/pynixify/packages/{click => sqlparse}/default.nix (77%) delete mode 100644 nix/pkgs/baserow/backend/pynixify/packages/uvloop/default.nix delete mode 100644 nix/pkgs/baserow/backend/pynixify/packages/watchgod/default.nix rename nix/pkgs/baserow/backend/pynixify/packages/{urllib3 => websockets}/default.nix (62%) rename nix/pkgs/baserow/backend/pynixify/packages/{amqp => xmlschema}/default.nix (51%) diff --git a/nix/pkgs/baserow/backend/pynixify/overlay.nix b/nix/pkgs/baserow/backend/pynixify/overlay.nix index f655e9c0d2..aca62bb386 100644 --- a/nix/pkgs/baserow/backend/pynixify/overlay.nix +++ b/nix/pkgs/baserow/backend/pynixify/overlay.nix @@ -1,102 +1,102 @@ self: super: { - baserow-backend = self.callPackage ./packages/baserow-backend { }; + django-timezone-field = self.callPackage ./packages/django-timezone-field { }; + + asgiref = self.callPackage ./packages/asgiref { }; + + incremental = self.callPackage ./packages/incremental { }; + + daphne = self.callPackage ./packages/daphne { }; + + channels-redis = self.callPackage ./packages/channels-redis { }; + + channels = self.callPackage ./packages/channels { }; aioredis = self.callPackage ./packages/aioredis { }; - amqp = self.callPackage ./packages/amqp { }; + anyio = self.callPackage ./packages/anyio { }; + + certifi = self.callPackage ./packages/certifi { }; + + baserow-backend = self.callPackage ./packages/baserow-backend { }; + + jsonschema = self.callPackage ./packages/jsonschema { }; + + requests = self.callPackage ./packages/requests { }; + + python-crontab = self.callPackage ./packages/python-crontab { }; + + drf-spectacular = self.callPackage ./packages/drf-spectacular { }; + + itsdangerous = self.callPackage ./packages/itsdangerous { }; + + s3transfer = self.callPackage ./packages/s3transfer { }; + + django-storages = self.callPackage ./packages/django-storages { }; + + django-cors-headers = self.callPackage ./packages/django-cors-headers { }; + + uvicorn = self.callPackage ./packages/uvicorn { }; + + tqdm = self.callPackage ./packages/tqdm { }; + + jmespath = self.callPackage ./packages/jmespath { }; + + celery = self.callPackage ./packages/celery { }; + + sqlparse = self.callPackage ./packages/sqlparse { }; + + dj-database-url = self.callPackage ./packages/dj-database-url { }; antlr4-python3-runtime = self.callPackage ./packages/antlr4-python3-runtime { }; - asgiref = self.callPackage ./packages/asgiref { }; - - attrs = self.callPackage ./packages/attrs { }; - - autobahn = self.callPackage ./packages/autobahn { }; - - billiard = self.callPackage ./packages/billiard { }; - - boto3 = self.callPackage ./packages/boto3 { }; - - botocore = self.callPackage ./packages/botocore { }; - - celery = self.callPackage ./packages/celery { }; - - certifi = self.callPackage ./packages/certifi { }; - - channels = self.callPackage ./packages/channels { }; - - channels-redis = self.callPackage ./packages/channels-redis { }; + elementpath = self.callPackage ./packages/elementpath { }; charset-normalizer = self.callPackage ./packages/charset-normalizer { }; - click = self.callPackage ./packages/click { }; + djangorestframework-simplejwt = + self.callPackage ./packages/djangorestframework-simplejwt { }; - daphne = self.callPackage ./packages/daphne { }; + billiard = self.callPackage ./packages/billiard { }; - dj-database-url = self.callPackage ./packages/dj-database-url { }; + oauthlib = self.callPackage ./packages/oauthlib { }; - django = self.callPackage ./packages/django { }; + psycopg2 = self.callPackage ./packages/psycopg2 { }; django-celery-beat = self.callPackage ./packages/django-celery-beat { }; - django-cors-headers = self.callPackage ./packages/django-cors-headers { }; - - django-storages = self.callPackage ./packages/django-storages { }; - - django-timezone-field = - self.callPackage ./packages/django-timezone-field { }; - - drf-jwt = self.callPackage ./packages/drf-jwt { }; - - drf-spectacular = self.callPackage ./packages/drf-spectacular { }; - - faker = self.callPackage ./packages/faker { }; + redis = self.callPackage ./packages/redis { }; httptools = self.callPackage ./packages/httptools { }; - idna = self.callPackage ./packages/idna { }; + twisted = self.callPackage ./packages/twisted { }; - importlib-metadata = self.callPackage ./packages/importlib-metadata { }; + typing-extensions = self.callPackage ./packages/typing-extensions { }; - importlib-resources = self.callPackage ./packages/importlib-resources { }; - - itsdangerous = self.callPackage ./packages/itsdangerous { }; - - jmespath = self.callPackage ./packages/jmespath { }; - - msgpack = self.callPackage ./packages/msgpack { }; - - prompt-toolkit = self.callPackage ./packages/prompt-toolkit { }; - - psutil = self.callPackage ./packages/psutil { }; - - pyjwt = self.callPackage ./packages/pyjwt { }; - - pyparsing = self.callPackage ./packages/pyparsing { }; - - python-dotenv = self.callPackage ./packages/python-dotenv { }; - - pytz = self.callPackage ./packages/pytz { }; + boto3 = self.callPackage ./packages/boto3 { }; regex = self.callPackage ./packages/regex { }; - requests = self.callPackage ./packages/requests { }; + djangorestframework = self.callPackage ./packages/djangorestframework { }; - s3transfer = self.callPackage ./packages/s3transfer { }; + xmlschema = self.callPackage ./packages/xmlschema { }; - tqdm = self.callPackage ./packages/tqdm { }; - - # twisted = self.callPackage ./packages/twisted { }; - - urllib3 = self.callPackage ./packages/urllib3 { }; - - uvicorn = self.callPackage ./packages/uvicorn { }; - - uvloop = self.callPackage ./packages/uvloop { }; - - watchgod = self.callPackage ./packages/watchgod { }; + django = self.callPackage ./packages/django { }; zipp = self.callPackage ./packages/zipp { }; + pytz = self.callPackage ./packages/pytz { }; + + faker = self.callPackage ./packages/faker { }; + + websockets = self.callPackage ./packages/websockets { }; + + cryptography = self.callPackage ./packages/cryptography { }; + + psutil = self.callPackage ./packages/psutil { }; + + botocore = self.callPackage ./packages/botocore { }; + + pillow = self.callPackage ./packages/pillow { }; + } diff --git a/nix/pkgs/baserow/backend/pynixify/packages/drf-jwt/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/anyio/default.nix similarity index 55% rename from nix/pkgs/baserow/backend/pynixify/packages/drf-jwt/default.nix rename to nix/pkgs/baserow/backend/pynixify/packages/anyio/default.nix index fb02592422..73fa64e012 100644 --- a/nix/pkgs/baserow/backend/pynixify/packages/drf-jwt/default.nix +++ b/nix/pkgs/baserow/backend/pynixify/packages/anyio/default.nix @@ -2,18 +2,19 @@ # If you run pynixify again, the file will be either overwritten or # deleted, and you will lose the changes you made to it. -{ buildPythonPackage, django, djangorestframework, fetchPypi, lib, pyjwt, cryptography }: +{ buildPythonPackage, fetchPypi, idna, lib, setuptools-scm, sniffio }: buildPythonPackage rec { - pname = "drf-jwt"; - version = "1.19.1"; + pname = "anyio"; + version = "3.6.1"; src = fetchPypi { inherit pname version; - sha256 = "0ih9rpmpga8kmn0ky9249v8xplhklsi83l5yc7ppalfky9hgg2c9"; + sha256 = "02yx5yczk50q133543salrjsg9ds8gpg69d9mr1f91iqz6axyfj1"; }; - propagatedBuildInputs = [ pyjwt django djangorestframework cryptography ]; + buildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ idna sniffio ]; # TODO FIXME doCheck = false; diff --git a/nix/pkgs/baserow/backend/pynixify/packages/autobahn/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/autobahn/default.nix deleted file mode 100644 index 8e270a931d..0000000000 --- a/nix/pkgs/baserow/backend/pynixify/packages/autobahn/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -# WARNING: This file was automatically generated. You should avoid editing it. -# If you run pynixify again, the file will be either overwritten or -# deleted, and you will lose the changes you made to it. - -{ buildPythonPackage, cryptography, fetchPypi, hyperlink, lib, setuptools, txaio -}: - -buildPythonPackage rec { - pname = "autobahn"; - version = "22.2.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "0zn1b0p1c8xm2g124sf4nf384pxpnr0awiixzqphbkda0b3g9qb0"; - }; - - propagatedBuildInputs = [ txaio cryptography hyperlink setuptools ]; - - # TODO FIXME - doCheck = false; - - meta = with lib; { - description = "WebSocket client & server library, WAMP real-time framework"; - homepage = "http://crossbar.io/autobahn"; - }; -} diff --git a/nix/pkgs/baserow/backend/pynixify/packages/baserow-backend/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/baserow-backend/default.nix index 14aa7765d8..30baf9a2aa 100644 --- a/nix/pkgs/baserow/backend/pynixify/packages/baserow-backend/default.nix +++ b/nix/pkgs/baserow/backend/pynixify/packages/baserow-backend/default.nix @@ -2,90 +2,140 @@ # If you run pynixify again, the file will be either overwritten or # deleted, and you will lose the changes you made to it. -{ buildPythonPackage -, lib - -, django -, django-cors-headers -, djangorestframework -, drf-jwt -, psycopg2 -, faker -, twisted -, gunicorn -, uvicorn -, websockets -, requests -, itsdangerous -, pillow -, drf-spectacular -, asgiref -, channels -, channels-redis -, celery -, django-redis -, django-celery-email -, advocate -, zipp -, unicodecsv -, django-celery-beat -, celery-redbeat -, service-identity -, regex -, cryptography -, antlr4-python3-runtime -, tqdm -, boto3 -, django-storages -, django-health-check -, psutil -, dj-database-url -, redis -}: +{ advocate, aioredis, amqp, antlr4-python3-runtime, anyio, asgiref +, async-timeout, attrs, autobahn, automat, billiard, boto3, botocore +, buildPythonPackage, celery, celery-redbeat, certifi, cffi, channels +, channels-redis, charset-normalizer, click, click-didyoumean, click-plugins +, click-repl, constantly, cryptography, daphne, dateutil, decorator, defusedxml +, deprecated, dj-database-url, django, django-appconf, django-celery-beat +, django-celery-email, django-cors-headers, django-health-check, django-redis +, django-storages, django-timezone-field, djangorestframework +, djangorestframework-simplejwt, drf-spectacular, elementpath, faker, fetchPypi +, gunicorn, h11, hiredis, httptools, hyperlink, idna, incremental, inflection +, itsdangerous, jmespath, jsonschema, kombu, lib, msgpack, ndg-httpsclient +, netifaces, oauthlib, packaging, pillow, prompt-toolkit, psutil, psycopg2 +, pyasn1, pyasn1-modules, pycparser, pyjwt, pyopenssl, pyparsing, pyrsistent +, pysaml2, python-crontab, python-dotenv, pytz, pyyaml, redis, regex, requests +, requests-oauthlib, s3transfer, service-identity, six, sniffio, sqlparse +, tenacity, text-unidecode, tqdm, twisted, txaio, typing-extensions, unicodecsv +, uritemplate, urllib3, uvicorn, uvloop, validators, vine, watchgod, wcwidth +, websockets, wrapt, xmlschema, zipp, zope_interface }: buildPythonPackage rec { pname = "baserow-backend"; - version = "1.12.1"; + version = "1.13.3"; src = lib.cleanSource ../../..; propagatedBuildInputs = [ - django - django-cors-headers - djangorestframework - drf-jwt - psycopg2 - faker - twisted - gunicorn - uvicorn - websockets - requests - itsdangerous - pillow - drf-spectacular + advocate + aioredis + amqp + antlr4-python3-runtime + anyio asgiref + async-timeout + attrs + autobahn + automat + billiard + boto3 + botocore + celery + celery-redbeat + certifi + cffi channels channels-redis - celery - django-redis - django-celery-email - advocate - zipp - unicodecsv - django-celery-beat - celery-redbeat - service-identity - regex + charset-normalizer + click + click-didyoumean + click-plugins + click-repl + constantly cryptography - antlr4-python3-runtime - tqdm - boto3 - django-storages - django-health-check - psutil + daphne + decorator + defusedxml + deprecated dj-database-url + django + django-appconf + django-celery-beat + django-celery-email + django-cors-headers + django-health-check + django-redis + django-storages + django-timezone-field + djangorestframework + djangorestframework-simplejwt + drf-spectacular + elementpath + faker + gunicorn + h11 + hiredis + httptools + hyperlink + idna + incremental + inflection + itsdangerous + jmespath + jsonschema + kombu + msgpack + ndg-httpsclient + netifaces + oauthlib + packaging + pillow + prompt-toolkit + psutil + psycopg2 + pyasn1 + pyasn1-modules + pycparser + pyjwt + pyopenssl + pyparsing + pyrsistent + pysaml2 + python-crontab + dateutil + python-dotenv + pytz + pyyaml redis + regex + requests + requests-oauthlib + s3transfer + service-identity + six + sniffio + sqlparse + tenacity + text-unidecode + tqdm + twisted + txaio + typing-extensions + unicodecsv + uritemplate + urllib3 + uvicorn + uvloop + validators + vine + watchgod + wcwidth + websockets + wrapt + xmlschema + zipp + zope_interface ]; # TODO FIXME diff --git a/nix/pkgs/baserow/backend/pynixify/packages/celery/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/celery/default.nix index 8e4a1f4bc0..4bc4665215 100644 --- a/nix/pkgs/baserow/backend/pynixify/packages/celery/default.nix +++ b/nix/pkgs/baserow/backend/pynixify/packages/celery/default.nix @@ -3,15 +3,15 @@ # deleted, and you will lose the changes you made to it. { billiard, buildPythonPackage, click, click-didyoumean, click-plugins -, click-repl, fetchPypi, kombu, lib, pytz, setuptools, vine }: +, click-repl, fetchPypi, kombu, lib, pytz, vine }: buildPythonPackage rec { pname = "celery"; - version = "5.2.7"; + version = "5.2.3"; src = fetchPypi { inherit pname version; - sha256 = "0vccjlakjm966gpfhjs47ni16573cahggs419w08l3yk6hlxiyzs"; + sha256 = "10mamnm08dzjnmc3098rqsaa3bgblv3d2wj65xm4yzfrg9k43kg2"; }; propagatedBuildInputs = [ @@ -23,7 +23,6 @@ buildPythonPackage rec { click-didyoumean click-repl click-plugins - setuptools ]; # TODO FIXME diff --git a/nix/pkgs/baserow/backend/pynixify/packages/certifi/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/certifi/default.nix index 400a1ddc14..826c41c937 100644 --- a/nix/pkgs/baserow/backend/pynixify/packages/certifi/default.nix +++ b/nix/pkgs/baserow/backend/pynixify/packages/certifi/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "certifi"; - version = "2021.10.8"; + version = "2022.9.24"; src = fetchPypi { inherit pname version; - sha256 = "0wl8ln7acd797i1q7mmb430l6hqwhmk4bd37x8ycw02b3my4x23q"; + sha256 = "056fpl8l6f8p4c087zj1yvsk87n2aff0vinv2abvm9p54h8n170d"; }; # TODO FIXME @@ -18,6 +18,6 @@ buildPythonPackage rec { meta = with lib; { description = "Python package for providing Mozilla's CA Bundle."; - homepage = "https://certifiio.readthedocs.io/en/latest/"; + homepage = "https://github.com/certifi/python-certifi"; }; } diff --git a/nix/pkgs/baserow/backend/pynixify/packages/importlib-metadata/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/cryptography/default.nix similarity index 66% rename from nix/pkgs/baserow/backend/pynixify/packages/importlib-metadata/default.nix rename to nix/pkgs/baserow/backend/pynixify/packages/cryptography/default.nix index 914affd030..1df3badc9c 100644 --- a/nix/pkgs/baserow/backend/pynixify/packages/importlib-metadata/default.nix +++ b/nix/pkgs/baserow/backend/pynixify/packages/cryptography/default.nix @@ -5,13 +5,12 @@ { buildPythonPackage, fetchPypi, lib }: buildPythonPackage rec { - pname = "importlib-metadata"; - version = "4.11.2"; + pname = "cryptography"; + version = "38.0.1"; src = fetchPypi { - inherit version; - pname = "importlib_metadata"; - sha256 = "1b76j57ppb30q8x5w5khg327pynlzwjnj7gidwprn4z3by9glvxk"; + inherit pname version; + sha256 = "1mrkmsq0hpgs3k38qqabp3knnf7cv6amchwngwqzlca9l43xicqx"; }; # TODO FIXME diff --git a/nix/pkgs/baserow/backend/pynixify/packages/daphne/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/daphne/default.nix index 6facfa4f3a..b3b944beaf 100644 --- a/nix/pkgs/baserow/backend/pynixify/packages/daphne/default.nix +++ b/nix/pkgs/baserow/backend/pynixify/packages/daphne/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; buildInputs = [ pytest-runner ]; - propagatedBuildInputs = [ twisted autobahn asgiref ] ++ twisted.optional-dependencies.tls; + propagatedBuildInputs = [ twisted autobahn asgiref ]; # TODO FIXME doCheck = false; diff --git a/nix/pkgs/baserow/backend/pynixify/packages/djangorestframework-simplejwt/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/djangorestframework-simplejwt/default.nix new file mode 100644 index 0000000000..575e137e53 --- /dev/null +++ b/nix/pkgs/baserow/backend/pynixify/packages/djangorestframework-simplejwt/default.nix @@ -0,0 +1,29 @@ +# WARNING: This file was automatically generated. You should avoid editing it. +# If you run pynixify again, the file will be either overwritten or +# deleted, and you will lose the changes you made to it. + +{ buildPythonPackage, django, djangorestframework, fetchPypi, lib, pyjwt +, setuptools-scm }: + +buildPythonPackage rec { + pname = "djangorestframework-simplejwt"; + version = "5.2.0"; + + src = fetchPypi { + inherit version; + pname = "djangorestframework_simplejwt"; + sha256 = "0x3sfpxv1kij2pxg12gkv3mfqb6m5diwq169g8fsv4bxnaphj2x6"; + }; + + buildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ django djangorestframework pyjwt ]; + + # TODO FIXME + doCheck = false; + + meta = with lib; { + description = + "A minimal JSON Web Token authentication plugin for Django REST Framework"; + homepage = "https://github.com/jazzband/djangorestframework-simplejwt"; + }; +} diff --git a/nix/pkgs/baserow/backend/pynixify/packages/djangorestframework/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/djangorestframework/default.nix new file mode 100644 index 0000000000..f64250ab4b --- /dev/null +++ b/nix/pkgs/baserow/backend/pynixify/packages/djangorestframework/default.nix @@ -0,0 +1,25 @@ +# WARNING: This file was automatically generated. You should avoid editing it. +# If you run pynixify again, the file will be either overwritten or +# deleted, and you will lose the changes you made to it. + +{ buildPythonPackage, django, fetchPypi, lib, pytz }: + +buildPythonPackage rec { + pname = "djangorestframework"; + version = "3.13.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1vpjq4mhkl1135c1ikxqrqpc1j88n0j69r56lbn6ik1sw9y40cqc"; + }; + + propagatedBuildInputs = [ django pytz ]; + + # TODO FIXME + doCheck = false; + + meta = with lib; { + description = "Web APIs for Django, made easy."; + homepage = "https://www.django-rest-framework.org/"; + }; +} diff --git a/nix/pkgs/baserow/backend/pynixify/packages/python-dotenv/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/elementpath/default.nix similarity index 60% rename from nix/pkgs/baserow/backend/pynixify/packages/python-dotenv/default.nix rename to nix/pkgs/baserow/backend/pynixify/packages/elementpath/default.nix index 2e5a67a1ef..d3ebe485b1 100644 --- a/nix/pkgs/baserow/backend/pynixify/packages/python-dotenv/default.nix +++ b/nix/pkgs/baserow/backend/pynixify/packages/elementpath/default.nix @@ -5,12 +5,12 @@ { buildPythonPackage, fetchPypi, lib }: buildPythonPackage rec { - pname = "python-dotenv"; - version = "0.19.2"; + pname = "elementpath"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - sha256 = "0pv5ygpr6syc6zkw21in4ysqs3k7qaxk9m1g5pzlafwm3silkpm5"; + sha256 = "03wl8rcyrqb1m0i8v1dp619c2k6fwq3ajhachxwlyd8gvi18g8fc"; }; # TODO FIXME @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = - "Read key-value pairs from a .env file and set them as environment variables"; - homepage = "https://github.com/theskumar/python-dotenv"; + "XPath 1.0/2.0/3.0 parsers and selectors for ElementTree and lxml"; + homepage = "https://github.com/sissaschool/elementpath"; }; } diff --git a/nix/pkgs/baserow/backend/pynixify/packages/importlib-resources/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/importlib-resources/default.nix deleted file mode 100644 index 880e3e5b0e..0000000000 --- a/nix/pkgs/baserow/backend/pynixify/packages/importlib-resources/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -# WARNING: This file was automatically generated. You should avoid editing it. -# If you run pynixify again, the file will be either overwritten or -# deleted, and you will lose the changes you made to it. - -{ buildPythonPackage, fetchPypi, lib }: - -buildPythonPackage rec { - pname = "importlib-resources"; - version = "5.4.0"; - - src = fetchPypi { - inherit version; - pname = "importlib_resources"; - sha256 = "0sshhwgs2n4jf4b3lam4f7lc5giv5ax1vcp0kfl2ppnlbpwf4mnp"; - }; - - # TODO FIXME - doCheck = false; - - meta = with lib; { }; -} diff --git a/nix/pkgs/baserow/backend/pynixify/packages/attrs/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/incremental/default.nix similarity index 61% rename from nix/pkgs/baserow/backend/pynixify/packages/attrs/default.nix rename to nix/pkgs/baserow/backend/pynixify/packages/incremental/default.nix index 66ca4a06f1..0da7556909 100644 --- a/nix/pkgs/baserow/backend/pynixify/packages/attrs/default.nix +++ b/nix/pkgs/baserow/backend/pynixify/packages/incremental/default.nix @@ -5,19 +5,19 @@ { buildPythonPackage, fetchPypi, lib }: buildPythonPackage rec { - pname = "attrs"; - version = "21.4.0"; + pname = "incremental"; + version = "21.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1zg2fvq1ddzmsm2mqi3j5nhl0k3w2c526xnzd7l9inqi88ishsv2"; + sha256 = "0mvgbmsnv1c8ziydw41jjkivc0zcqyzli7frcpvbkxj8zxddxx82"; }; # TODO FIXME doCheck = false; meta = with lib; { - description = "Classes Without Boilerplate"; - homepage = "https://www.attrs.org/"; + description = "A small library that versions your Python projects."; + homepage = "https://github.com/twisted/incremental"; }; } diff --git a/nix/pkgs/baserow/backend/pynixify/packages/jsonschema/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/jsonschema/default.nix index a14f535c80..957a26f918 100644 --- a/nix/pkgs/baserow/backend/pynixify/packages/jsonschema/default.nix +++ b/nix/pkgs/baserow/backend/pynixify/packages/jsonschema/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "jsonschema"; - version = "4.4.0"; + version = "4.16.0"; src = fetchPypi { inherit pname version; - sha256 = "10vs65awybd3i9l4z2w0k7nmjasl4sgi417y13b5wlxk87mr8rk3"; + sha256 = "08sbw5fn19vn8x7c216gkczyzd575702yx2vmqdrgxpgfvq5jl0n"; }; # TODO FIXME diff --git a/nix/pkgs/baserow/backend/pynixify/packages/idna/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/oauthlib/default.nix similarity index 58% rename from nix/pkgs/baserow/backend/pynixify/packages/idna/default.nix rename to nix/pkgs/baserow/backend/pynixify/packages/oauthlib/default.nix index d746b54ec1..c23439f0e4 100644 --- a/nix/pkgs/baserow/backend/pynixify/packages/idna/default.nix +++ b/nix/pkgs/baserow/backend/pynixify/packages/oauthlib/default.nix @@ -5,19 +5,20 @@ { buildPythonPackage, fetchPypi, lib }: buildPythonPackage rec { - pname = "idna"; - version = "3.3"; + pname = "oauthlib"; + version = "3.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0v8f6qjfi5i7qc5icsbv2pi24qy6k6m8wjqjvdf2sxjvlpq3yr4x"; + sha256 = "089pvahdgdwpka5n4p5awb86anmxhlm5xfjs7vpgcnvrf9rj6r8m"; }; # TODO FIXME doCheck = false; meta = with lib; { - description = "Internationalized Domain Names in Applications (IDNA)"; - homepage = "https://github.com/kjd/idna"; + description = + "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic"; + homepage = "https://github.com/oauthlib/oauthlib"; }; } diff --git a/nix/pkgs/baserow/backend/pynixify/packages/pyjwt/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/pillow/default.nix similarity index 74% rename from nix/pkgs/baserow/backend/pynixify/packages/pyjwt/default.nix rename to nix/pkgs/baserow/backend/pynixify/packages/pillow/default.nix index 786f37abb6..f7983bc3cf 100644 --- a/nix/pkgs/baserow/backend/pynixify/packages/pyjwt/default.nix +++ b/nix/pkgs/baserow/backend/pynixify/packages/pillow/default.nix @@ -5,13 +5,13 @@ { buildPythonPackage, fetchPypi, lib }: buildPythonPackage rec { - pname = "pyjwt"; - version = "2.3.0"; + pname = "pillow"; + version = "9.0.0"; src = fetchPypi { inherit version; - pname = "PyJWT"; - sha256 = "0hgfl0cdqrzywfg5wgjxfmsbwdy7d5736311fzbxrxh6dzav925q"; + pname = "Pillow"; + sha256 = "0gjry0yqryd2678sm47jhdnbghzxn5wk8pgyaqwr4qi7x5ijjvpf"; }; # TODO FIXME diff --git a/nix/pkgs/baserow/backend/pynixify/packages/prompt-toolkit/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/prompt-toolkit/default.nix deleted file mode 100644 index 78666bc45b..0000000000 --- a/nix/pkgs/baserow/backend/pynixify/packages/prompt-toolkit/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -# WARNING: This file was automatically generated. You should avoid editing it. -# If you run pynixify again, the file will be either overwritten or -# deleted, and you will lose the changes you made to it. - -{ buildPythonPackage, fetchPypi, lib, wcwidth }: - -buildPythonPackage rec { - pname = "prompt-toolkit"; - version = "3.0.28"; - - src = fetchPypi { - inherit version; - pname = "prompt_toolkit"; - sha256 = "0l0nnm9fvs8lklk2qq8mylb9jrlxvlqzpmqr4n7rdhl63rmx274z"; - }; - - propagatedBuildInputs = [ wcwidth ]; - - # TODO FIXME - doCheck = false; - - meta = with lib; { - description = - "Library for building powerful interactive command lines in Python"; - homepage = "https://github.com/prompt-toolkit/python-prompt-toolkit"; - }; -} diff --git a/nix/pkgs/baserow/backend/pynixify/packages/msgpack/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/psycopg2/default.nix similarity index 64% rename from nix/pkgs/baserow/backend/pynixify/packages/msgpack/default.nix rename to nix/pkgs/baserow/backend/pynixify/packages/psycopg2/default.nix index 72b8a63674..ece7930262 100644 --- a/nix/pkgs/baserow/backend/pynixify/packages/msgpack/default.nix +++ b/nix/pkgs/baserow/backend/pynixify/packages/psycopg2/default.nix @@ -5,19 +5,19 @@ { buildPythonPackage, fetchPypi, lib }: buildPythonPackage rec { - pname = "msgpack"; - version = "1.0.3"; + pname = "psycopg2"; + version = "2.9.1"; src = fetchPypi { inherit pname version; - sha256 = "07m84yisf8m6gr68ip9v6vzxax7kqbn8qxg7ir18clk1jgxwgzai"; + sha256 = "0z0v2d5gpgy0wf2ypqxv955c9k44yszd7r20km5s79yhy6k06lyy"; }; # TODO FIXME doCheck = false; meta = with lib; { - description = "MessagePack (de)serializer."; - homepage = "https://msgpack.org/"; + description = "psycopg2 - Python-PostgreSQL Database Adapter"; + homepage = "https://psycopg.org/"; }; } diff --git a/nix/pkgs/baserow/backend/pynixify/packages/pyparsing/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/python-crontab/default.nix similarity index 52% rename from nix/pkgs/baserow/backend/pynixify/packages/pyparsing/default.nix rename to nix/pkgs/baserow/backend/pynixify/packages/python-crontab/default.nix index 2e394a3a95..78f967a2a4 100644 --- a/nix/pkgs/baserow/backend/pynixify/packages/pyparsing/default.nix +++ b/nix/pkgs/baserow/backend/pynixify/packages/python-crontab/default.nix @@ -2,22 +2,24 @@ # If you run pynixify again, the file will be either overwritten or # deleted, and you will lose the changes you made to it. -{ buildPythonPackage, fetchPypi, lib }: +{ buildPythonPackage, dateutil, fetchPypi, lib }: buildPythonPackage rec { - pname = "pyparsing"; - version = "3.0.7"; + pname = "python-crontab"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "1siyxm70kws5fhszpl6h6w5vcg88c1j9acvp31ahq9sxfwi91vhq"; + sha256 = "06rg3jj0q70fpvmwmr4mgwg5brjl8z9rdqa3bda00cfw7ixfsd8y"; }; + propagatedBuildInputs = [ dateutil ]; + # TODO FIXME doCheck = false; meta = with lib; { - description = "Python parsing module"; - homepage = "https://github.com/pyparsing/pyparsing/"; + description = "Python Crontab API"; + homepage = "https://gitlab.com/doctormo/python-crontab/"; }; } diff --git a/nix/pkgs/baserow/backend/pynixify/packages/pytz/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/pytz/default.nix index d9df773288..f408f95c91 100644 --- a/nix/pkgs/baserow/backend/pynixify/packages/pytz/default.nix +++ b/nix/pkgs/baserow/backend/pynixify/packages/pytz/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pytz"; - version = "2021.3"; + version = "2022.4"; src = fetchPypi { inherit pname version; - sha256 = "09hk9zpxr26d7xgjfbq6ai1i1naybhlfkln9wka0gbx1425jvbdc"; + sha256 = "0x1ikf8cvymr22b42icnwwcncsa6fii9ndhf0aramy5nhffpkkj8"; }; # TODO FIXME diff --git a/nix/pkgs/baserow/backend/pynixify/packages/redis/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/redis/default.nix new file mode 100644 index 0000000000..59d8cf15f0 --- /dev/null +++ b/nix/pkgs/baserow/backend/pynixify/packages/redis/default.nix @@ -0,0 +1,25 @@ +# WARNING: This file was automatically generated. You should avoid editing it. +# If you run pynixify again, the file will be either overwritten or +# deleted, and you will lose the changes you made to it. + +{ buildPythonPackage, deprecated, fetchPypi, lib, packaging }: + +buildPythonPackage rec { + pname = "redis"; + version = "4.1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "01i3kb52irz3aspzs6djm49x9fx7am7y4cqp4s23zngxi7ghr6hx"; + }; + + propagatedBuildInputs = [ deprecated packaging ]; + + # TODO FIXME + doCheck = false; + + meta = with lib; { + description = "Python client for Redis database and key-value store"; + homepage = "https://github.com/redis/redis-py"; + }; +} diff --git a/nix/pkgs/baserow/backend/pynixify/packages/click/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/sqlparse/default.nix similarity index 77% rename from nix/pkgs/baserow/backend/pynixify/packages/click/default.nix rename to nix/pkgs/baserow/backend/pynixify/packages/sqlparse/default.nix index 1dd0921b26..c7266e96d2 100644 --- a/nix/pkgs/baserow/backend/pynixify/packages/click/default.nix +++ b/nix/pkgs/baserow/backend/pynixify/packages/sqlparse/default.nix @@ -5,12 +5,12 @@ { buildPythonPackage, fetchPypi, lib }: buildPythonPackage rec { - pname = "click"; - version = "8.0.4"; + pname = "sqlparse"; + version = "0.4.3"; src = fetchPypi { inherit pname version; - sha256 = "1nqa17zdd16fhiizziznx95ygkcxz4f3h8qfr4lb2pvw52qxfn44"; + sha256 = "0s3jyllg0ka0n7pgqfng1hzvh39li853dr40qcp4s4dv8r481jk9"; }; # TODO FIXME diff --git a/nix/pkgs/baserow/backend/pynixify/packages/tqdm/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/tqdm/default.nix index 5890b113b9..d89b253acd 100644 --- a/nix/pkgs/baserow/backend/pynixify/packages/tqdm/default.nix +++ b/nix/pkgs/baserow/backend/pynixify/packages/tqdm/default.nix @@ -2,7 +2,7 @@ # If you run pynixify again, the file will be either overwritten or # deleted, and you will lose the changes you made to it. -{ buildPythonPackage, fetchPypi, lib, setuptools, setuptools-scm }: +{ buildPythonPackage, fetchPypi, lib, setuptools-scm }: buildPythonPackage rec { pname = "tqdm"; @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "03cjj8jl8iybvfjbpvdql5qfslzfv043g7w6nx8rhv2h2xrdwnfk"; }; - buildInputs = [ setuptools setuptools-scm ]; + buildInputs = [ setuptools-scm ]; # TODO FIXME doCheck = false; diff --git a/nix/pkgs/baserow/backend/pynixify/packages/typing-extensions/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/typing-extensions/default.nix index f3452b8cdf..e4f08fe803 100644 --- a/nix/pkgs/baserow/backend/pynixify/packages/typing-extensions/default.nix +++ b/nix/pkgs/baserow/backend/pynixify/packages/typing-extensions/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "typing-extensions"; - version = "4.1.1"; + version = "4.4.0"; src = fetchPypi { inherit version; pname = "typing_extensions"; - sha256 = "0hndrnilvf88s8ggmflqnl5mhi78g6z1y9y0y6qpjyilqgf6550s"; + sha256 = "1al7634rq9zqw1s7d1nbry0l23c05s0wrc8jihcxvy1bp55l648m"; }; # TODO FIXME diff --git a/nix/pkgs/baserow/backend/pynixify/packages/uvloop/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/uvloop/default.nix deleted file mode 100644 index 85feea42c6..0000000000 --- a/nix/pkgs/baserow/backend/pynixify/packages/uvloop/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -# WARNING: This file was automatically generated. You should avoid editing it. -# If you run pynixify again, the file will be either overwritten or -# deleted, and you will lose the changes you made to it. - -{ buildPythonPackage, fetchPypi, lib }: - -buildPythonPackage rec { - pname = "uvloop"; - version = "0.16.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "0a0jzwrhkszknh14alflrp1db6dyjp7ph730f9yc5lb7gc6c4jzp"; - }; - - # TODO FIXME - doCheck = false; - - meta = with lib; { - description = "Fast implementation of asyncio event loop on top of libuv"; - homepage = "http://github.com/MagicStack/uvloop"; - }; -} diff --git a/nix/pkgs/baserow/backend/pynixify/packages/watchgod/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/watchgod/default.nix deleted file mode 100644 index e850c7180a..0000000000 --- a/nix/pkgs/baserow/backend/pynixify/packages/watchgod/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -# WARNING: This file was automatically generated. You should avoid editing it. -# If you run pynixify again, the file will be either overwritten or -# deleted, and you will lose the changes you made to it. - -{ buildPythonPackage, fetchPypi, lib }: - -buildPythonPackage rec { - pname = "watchgod"; - version = "0.7"; - - src = fetchPypi { - inherit pname version; - sha256 = "0aagm0n5fkpzdsfgl0r21gkz5qaicgq3f4rqz2fdvsgbn1i0s528"; - }; - - # TODO FIXME - doCheck = false; - - meta = with lib; { - description = "Simple, modern file watching and code reload in python."; - homepage = "https://github.com/samuelcolvin/watchgod"; - }; -} diff --git a/nix/pkgs/baserow/backend/pynixify/packages/urllib3/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/websockets/default.nix similarity index 62% rename from nix/pkgs/baserow/backend/pynixify/packages/urllib3/default.nix rename to nix/pkgs/baserow/backend/pynixify/packages/websockets/default.nix index ccb6c6ec83..283487efcd 100644 --- a/nix/pkgs/baserow/backend/pynixify/packages/urllib3/default.nix +++ b/nix/pkgs/baserow/backend/pynixify/packages/websockets/default.nix @@ -5,12 +5,12 @@ { buildPythonPackage, fetchPypi, lib }: buildPythonPackage rec { - pname = "urllib3"; - version = "1.26.8"; + pname = "websockets"; + version = "10.3"; src = fetchPypi { inherit pname version; - sha256 = "0g18xk7gfm88gr4bp3f58vgvsbzwps3sq2kqhv5xyz9ylvck6z0f"; + sha256 = "1x3g0rar8m3v0iyh89sb0n7l0b8f60qy98cb2dr71s68ff0cq1pw"; }; # TODO FIXME @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = - "HTTP library with thread-safe connection pooling, file post, and more."; - homepage = "https://urllib3.readthedocs.io/"; + "An implementation of the WebSocket Protocol (RFC 6455 & 7692)"; + homepage = "https://github.com/aaugustin/websockets"; }; } diff --git a/nix/pkgs/baserow/backend/pynixify/packages/amqp/default.nix b/nix/pkgs/baserow/backend/pynixify/packages/xmlschema/default.nix similarity index 51% rename from nix/pkgs/baserow/backend/pynixify/packages/amqp/default.nix rename to nix/pkgs/baserow/backend/pynixify/packages/xmlschema/default.nix index 119af39ecc..908924477f 100644 --- a/nix/pkgs/baserow/backend/pynixify/packages/amqp/default.nix +++ b/nix/pkgs/baserow/backend/pynixify/packages/xmlschema/default.nix @@ -2,24 +2,24 @@ # If you run pynixify again, the file will be either overwritten or # deleted, and you will lose the changes you made to it. -{ buildPythonPackage, fetchPypi, lib, vine }: +{ buildPythonPackage, elementpath, fetchPypi, lib }: buildPythonPackage rec { - pname = "amqp"; - version = "5.1.0"; + pname = "xmlschema"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1vgb07k4hm56sy75fmhj2r40v0skqfqsmz2g8byylb5wis53wss4"; + sha256 = "1915njkbzk5kmk95g1vg7jmpgi46f2110wdbjci2mvqdbqq0rxz7"; }; - propagatedBuildInputs = [ vine ]; + propagatedBuildInputs = [ elementpath ]; # TODO FIXME doCheck = false; meta = with lib; { - description = "Low-level AMQP client for Python (fork of amqplib)."; - homepage = "http://github.com/celery/py-amqp"; + description = "An XML Schema validator and decoder"; + homepage = "https://github.com/sissaschool/xmlschema"; }; }