nix/pkgs/baserow: bump to 1.12.1

nix/pkgs/baserow/backend/pynixify/overlay.nix

@@ -1,42 +1,104 @@
 self: super: {
   baserow-backend = self.callPackage ./packages/baserow-backend { };
 
-  django-cors-headers = self.callPackage ./packages/django-cors-headers { };
+  aioredis = self.callPackage ./packages/aioredis { };
 
-  djangorestframework = self.callPackage ./packages/djangorestframework { };
+  amqp = self.callPackage ./packages/amqp { };
 
-  uvicorn = self.callPackage ./packages/uvicorn { };
+  antlr4-python3-runtime =
+    self.callPackage ./packages/antlr4-python3-runtime { };
 
-  django-mjml = self.callPackage ./packages/django-mjml { };
+  asgiref = self.callPackage ./packages/asgiref { };
 
-  drf-spectacular = self.callPackage ./packages/drf-spectacular { };
+  attrs = self.callPackage ./packages/attrs { };
 
-  django-celery-email = self.callPackage ./packages/django-celery-email { };
+  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 { };
 
-  django-celery-beat = self.callPackage ./packages/django-celery-beat { };
+  charset-normalizer = self.callPackage ./packages/charset-normalizer { };
+
+  click = self.callPackage ./packages/click { };
+
+  daphne = self.callPackage ./packages/daphne { };
+
+  dj-database-url = self.callPackage ./packages/dj-database-url { };
 
   django = self.callPackage ./packages/django { };
 
+  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 { };
 
-  advocate = self.callPackage ./packages/advocate { };
+  httptools = self.callPackage ./packages/httptools { };
 
-  celery-redbeat = self.callPackage ./packages/celery-redbeat { };
+  idna = self.callPackage ./packages/idna { };
 
-  aioredis = self.callPackage ./packages/aioredis { };
+  importlib-metadata = self.callPackage ./packages/importlib-metadata { };
 
-  django-timezone-field = self.callPackage ./packages/django-timezone-field { };
+  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 { };
+
+  redis = self.callPackage ./packages/redis { };
 
   regex = self.callPackage ./packages/regex { };
 
-  moto = super.moto.overridePythonAttrs {
-    doCheck = false;
-  };
+  requests = self.callPackage ./packages/requests { };
 
-  eth-account = null;
-  eth-keyfile = null;
-  eth-keys = null;
+  s3transfer = self.callPackage ./packages/s3transfer { };
+
+  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 { };
+
+  zipp = self.callPackage ./packages/zipp { };
 
 }

nix/pkgs/baserow/backend/pynixify/packages/advocate/default.nix

@@ -1,28 +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, ndg-httpsclient, netifaces, pyasn1
-, pyopenssl, requests, six, urllib3 }:
-
-buildPythonPackage rec {
-  pname = "advocate";
-  version = "1.0.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0g9mbalg0hz74ciiaymg1sml0x819rcrqcl0cncpjhik8471gw8v";
-  };
-
-  propagatedBuildInputs =
-    [ requests urllib3 six pyasn1 pyopenssl ndg-httpsclient netifaces ];
-
-  # TODO FIXME
-  doCheck = false;
-
-  meta = with lib; {
-    description =
-      "A wrapper around the requests library for safely making HTTP requests on behalf of a third party";
-    homepage = "https://github.com/JordanMilne/Advocate";
-  };
-}

nix/pkgs/baserow/backend/pynixify/packages/amqp/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, fetchPypi, lib, vine }:
+
+buildPythonPackage rec {
+  pname = "amqp";
+  version = "5.1.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1vgb07k4hm56sy75fmhj2r40v0skqfqsmz2g8byylb5wis53wss4";
+  };
+
+  propagatedBuildInputs = [ vine ];
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Low-level AMQP client for Python (fork of amqplib).";
+    homepage = "http://github.com/celery/py-amqp";
+  };
+}

nix/pkgs/baserow/backend/pynixify/packages/antlr4-python3-runtime/default.nix

@@ -0,0 +1,23 @@
+# 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 = "antlr4-python3-runtime";
+  version = "4.9.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "06w8fz73rk8vzjz9rydfk56g4mbqpyl81yhypc14jab886dlc97j";
+  };
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; {
+    description = "ANTLR 4.9.3 runtime for Python 3.7";
+    homepage = "http://www.antlr.org";
+  };
+}

nix/pkgs/baserow/backend/pynixify/packages/asgiref/default.nix

@@ -0,0 +1,20 @@
+# 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 = "asgiref";
+  version = "3.4.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1saqgpgbdvb8awzm0f0640j0im55hkrfzvcw683cgqw4ni3apwaf";
+  };
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; { };
+}

nix/pkgs/baserow/backend/pynixify/packages/attrs/default.nix

@@ -0,0 +1,23 @@
+# 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 = "attrs";
+  version = "21.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1zg2fvq1ddzmsm2mqi3j5nhl0k3w2c526xnzd7l9inqi88ishsv2";
+  };
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Classes Without Boilerplate";
+    homepage = "https://www.attrs.org/";
+  };
+}

nix/pkgs/baserow/backend/pynixify/packages/autobahn/default.nix

@@ -0,0 +1,26 @@
+# 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";
+  };
+}

nix/pkgs/baserow/backend/pynixify/packages/baserow-backend/default.nix

@@ -2,16 +2,50 @@
 # If you run pynixify again, the file will be either overwritten or
 # deleted, and you will lose the changes you made to it.
 
-{ advocate, antlr4-python3-runtime, asgiref, buildPythonPackage, celery
-, celery-redbeat, channels, channels-redis, click, cryptography, django
-, django-celery-beat, django-celery-email, django-cors-headers, django-mjml
-, djangorestframework, drf-jwt, drf-spectacular, faker, fetchPypi, gunicorn
-, itsdangerous, lib, pillow, psycopg2, regex, requests, service-identity
-, twisted, unicodecsv, uvicorn, zipp }:
+{ 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
+}:
 
 buildPythonPackage rec {
   pname = "baserow-backend";
-  version = "1.7.1";
+  version = "1.12.1";
 
   src = lib.cleanSource ../../..;
 
@@ -25,15 +59,16 @@ buildPythonPackage rec {
     twisted
     gunicorn
     uvicorn
-    django-mjml
+    websockets
     requests
     itsdangerous
-    drf-spectacular
     pillow
+    drf-spectacular
     asgiref
     channels
     channels-redis
     celery
+    django-redis
     django-celery-email
     advocate
     zipp
@@ -42,9 +77,15 @@ buildPythonPackage rec {
     celery-redbeat
     service-identity
     regex
-    click
     cryptography
     antlr4-python3-runtime
+    tqdm
+    boto3
+    django-storages
+    django-health-check
+    psutil
+    dj-database-url
+    redis
   ];
 
   # TODO FIXME

nix/pkgs/baserow/backend/pynixify/packages/billiard/default.nix

@@ -0,0 +1,23 @@
+# 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 = "billiard";
+  version = "3.6.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ismj2p8c66ykpss94rs0bfra5agxxmljz8r3gaq79r8valfb799";
+  };
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Python multiprocessing fork with improvements and bugfixes";
+    homepage = "https://github.com/celery/billiard";
+  };
+}

nix/pkgs/baserow/backend/pynixify/packages/boto3/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.
+
+{ botocore, buildPythonPackage, fetchPypi, jmespath, lib, s3transfer }:
+
+buildPythonPackage rec {
+  pname = "boto3";
+  version = "1.20.38";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0qagparxji4s76sm82radc6z7q1k60gm8z0qvawiqscqik9ydspd";
+  };
+
+  propagatedBuildInputs = [ botocore jmespath s3transfer ];
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; {
+    description = "The AWS SDK for Python";
+    homepage = "https://github.com/boto/boto3";
+  };
+}

nix/pkgs/baserow/backend/pynixify/packages/botocore/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, dateutil, fetchPypi, jmespath, lib, urllib3 }:
+
+buildPythonPackage rec {
+  pname = "botocore";
+  version = "1.23.54";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1sqwl2q37prv07rnf1jmn93571mn5lzbqj90c2igbrffrhbbmfab";
+  };
+
+  propagatedBuildInputs = [ jmespath dateutil urllib3 ];
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Low-level, data-driven core of boto 3.";
+    homepage = "https://github.com/boto/botocore";
+  };
+}

nix/pkgs/baserow/backend/pynixify/packages/celery-redbeat/default.nix

@@ -1,25 +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, celery, python-dateutil, fetchPypi, lib, redis, tenacity }:
-
-buildPythonPackage rec {
-  pname = "celery-redbeat";
-  version = "2.0.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "030r39cmn2lfm1ysyvnya0ys63sfqwlk130qsdnndwjxpr0nk3fb";
-  };
-
-  propagatedBuildInputs = [ redis celery python-dateutil tenacity ];
-
-  # TODO FIXME
-  doCheck = false;
-
-  meta = with lib; {
-    description = "A Celery Beat Scheduler using Redis for persistent storage";
-    homepage = "https://github.com/sibson/redbeat";
-  };
-}

nix/pkgs/baserow/backend/pynixify/packages/celery/default.nix

@@ -0,0 +1,36 @@
+# 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.
+
+{ billiard, buildPythonPackage, click, click-didyoumean, click-plugins
+, click-repl, fetchPypi, kombu, lib, pytz, setuptools, vine }:
+
+buildPythonPackage rec {
+  pname = "celery";
+  version = "5.2.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0vccjlakjm966gpfhjs47ni16573cahggs419w08l3yk6hlxiyzs";
+  };
+
+  propagatedBuildInputs = [
+    pytz
+    billiard
+    kombu
+    vine
+    click
+    click-didyoumean
+    click-repl
+    click-plugins
+    setuptools
+  ];
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Distributed Task Queue.";
+    homepage = "http://celeryproject.org";
+  };
+}

nix/pkgs/baserow/backend/pynixify/packages/certifi/default.nix

@@ -0,0 +1,23 @@
+# 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 = "certifi";
+  version = "2021.10.8";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0wl8ln7acd797i1q7mmb430l6hqwhmk4bd37x8ycw02b3my4x23q";
+  };
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Python package for providing Mozilla's CA Bundle.";
+    homepage = "https://certifiio.readthedocs.io/en/latest/";
+  };
+}

nix/pkgs/baserow/backend/pynixify/packages/channels/default.nix

@@ -0,0 +1,26 @@
+# 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.
+
+{ asgiref, buildPythonPackage, daphne, django, fetchPypi, lib }:
+
+buildPythonPackage rec {
+  pname = "channels";
+  version = "3.0.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0xcbpfisgawqa34ccgz56wzid0ycp3c8wjcppmz8sgd2hx4skngx";
+  };
+
+  propagatedBuildInputs = [ django asgiref daphne ];
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; {
+    description =
+      "Brings async, event-driven capabilities to Django. Django 2.2 and up only.";
+    homepage = "http://github.com/django/channels";
+  };
+}

nix/pkgs/baserow/backend/pynixify/packages/charset-normalizer/default.nix

@@ -0,0 +1,24 @@
+# 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 = "charset-normalizer";
+  version = "2.0.12";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "15r5hf9p6v7s3h3zplz6dvwrg9ni942j78vwrm1bhkfky2gy4mr8";
+  };
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; {
+    description =
+      "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet.";
+    homepage = "https://github.com/ousret/charset_normalizer";
+  };
+}

nix/pkgs/baserow/backend/pynixify/packages/click/default.nix

@@ -0,0 +1,20 @@
+# 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 = "click";
+  version = "8.0.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1nqa17zdd16fhiizziznx95ygkcxz4f3h8qfr4lb2pvw52qxfn44";
+  };
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; { };
+}

nix/pkgs/baserow/backend/pynixify/packages/daphne/default.nix

@@ -0,0 +1,27 @@
+# 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.
+
+{ asgiref, autobahn, buildPythonPackage, fetchPypi, lib, pytest-runner, twisted
+}:
+
+buildPythonPackage rec {
+  pname = "daphne";
+  version = "3.0.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "17z9w18ffi3mchyqg937h5w08q742fklzhcnd6s6dam3df8sxzvn";
+  };
+
+  buildInputs = [ pytest-runner ];
+  propagatedBuildInputs = [ twisted autobahn asgiref ] ++ twisted.optional-dependencies.tls;
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Django ASGI (HTTP/WebSocket) server";
+    homepage = "https://github.com/django/daphne";
+  };
+}

nix/pkgs/baserow/backend/pynixify/packages/dj-database-url/default.nix

@@ -0,0 +1,23 @@
+# 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 = "dj-database-url";
+  version = "0.5.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0qs16g5y3lflxibsl8gwkwap21crhmmv98l60rdq6x1wawgypsja";
+  };
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Use Database URLs in your Django Application.";
+    homepage = "https://github.com/kennethreitz/dj-database-url";
+  };
+}

nix/pkgs/baserow/backend/pynixify/packages/django-celery-email/default.nix

@@ -1,25 +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, celery, django, django_appconf, fetchPypi, lib }:
-
-buildPythonPackage rec {
-  pname = "django-celery-email";
-  version = "3.0.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1klfl4y90rfv5dd3h77xgxm9jjhax5n2197zl2wc6b4mh2xcnijm";
-  };
-
-  propagatedBuildInputs = [ django celery django_appconf ];
-
-  # TODO FIXME
-  doCheck = false;
-
-  meta = with lib; {
-    description = "An async Django email backend using celery";
-    homepage = "https://github.com/pmclanahan/django-celery-email";
-  };
-}

nix/pkgs/baserow/backend/pynixify/packages/django-storages/default.nix

@@ -5,12 +5,12 @@
 { buildPythonPackage, django, fetchPypi, lib }:
 
 buildPythonPackage rec {
-  pname = "django-mjml";
-  version = "0.11.0";
+  pname = "django-storages";
+  version = "1.12.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1vzpd93ab7lfjyw9v90k8lynh2x735xf9ygkk5cz406y2q93jywd";
+    sha256 = "1rx5s9shap2qppanx59k10kif0fmxi8sf6c9aiz4yk7hy2rfsxd4";
   };
 
   propagatedBuildInputs = [ django ];
@@ -18,8 +18,5 @@ buildPythonPackage rec {
   # TODO FIXME
   doCheck = false;
 
-  meta = with lib; {
-    description = "Use MJML in Django templates";
-    homepage = "https://github.com/liminspace/django-mjml";
-  };
+  meta = with lib; { };
 }

nix/pkgs/baserow/backend/pynixify/packages/django-timezone-field/default.nix

@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "django-timezone-field";
-  version = "4.2.1";
+  version = "4.2.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0wg97zp5sldd0w908m5mia9544vwm5fbansimsa51aldcpg0qy4p";
+    sha256 = "1y4ji0ifslhj1l9m9wrqnnj85qbv5g1y9ryk8y4fyarq969bvmax";
   };
 
   propagatedBuildInputs = [ django pytz ];

nix/pkgs/baserow/backend/pynixify/packages/django/default.nix

@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "django";
-  version = "3.2.6";
+  version = "3.2.13";
 
   src = fetchPypi {
     inherit version;
     pname = "Django";
-    sha256 = "08p0gf1n548fjba76wspcj1jb3li6lr7xi87w2xq7hylr528azzj";
+    sha256 = "1dn4irl4m21skcqb2mbj55vgryqfqk6wqa8s1c7bmxlv19x4k4vd";
   };
 
   propagatedBuildInputs = [ asgiref pytz sqlparse ];

nix/pkgs/baserow/backend/pynixify/packages/drf-jwt/default.nix

@@ -0,0 +1,22 @@
+# 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, cryptography }:
+
+buildPythonPackage rec {
+  pname = "drf-jwt";
+  version = "1.19.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ih9rpmpga8kmn0ky9249v8xplhklsi83l5yc7ppalfky9hgg2c9";
+  };
+
+  propagatedBuildInputs = [ pyjwt django djangorestframework cryptography ];
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; { };
+}

nix/pkgs/baserow/backend/pynixify/packages/drf-spectacular/default.nix

@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "drf-spectacular";
-  version = "0.13.1";
+  version = "0.21.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "12n39sq5abb93z8lsmcpg0p9kb5zc3nr7y5n690svf0grlgilw2k";
+    sha256 = "0x97m8sf7jg5vk3x3dl49niqy311f33ljq4h2jxf2qsvb747hyma";
   };
 
   propagatedBuildInputs =

nix/pkgs/baserow/backend/pynixify/packages/faker/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, python-dateutil, fetchPypi, lib, text-unidecode }:
+{ buildPythonPackage, dateutil, fetchPypi, lib, text-unidecode }:
 
 buildPythonPackage rec {
   pname = "faker";
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     sha256 = "14bqdb7wngxlr9n25syab6i7dr9xjkxlq0wy31aar8yxlffixs5r";
   };
 
-  propagatedBuildInputs = [ python-dateutil text-unidecode ];
+  propagatedBuildInputs = [ dateutil text-unidecode ];
 
   # TODO FIXME
   doCheck = false;

nix/pkgs/baserow/backend/pynixify/packages/httptools/default.nix

@@ -0,0 +1,23 @@
+# 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 = "httptools";
+  version = "0.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "180y8yrn6wcph4i6if6n34805ijd8y4kvc0aadx2sranpqk50l4l";
+  };
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; {
+    description = "A collection of framework independent HTTP protocol utils.";
+    homepage = "https://github.com/MagicStack/httptools";
+  };
+}

nix/pkgs/baserow/backend/pynixify/packages/idna/default.nix

@@ -0,0 +1,23 @@
+# 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 = "idna";
+  version = "3.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0v8f6qjfi5i7qc5icsbv2pi24qy6k6m8wjqjvdf2sxjvlpq3yr4x";
+  };
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Internationalized Domain Names in Applications (IDNA)";
+    homepage = "https://github.com/kjd/idna";
+  };
+}

nix/pkgs/baserow/backend/pynixify/packages/importlib-metadata/default.nix

@@ -0,0 +1,21 @@
+# 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-metadata";
+  version = "4.11.2";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "importlib_metadata";
+    sha256 = "1b76j57ppb30q8x5w5khg327pynlzwjnj7gidwprn4z3by9glvxk";
+  };
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; { };
+}

nix/pkgs/baserow/backend/pynixify/packages/importlib-resources/default.nix

@@ -0,0 +1,21 @@
+# 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; { };
+}

nix/pkgs/baserow/backend/pynixify/packages/itsdangerous/default.nix

@@ -0,0 +1,20 @@
+# 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 = "itsdangerous";
+  version = "2.0.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1w6gfb2zhbcmrfj6digwzw1z68w6zg1q87rm6la2m412zil4swly";
+  };
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; { };
+}

nix/pkgs/baserow/backend/pynixify/packages/jmespath/default.nix

@@ -0,0 +1,23 @@
+# 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 = "jmespath";
+  version = "0.10.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1yflbqggg1z9ndw9ps771hy36d07j9l2wwbj66lljqb6p1khapdq";
+  };
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; {
+    description = "JSON Matching Expressions";
+    homepage = "https://github.com/jmespath/jmespath.py";
+  };
+}

nix/pkgs/baserow/backend/pynixify/packages/jsonschema/default.nix

@@ -0,0 +1,20 @@
+# 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 = "jsonschema";
+  version = "4.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "10vs65awybd3i9l4z2w0k7nmjasl4sgi417y13b5wlxk87mr8rk3";
+  };
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; { };
+}

nix/pkgs/baserow/backend/pynixify/packages/msgpack/default.nix

@@ -0,0 +1,23 @@
+# 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 = "msgpack";
+  version = "1.0.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "07m84yisf8m6gr68ip9v6vzxax7kqbn8qxg7ir18clk1jgxwgzai";
+  };
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; {
+    description = "MessagePack (de)serializer.";
+    homepage = "https://msgpack.org/";
+  };
+}

nix/pkgs/baserow/backend/pynixify/packages/prompt-toolkit/default.nix

@@ -0,0 +1,27 @@
+# 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";
+  };
+}

nix/pkgs/baserow/backend/pynixify/packages/psutil/default.nix

@@ -0,0 +1,24 @@
+# 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 = "psutil";
+  version = "5.9.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "09fa4vfhansixvxd3lv664xcrbnfdyfn53hm2wr0rf3bsvdl5646";
+  };
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; {
+    description =
+      "Cross-platform lib for process and system monitoring in Python.";
+    homepage = "https://github.com/giampaolo/psutil";
+  };
+}

nix/pkgs/baserow/backend/pynixify/packages/pyjwt/default.nix

@@ -0,0 +1,21 @@
+# 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 = "pyjwt";
+  version = "2.3.0";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "PyJWT";
+    sha256 = "0hgfl0cdqrzywfg5wgjxfmsbwdy7d5736311fzbxrxh6dzav925q";
+  };
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; { };
+}

nix/pkgs/baserow/backend/pynixify/packages/pyparsing/default.nix

@@ -0,0 +1,23 @@
+# 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 = "pyparsing";
+  version = "3.0.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1siyxm70kws5fhszpl6h6w5vcg88c1j9acvp31ahq9sxfwi91vhq";
+  };
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Python parsing module";
+    homepage = "https://github.com/pyparsing/pyparsing/";
+  };
+}

nix/pkgs/baserow/backend/pynixify/packages/python-dotenv/default.nix

@@ -0,0 +1,24 @@
+# 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 = "python-dotenv";
+  version = "0.19.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0pv5ygpr6syc6zkw21in4ysqs3k7qaxk9m1g5pzlafwm3silkpm5";
+  };
+
+  # TODO FIXME
+  doCheck = false;
+
+  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";
+  };
+}

nix/pkgs/baserow/backend/pynixify/packages/pytz/default.nix

@@ -0,0 +1,23 @@
+# 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 = "pytz";
+  version = "2021.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "09hk9zpxr26d7xgjfbq6ai1i1naybhlfkln9wka0gbx1425jvbdc";
+  };
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; {
+    description = "World timezone definitions, modern and historical";
+    homepage = "http://pythonhosted.org/pytz";
+  };
+}

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";
+  };
+}

nix/pkgs/baserow/backend/pynixify/packages/requests/default.nix

@@ -0,0 +1,26 @@
+# 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, certifi, charset-normalizer, fetchPypi, idna, lib, urllib3
+}:
+
+buildPythonPackage rec {
+  pname = "requests";
+  version = "2.26.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "19q73fq7hip7b74fwls3p9x6zwvfwqcwpn6kha3zsgvrrzw5iamq";
+  };
+
+  propagatedBuildInputs = [ charset-normalizer idna urllib3 certifi ];
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Python HTTP for Humans.";
+    homepage = "https://requests.readthedocs.io";
+  };
+}

nix/pkgs/baserow/backend/pynixify/packages/s3transfer/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.
+
+{ botocore, buildPythonPackage, fetchPypi, lib }:
+
+buildPythonPackage rec {
+  pname = "s3transfer";
+  version = "0.5.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1vcqvghiyxxqibcqqqpdia40ij3896l617hbzgsaamz69hcqricm";
+  };
+
+  propagatedBuildInputs = [ botocore ];
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; {
+    description = "An Amazon S3 Transfer Manager";
+    homepage = "https://github.com/boto/s3transfer";
+  };
+}

nix/pkgs/baserow/backend/pynixify/packages/tqdm/default.nix

@@ -0,0 +1,22 @@
+# 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, setuptools, setuptools-scm }:
+
+buildPythonPackage rec {
+  pname = "tqdm";
+  version = "4.62.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "03cjj8jl8iybvfjbpvdql5qfslzfv043g7w6nx8rhv2h2xrdwnfk";
+  };
+
+  buildInputs = [ setuptools setuptools-scm ];
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; { };
+}

nix/pkgs/baserow/backend/pynixify/packages/twisted/default.nix

@@ -0,0 +1,32 @@
+# 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.
+
+{ attrs, automat, buildPythonPackage, constantly, fetchPypi, hyperlink
+, incremental, lib, typing-extensions, zope_interface }:
+
+buildPythonPackage rec {
+  pname = "twisted";
+  version = "22.1.0";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "Twisted";
+    sha256 = "0qbvsrwkjdyf61s6iph9z7akdmpsgcfp58xivkhq03svh34ix5xp";
+  };
+
+  propagatedBuildInputs = [
+    zope_interface
+    constantly
+    incremental
+    automat
+    hyperlink
+    attrs
+    typing-extensions
+  ];
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; { };
+}

nix/pkgs/baserow/backend/pynixify/packages/typing-extensions/default.nix

@@ -0,0 +1,21 @@
+# 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 = "typing-extensions";
+  version = "4.1.1";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "typing_extensions";
+    sha256 = "0hndrnilvf88s8ggmflqnl5mhi78g6z1y9y0y6qpjyilqgf6550s";
+  };
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; { };
+}

nix/pkgs/baserow/backend/pynixify/packages/urllib3/default.nix

@@ -0,0 +1,24 @@
+# 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 = "urllib3";
+  version = "1.26.8";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0g18xk7gfm88gr4bp3f58vgvsbzwps3sq2kqhv5xyz9ylvck6z0f";
+  };
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; {
+    description =
+      "HTTP library with thread-safe connection pooling, file post, and more.";
+    homepage = "https://urllib3.readthedocs.io/";
+  };
+}

nix/pkgs/baserow/backend/pynixify/packages/uvicorn/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.
 
-{ asgiref, buildPythonPackage, click, fetchPypi, h11, lib, websockets, httptools, uvloop, watchgod, python-dotenv, pyyaml }:
+{ asgiref, buildPythonPackage, click, fetchPypi, h11, lib }:
 
 buildPythonPackage rec {
   pname = "uvicorn";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
     sha256 = "1zyana0yf3m8xkm8ihk7m19wv56gnj1jc61mwb9jhrx83kfw18yr";
   };
 
-  propagatedBuildInputs = [ asgiref click h11 websockets httptools uvloop watchgod python-dotenv pyyaml ];
+  propagatedBuildInputs = [ asgiref click h11 ];
 
   # TODO FIXME
   doCheck = false;

nix/pkgs/baserow/backend/pynixify/packages/uvloop/default.nix

@@ -2,24 +2,22 @@
 # 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 }:
+{ buildPythonPackage, fetchPypi, lib }:
 
 buildPythonPackage rec {
-  pname = "djangorestframework";
-  version = "3.12.4";
+  pname = "uvloop";
+  version = "0.16.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1wm7q3vp4226n6fhjnkjxg6pgh95p6ag238rg7l7dj6sind98izp";
+    sha256 = "0a0jzwrhkszknh14alflrp1db6dyjp7ph730f9yc5lb7gc6c4jzp";
   };
 
-  propagatedBuildInputs = [ django ];
-
   # TODO FIXME
   doCheck = false;
 
   meta = with lib; {
-    description = "Web APIs for Django, made easy.";
-    homepage = "https://www.django-rest-framework.org/";
+    description = "Fast implementation of asyncio event loop on top of libuv";
+    homepage = "http://github.com/MagicStack/uvloop";
   };
 }

nix/pkgs/baserow/backend/pynixify/packages/watchgod/default.nix

@@ -0,0 +1,23 @@
+# 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";
+  };
+}

nix/pkgs/baserow/backend/pynixify/packages/zipp/default.nix

@@ -0,0 +1,20 @@
+# 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 = "zipp";
+  version = "3.5.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1i7hkdbivya5lvww9y8i85mp3spbwzsfk9a96kvcyj3y00g2p0gm";
+  };
+
+  # TODO FIXME
+  doCheck = false;
+
+  meta = with lib; { };
+}

nix/pkgs/baserow/default.nix

@@ -9,13 +9,13 @@
 }:
 
 let
-  version = "1.7.1";
+  version = "1.12.1";
   suffix = lib.optionalString ossOnly "-oss";
   src' = fetchFromGitLab {
     owner = "bramw";
     repo = "baserow";
     rev = version;
-    sha256 = "0jcisfhksrins33whwq46zg4r1101xvs2r0kcf1552x39r911gdg";
+    sha256 = "0r231h22s6b6vv38l4ppbgbacad9az38wmvj7fflsd6hbmz9lgfd";
   };
   src = if ossOnly then pkgs.runCommand "${src'.name}${suffix}" {} ''
     cp -R ${src'} $out

nix/pkgs/baserow/web-frontend/node-env.nix

@@ -165,7 +165,11 @@ let
           if(process.argv[2] == "development") {
               replaceDependencies(packageObj.devDependencies);
           }
+          else {
+              packageObj.devDependencies = {};
+          }
           replaceDependencies(packageObj.optionalDependencies);
+          replaceDependencies(packageObj.peerDependencies);
 
           /* Write the fixed package.json file */
           fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
@@ -270,7 +274,7 @@ let
 
   # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes
   reconstructPackageLock = writeTextFile {
-    name = "addintegrityfields.js";
+    name = "reconstructpackagelock.js";
     text = ''
       var fs = require('fs');
       var path = require('path');
@@ -280,25 +284,43 @@ let
       var lockObj = {
           name: packageObj.name,
           version: packageObj.version,
-          lockfileVersion: 1,
+          lockfileVersion: 2,
           requires: true,
+          packages: {
+              "": {
+                  name: packageObj.name,
+                  version: packageObj.version,
+                  license: packageObj.license,
+                  bin: packageObj.bin,
+                  dependencies: packageObj.dependencies,
+                  engines: packageObj.engines,
+                  optionalDependencies: packageObj.optionalDependencies
+              }
+          },
           dependencies: {}
       };
 
-      function augmentPackageJSON(filePath, dependencies) {
+      function augmentPackageJSON(filePath, packages, dependencies) {
           var packageJSON = path.join(filePath, "package.json");
           if(fs.existsSync(packageJSON)) {
               var packageObj = JSON.parse(fs.readFileSync(packageJSON));
+              packages[filePath] = {
+                  version: packageObj.version,
+                  integrity: "sha1-000000000000000000000000000=",
+                  dependencies: packageObj.dependencies,
+                  engines: packageObj.engines,
+                  optionalDependencies: packageObj.optionalDependencies
+              };
               dependencies[packageObj.name] = {
                   version: packageObj.version,
                   integrity: "sha1-000000000000000000000000000=",
                   dependencies: {}
               };
-              processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies);
+              processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies);
           }
       }
 
-      function processDependencies(dir, dependencies) {
+      function processDependencies(dir, packages, dependencies) {
           if(fs.existsSync(dir)) {
               var files = fs.readdirSync(dir);
 
@@ -314,23 +336,84 @@ let
                           pkgFiles.forEach(function(entry) {
                               if(stats.isDirectory()) {
                                   var pkgFilePath = path.join(filePath, entry);
-                                  augmentPackageJSON(pkgFilePath, dependencies);
+                                  augmentPackageJSON(pkgFilePath, packages, dependencies);
                               }
                           });
                       } else {
-                          augmentPackageJSON(filePath, dependencies);
+                          augmentPackageJSON(filePath, packages, dependencies);
                       }
                   }
               });
           }
       }
 
-      processDependencies("node_modules", lockObj.dependencies);
+      processDependencies("node_modules", lockObj.packages, lockObj.dependencies);
 
       fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2));
     '';
   };
 
+  # Script that links bins defined in package.json to the node_modules bin directory
+  # NPM does not do this for top-level packages itself anymore as of v7
+  linkBinsScript = writeTextFile {
+    name = "linkbins.js";
+    text = ''
+      var fs = require('fs');
+      var path = require('path');
+
+      var packageObj = JSON.parse(fs.readFileSync("package.json"));
+
+      var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep);
+
+      if(packageObj.bin !== undefined) {
+          fs.mkdirSync(path.join(nodeModules, ".bin"))
+
+          if(typeof packageObj.bin == "object") {
+              Object.keys(packageObj.bin).forEach(function(exe) {
+                  if(fs.existsSync(packageObj.bin[exe])) {
+                      console.log("linking bin '" + exe + "'");
+                      fs.symlinkSync(
+                          path.join("..", packageObj.name, packageObj.bin[exe]),
+                          path.join(nodeModules, ".bin", exe)
+                      );
+                  }
+                  else {
+                      console.log("skipping non-existent bin '" + exe + "'");
+                  }
+              })
+          }
+          else {
+              if(fs.existsSync(packageObj.bin)) {
+                  console.log("linking bin '" + packageObj.bin + "'");
+                  fs.symlinkSync(
+                      path.join("..", packageObj.name, packageObj.bin),
+                      path.join(nodeModules, ".bin", packageObj.name.split("/").pop())
+                  );
+              }
+              else {
+                  console.log("skipping non-existent bin '" + packageObj.bin + "'");
+              }
+          }
+      }
+      else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) {
+          fs.mkdirSync(path.join(nodeModules, ".bin"))
+
+          fs.readdirSync(packageObj.directories.bin).forEach(function(exe) {
+              if(fs.existsSync(path.join(packageObj.directories.bin, exe))) {
+                  console.log("linking bin '" + exe + "'");
+                  fs.symlinkSync(
+                      path.join("..", packageObj.name, packageObj.directories.bin, exe),
+                      path.join(nodeModules, ".bin", exe)
+                  );
+              }
+              else {
+                  console.log("skipping non-existent bin '" + exe + "'");
+              }
+          })
+      }
+    '';
+  };
+
   prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}:
     let
       forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
@@ -377,13 +460,18 @@ let
 
         npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild
 
+        runHook postRebuild
+
         if [ "''${dontNpmInstall-}" != "1" ]
         then
             # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
             rm -f npm-shrinkwrap.json
 
-            npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install
+            npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install
         fi
+
+        # Link executables defined in package.json
+        node ${linkBinsScript}
     '';
 
   # Builds and composes an NPM package including all its dependencies
@@ -395,7 +483,7 @@ let
     , buildInputs ? []
     , production ? true
     , npmFlags ? ""
-    , dontNpmInstall ? true
+    , dontNpmInstall ? false
     , bypassCache ? false
     , reconstructLock ? false
     , preRebuild ? ""
@@ -485,7 +573,7 @@ let
     , buildInputs ? []
     , production ? true
     , npmFlags ? ""
-    , dontNpmInstall ? true
+    , dontNpmInstall ? false
     , bypassCache ? false
     , reconstructLock ? false
     , dontStrip ? true
@@ -556,7 +644,7 @@ let
     , buildInputs ? []
     , production ? true
     , npmFlags ? ""
-    , dontNpmInstall ? true
+    , dontNpmInstall ? false
     , bypassCache ? false
     , reconstructLock ? false
     , dontStrip ? true

third_party/nixpkgs/pkgs/top-level/python-packages.nix

@@ -9653,7 +9653,7 @@ self: super: with self; {
 
   restview = callPackage ../development/python-modules/restview { };
 
-  result = callPackage ../development/python-modules/result { };
+  #result = callPackage ../development/python-modules/result { };
 
   rethinkdb = callPackage ../development/python-modules/rethinkdb { };