update downstream module file
This commit is contained in:
parent
a5e2fee7a9
commit
1884ac1d43
1 changed files with 48 additions and 48 deletions
|
|
@ -13,15 +13,13 @@ let
|
||||||
pkg = cfg.package.overridePythonAttrs (old: {
|
pkg = cfg.package.overridePythonAttrs (old: {
|
||||||
src = ./.;
|
src = ./.;
|
||||||
dependencies = old.dependencies ++ [ cfg.package.python.pkgs.mastodon-py ];
|
dependencies = old.dependencies ++ [ cfg.package.python.pkgs.mastodon-py ];
|
||||||
postInstall =
|
postInstall = old.postInstall + ''
|
||||||
old.postInstall
|
ln -s ${settingsFile} $out/${pkg.python.sitePackages}/froide_govplan/project/extra_settings.py
|
||||||
+ ''
|
|
||||||
ln -s ${settingsFile} $out/${pkg.python.sitePackages}/froide_govplan/project/extra_settings.py
|
|
||||||
|
|
||||||
rm -r $out/${pkgs.python3.sitePackages}/froide_govplan/templates
|
rm -r $out/${pkgs.python3.sitePackages}/froide_govplan/templates
|
||||||
ln -sf /var/lib/froide-govplan/templates $out/${pkgs.python3.sitePackages}/froide_govplan/templates
|
ln -sf /var/lib/froide-govplan/templates $out/${pkgs.python3.sitePackages}/froide_govplan/templates
|
||||||
cp -r froide_govplan/static $out/${pkgs.python3.sitePackages}/froide_govplan/
|
cp -r froide_govplan/static $out/${pkgs.python3.sitePackages}/froide_govplan/
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
|
|
||||||
froide-govplan = pkgs.writeShellApplication {
|
froide-govplan = pkgs.writeShellApplication {
|
||||||
|
|
@ -169,9 +167,9 @@ in
|
||||||
systemd = {
|
systemd = {
|
||||||
services = {
|
services = {
|
||||||
|
|
||||||
postgresql.serviceConfig.ExecStartPost =
|
postgresql-setup.serviceConfig.ExecStartPost =
|
||||||
let
|
let
|
||||||
sqlFile = pkgs.writeText "immich-pgvectors-setup.sql" ''
|
sqlFile = pkgs.writeText "froide-govplan-postgis-setup.sql" ''
|
||||||
CREATE EXTENSION IF NOT EXISTS postgis;
|
CREATE EXTENSION IF NOT EXISTS postgis;
|
||||||
'';
|
'';
|
||||||
in
|
in
|
||||||
|
|
@ -190,49 +188,51 @@ in
|
||||||
Group = "govplan";
|
Group = "govplan";
|
||||||
};
|
};
|
||||||
after = [
|
after = [
|
||||||
"postgresql.service"
|
"postgresql.target"
|
||||||
"network.target"
|
"network.target"
|
||||||
"systemd-tmpfiles-setup.service"
|
"systemd-tmpfiles-setup.service"
|
||||||
];
|
];
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
environment =
|
environment = {
|
||||||
{
|
PYTHONPATH = pkg.python.pkgs.makePythonPath (
|
||||||
PYTHONPATH = pkg.python.pkgs.makePythonPath (with pkg.python.pkgs; [
|
with pkg.python.pkgs;
|
||||||
|
[
|
||||||
|
|
||||||
bleach
|
bleach
|
||||||
django-admin-sortable2
|
django-admin-sortable2
|
||||||
django-cms
|
django-cms
|
||||||
django-filer
|
django-filer
|
||||||
django-mfa3
|
django-mfa3
|
||||||
django-mptt
|
django-mptt
|
||||||
django-oauth-toolkit
|
django-oauth-toolkit
|
||||||
django-sekizai
|
django-sekizai
|
||||||
django-tinymce
|
django-tinymce
|
||||||
django-treebeard
|
django-treebeard
|
||||||
djangocms-alias
|
djangocms-alias
|
||||||
# Downgrade to last working version
|
# Downgrade to last working version
|
||||||
(toPythonModule (
|
(toPythonModule (
|
||||||
pkgs.froide.overridePythonAttrs (prev: {
|
pkgs.froide.overridePythonAttrs (prev: {
|
||||||
nativeBuildInputs = [ pkgs.makeBinaryWrapper ];
|
nativeBuildInputs = [ pkgs.makeBinaryWrapper ];
|
||||||
postBuild = "";
|
postBuild = "";
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
pnpmDeps = null;
|
pnpmDeps = null;
|
||||||
src = prev.src.override {
|
src = prev.src.override {
|
||||||
rev = "a78a4054f9f37b0a5109a6d8cfbbda742f86a8ca";
|
rev = "a78a4054f9f37b0a5109a6d8cfbbda742f86a8ca";
|
||||||
hash = "sha256-gtOssbsVf3nG+pmLPgvh4685vHh2x+jlXiTjU+JhQa8=";
|
hash = "sha256-gtOssbsVf3nG+pmLPgvh4685vHh2x+jlXiTjU+JhQa8=";
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
))
|
))
|
||||||
psycopg
|
psycopg
|
||||||
mastodon-py
|
mastodon-py
|
||||||
(toPythonModule (pkg))
|
(toPythonModule (pkg))
|
||||||
]);
|
]
|
||||||
GDAL_LIBRARY_PATH = "${pkgs.gdal}/lib/libgdal.so";
|
);
|
||||||
GEOS_LIBRARY_PATH = "${pkgs.geos}/lib/libgeos_c.so";
|
GDAL_LIBRARY_PATH = "${pkgs.gdal}/lib/libgdal.so";
|
||||||
}
|
GEOS_LIBRARY_PATH = "${pkgs.geos}/lib/libgeos_c.so";
|
||||||
// lib.optionalAttrs (cfg.secretKeyFile != null) {
|
}
|
||||||
SECRET_KEY_FILE = cfg.secretKeyFile;
|
// lib.optionalAttrs (cfg.secretKeyFile != null) {
|
||||||
};
|
SECRET_KEY_FILE = cfg.secretKeyFile;
|
||||||
|
};
|
||||||
preStart = ''
|
preStart = ''
|
||||||
# Auto-migrate on first run or if the package has changed
|
# Auto-migrate on first run or if the package has changed
|
||||||
versionFile="${cfg.dataDir}/src-version"
|
versionFile="${cfg.dataDir}/src-version"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue