1

rename remaining e11sync to e11sync-backend

This commit is contained in:
Motiejus Jakštys 2024-01-15 16:17:16 +02:00
parent 50c34aa922
commit 185669d69b
2 changed files with 11 additions and 21 deletions

View File

@ -48,7 +48,7 @@
inherit e11sync-static; inherit e11sync-static;
}; };
e11sync = pkgs.callPackage ./pkgs/e11sync.nix { e11sync-backend = pkgs.callPackage ./pkgs/e11sync-backend.nix {
inherit geoip-mmdb; inherit geoip-mmdb;
uwsgi = pkgs.uwsgi.override {plugins = ["python3"];}; uwsgi = pkgs.uwsgi.override {plugins = ["python3"];};
}; };
@ -57,11 +57,11 @@
inherit geoip-mmdb; inherit geoip-mmdb;
inherit e11sync-static; inherit e11sync-static;
inherit e11sync-frontend; inherit e11sync-frontend;
inherit e11sync; inherit e11sync-backend;
}; };
checks = { checks = {
e11sync-unit = e11sync.passthru.tests.unit; e11sync-unit = e11sync-backend.passthru.tests.unit;
pre-commit-check = pre-commit-hooks.lib.${system}.run { pre-commit-check = pre-commit-hooks.lib.${system}.run {
src = ./.; src = ./.;
hooks = { hooks = {
@ -79,24 +79,6 @@
# Run e11sync tools from the nix store # Run e11sync tools from the nix store
apps = { apps = {
# manage.py
e11sync = {
type = "app";
name = "e11sync";
program = toString (pkgs.writeShellScript "wrapper" ''
export E11SYNC_DATABASE_PATH=$PWD/db.sqlite3
exec ${e11sync}/bin/e11sync
'');
};
# uwsgi
e11sync-backend = {
type = "app";
name = "e11sync-backend";
program = toString (pkgs.writeShellScript "wrapper" ''
export E11SYNC_DATABASE_PATH=$PWD/db.sqlite3
exec ${e11sync}/bin/e11sync-backend
'');
};
e11sync-frontend = { e11sync-frontend = {
type = "app"; type = "app";
name = "e11sync-frontend"; name = "e11sync-frontend";
@ -119,6 +101,14 @@
exec ${pkgs.caddy}/bin/caddy run --config ${caddyFile} --adapter caddyfile exec ${pkgs.caddy}/bin/caddy run --config ${caddyFile} --adapter caddyfile
''); '');
}; };
e11sync-backend = {
type = "app";
name = "e11sync-backend";
program = toString (pkgs.writeShellScript "wrapper" ''
export E11SYNC_DATABASE_PATH=$PWD/db.sqlite3
exec ${e11sync-backend}/bin/e11sync-backend
'');
};
}; };
devShells.default = pkgs.mkShellNoCC { devShells.default = pkgs.mkShellNoCC {