all repos — mycal @ bccfac1c97078e65dbc84d1c4a108e2c57058917

private calendar anonymiser

fix startup failing when run via nixos module

Alan Pearce
commit

bccfac1c97078e65dbc84d1c4a108e2c57058917

parent

5b50ae6e06f9d5d5086a4a4de3a8b4d81bc2e897

3 files changed, 25 insertions(+), 5 deletions(-)

changed files
M flake.nixflake.nix
@@ -120,9 +120,6 @@ mycal =
{ config, lib, pkgs, ... }: let cfg = config.services.mycal; - pkg = cfg.venv; - python = self.packages.${pkgs.system}.python; - settingsFormat = pkgs.formats.toml { }; inherit (lib) mkEnableOption mkOption mkIf types;
@@ -215,13 +212,12 @@ systemd.services.mycal = {
description = "Mycal Calendar Service"; environment = { - PYTHONPATH = "${python.pkgs.makePythonPath pkg.propagatedBuildInputs}:${pkg}/${python.sitePackages}"; CONFIG_FILE = settingsFormat.generate "mycal-config.toml" cfg.settings; }; serviceConfig = { ExecStart = '' - ${lib.getExe python.pkgs.gunicorn} \ + ${cfg.venv}/bin/gunicorn \ --bind ${cfg.host}:${toString cfg.port} \ --workers 1 \ mycal:app
M pyproject.tomlpyproject.toml
@@ -6,6 +6,7 @@ authors = [{ name = "Alan Pearce", email = "alan@alanpearce.eu" }]
requires-python = ">=3.12" dependencies = [ "flask>=3.1.1", + "gunicorn>=23.0.0", "icalendar>=6.3.1", "icalendar-compatibility>=0.1.4", "requests>=2.32.3",
M uv.lockuv.lock
@@ -103,6 +103,18 @@ { url = "https://files.pythonhosted.org/packages/3d/68/9d4508e893976286d2ead7f8f571314af6c2037af34853a30fd769c02e9d/flask-3.1.1-py3-none-any.whl", hash = "sha256:07aae2bb5eaf77993ef57e357491839f5fd9f4dc281593a81a9e4d79a24f295c", size = 103305, upload-time = "2025-05-13T15:01:15.591Z" },
] [[package]] +name = "gunicorn" +version = "23.0.0" +source = { registry = "https://pypi.org/simple" } +dependencies = [ + { name = "packaging" }, +] +sdist = { url = "https://files.pythonhosted.org/packages/34/72/9614c465dc206155d93eff0ca20d42e1e35afc533971379482de953521a4/gunicorn-23.0.0.tar.gz", hash = "sha256:f014447a0101dc57e294f6c18ca6b40227a4c90e9bdb586042628030cba004ec", size = 375031, upload-time = "2024-08-10T20:25:27.378Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/cb/7d/6dac2a6e1eba33ee43f318edbed4ff29151a49b5d37f080aad1e6469bca4/gunicorn-23.0.0-py3-none-any.whl", hash = "sha256:ec400d38950de4dfd418cff8328b2c8faed0edb0d517d3394e457c317908ca4d", size = 85029, upload-time = "2024-08-10T20:25:24.996Z" }, +] + +[[package]] name = "icalendar" version = "6.3.1" source = { registry = "https://pypi.org/simple" }
@@ -201,6 +213,7 @@ version = "0.1.0"
source = { editable = "." } dependencies = [ { name = "flask" }, + { name = "gunicorn" }, { name = "icalendar" }, { name = "icalendar-compatibility" }, { name = "requests" },
@@ -210,10 +223,20 @@
[package.metadata] requires-dist = [ { name = "flask", specifier = ">=3.1.1" }, + { name = "gunicorn", specifier = ">=23.0.0" }, { name = "icalendar", specifier = ">=6.3.1" }, { name = "icalendar-compatibility", specifier = ">=0.1.4" }, { name = "requests", specifier = ">=2.32.3" }, { name = "toml-dataclass", specifier = ">=0.1.0" }, +] + +[[package]] +name = "packaging" +version = "25.0" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/a1/d4/1fc4078c65507b51b96ca8f8c3ba19e6a61c8253c72794544580a7b6c24d/packaging-25.0.tar.gz", hash = "sha256:d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f", size = 165727, upload-time = "2025-04-19T11:48:59.673Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/20/12/38679034af332785aac8774540895e234f4d07f7545804097de4b666afd8/packaging-25.0-py3-none-any.whl", hash = "sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484", size = 66469, upload-time = "2025-04-19T11:48:57.875Z" }, ] [[package]]