baserow

NixOS · Jul 5, 2024 · f719302 · f719302
1 parent 852d695
commit f719302
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/...0001-backend-package-HTML-templates.patch → ...0001-backend-package-HTML-templates.patch b/...0001-backend-package-HTML-templates.patch → ...0001-backend-package-HTML-templates.patch
diff --git a/pkgs/servers/baserow/default.nix → pkgs/by-name/ba/baserow/package.nix b/pkgs/servers/baserow/default.nix → pkgs/by-name/ba/baserow/package.nix
@@ -82,14 +82,14 @@ in
 
 with python.pkgs; buildPythonApplication rec {
  pname = "baserow";
- version = "1.23.2";
+ version = "1.25.2";
  format = "setuptools";
 
  src = fetchFromGitHub {
  owner = "bram2w";
  repo = pname;
  rev = "refs/tags/${version}";
- hash = "";
+ hash = "sha256-sitJ0S3mzYYVquNGjLnshA8z4eUjMNit/WyVUPrkfQ4=";
  };
 
  sourceRoot = "source/backend";
@@ -118,7 +118,7 @@ with python.pkgs; buildPythonApplication rec {
  makeWrapper
  ];
 
- propagatedBuildInputs = [
+ dependencies = [
  google-api-core
  google-cloud-core
  google-cloud-storage
@@ -179,15 +179,15 @@ with python.pkgs; buildPythonApplication rec {
  opentelemetry-exporter-otlp-proto-http
  opentelemetry-instrumentation-asgi
  opentelemetry-instrumentation-aiohttp-client
- opentelemetry-instrumentation-botocore
- opentelemetry-instrumentation-celery
- opentelemetry-instrumentation-dbapi
+ #opentelemetry-instrumentation-botocore
+ #opentelemetry-instrumentation-celery
+ #opentelemetry-instrumentation-dbapi
  opentelemetry-instrumentation-django
  opentelemetry-instrumentation-grpc
- opentelemetry-instrumentation-logging
- opentelemetry-instrumentation-psycopg2
- opentelemetry-instrumentation-redis
- opentelemetry-instrumentation-requests
+ #opentelemetry-instrumentation-logging
+ #opentelemetry-instrumentation-psycopg2
+ #opentelemetry-instrumentation-redis
+ #opentelemetry-instrumentation-requests
  opentelemetry-instrumentation-wsgi
  opentelemetry-instrumentation
  opentelemetry-sdk
@@ -204,7 +204,7 @@ with python.pkgs; buildPythonApplication rec {
  '';
 #
  nativeCheckInputs = [
- baserow_premium
+ #baserow_premium
  boto3
  freezegun
  httpretty
@@ -248,7 +248,11 @@ with python.pkgs; buildPythonApplication rec {
  doCheck = false; # our disabled tests paths are not ignored for premium/backend because of an explicit testpaths I suppose.
  # todo patch it.
 
- pythonImportsCheck = [ "baserow" "baserow_premium.config.settings" "baserow_enterprise.config.settings" ];
+ pythonImportsCheck = [
+ "baserow"
+ "baserow_premium.config.settings"
+ "baserow_enterprise.config.settings"
+ ];
 
  DJANGO_SETTINGS_MODULE = "baserow.config.settings.test";
 
@@ -258,7 +262,7 @@ with python.pkgs; buildPythonApplication rec {
  enterprise = baserow_enterprise;
  # PYTHONPATH of all dependencies used by the package
  inherit python;
- pythonPath = python.pkgs.makePythonPath propagatedBuildInputs;
+ pythonPath = python.pkgs.makePythonPath dependencies;
 
  tests = {
  inherit (nixosTests) baserow;

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -25330,8 +25330,6 @@ with pkgs;
 
  asterisk-ldap = lowPrio (asterisk.override { ldapSupport = true; });
 
- baserow = callPackage ../servers/baserow { };
-
  bftpd = callPackage ../servers/ftp/bftpd { };
 
  bind = callPackage ../servers/dns/bind { };