lauti: rename from eintopf and update to 1.0.0 (#403263)

This commit is contained in:
Yt 2025-05-06 16:24:25 -04:00 committed by GitHub
commit e3fa38df6b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 47 additions and 45 deletions

View File

@ -15,14 +15,14 @@ in
{ {
options.services.eintopf = { options.services.eintopf = {
enable = mkEnableOption "Eintopf community event calendar web app"; enable = mkEnableOption "Lauti (Eintopf) community event calendar web app";
settings = mkOption { settings = mkOption {
type = types.attrsOf types.str; type = types.attrsOf types.str;
default = { }; default = { };
description = '' description = ''
Settings to configure web service. See Settings to configure web service. See
<https://codeberg.org/Klasse-Methode/eintopf/src/branch/main/DEPLOYMENT.md> <https://codeberg.org/Klasse-Methode/lauti/src/branch/main/DEPLOYMENT.md>
for available options. for available options.
''; '';
example = literalExpression '' example = literalExpression ''
@ -54,7 +54,7 @@ in
wants = [ "network-online.target" ]; wants = [ "network-online.target" ];
environment = cfg.settings; environment = cfg.settings;
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.eintopf}/bin/eintopf"; ExecStart = lib.getExe pkgs.lauti;
WorkingDirectory = "/var/lib/eintopf"; WorkingDirectory = "/var/lib/eintopf";
StateDirectory = "eintopf"; StateDirectory = "eintopf";
EnvironmentFile = [ cfg.secrets ]; EnvironmentFile = [ cfg.secrets ];

View File

@ -421,7 +421,7 @@ in
ecryptfs = handleTest ./ecryptfs.nix { }; ecryptfs = handleTest ./ecryptfs.nix { };
fscrypt = handleTest ./fscrypt.nix { }; fscrypt = handleTest ./fscrypt.nix { };
fastnetmon-advanced = runTest ./fastnetmon-advanced.nix; fastnetmon-advanced = runTest ./fastnetmon-advanced.nix;
eintopf = handleTest ./eintopf.nix { }; eintopf = runTest ./eintopf.nix;
ejabberd = handleTest ./xmpp/ejabberd.nix { }; ejabberd = handleTest ./xmpp/ejabberd.nix { };
elk = handleTestOn [ "x86_64-linux" ] ./elk.nix { }; elk = handleTestOn [ "x86_64-linux" ] ./elk.nix { };
emacs-daemon = runTest ./emacs-daemon.nix; emacs-daemon = runTest ./emacs-daemon.nix;

View File

@ -1,18 +1,16 @@
import ./make-test-python.nix ( {
{ pkgs, ... }: lib,
{ pkgs,
...
}:
{
name = "eintopf"; name = "eintopf";
meta = with pkgs.lib.maintainers; { meta.maintainers = with lib.maintainers; [ onny ];
maintainers = [ onny ];
};
nodes = { nodes = {
eintopf = eintopf = {
{ config, pkgs, ... }: services.eintopf.enable = true;
{
services.eintopf = {
enable = true;
};
}; };
}; };
@ -20,7 +18,7 @@ import ./make-test-python.nix (
eintopf.start eintopf.start
eintopf.wait_for_unit("eintopf.service") eintopf.wait_for_unit("eintopf.service")
eintopf.wait_for_open_port(3333) eintopf.wait_for_open_port(3333)
eintopf.succeed("curl -sSfL http://eintopf:3333 | grep 'Es sind keine Veranstaltungen eingetragen'") eintopf.succeed("curl -sSfL http://eintopf:3333 | grep 'No events available'")
''; '';
}
) }

View File

@ -4,20 +4,18 @@
src, src,
version, version,
nodejs, nodejs,
eintopf, lauti,
yarnConfigHook, yarnConfigHook,
yarnBuildHook, yarnBuildHook,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "eintopf"; pname = "lauti";
inherit version src; inherit version src;
sourceRoot = "${finalAttrs.src.name}/backstage";
offlineCache = fetchYarnDeps { offlineCache = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/backstage/yarn.lock"; yarnLock = "${finalAttrs.src}/yarn.lock";
hash = "sha256-3TPBrQxvTfmBfhAavHy8eDcZwRZMwu0dCovnE1fcuTE="; hash = "sha256-uIDBE4ewdzrtJqOjFQTAei1TpAjQMRqls7CtG1h8KnA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -27,6 +25,10 @@ stdenv.mkDerivation (finalAttrs: {
nodejs nodejs
]; ];
preBuild = ''
cd backstage
'';
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
@ -39,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
''; '';
meta = { meta = {
inherit (eintopf.meta) inherit (lauti.meta)
homepage homepage
description description
license license

View File

@ -7,22 +7,22 @@
}: }:
let let
version = "0.14.3"; version = "1.0.0";
src = fetchFromGitea { src = fetchFromGitea {
domain = "codeberg.org"; domain = "codeberg.org";
owner = "Klasse-Methode"; owner = "Klasse-Methode";
repo = "eintopf"; repo = "lauti";
rev = "v${version}"; tag = "v${version}";
hash = "sha256-cWHWRxZFoArBB5PiuY6EQubKJKm3/79fwNhnABOtBrM="; hash = "sha256-cO9rK7GAVRlv5x4WI/xbXNJ594QqB+KIPUteB3TifKM=";
}; };
frontend = callPackage ./frontend.nix { inherit src version; }; frontend = callPackage ./frontend.nix { inherit src version; };
in in
buildGoModule rec { buildGoModule rec {
pname = "eintopf"; pname = "lauti";
inherit version src; inherit version src;
vendorHash = "sha256-ysAgyaewREI8TaMnKH+kh33QT6AN1eLhog35lv7CbVU="; vendorHash = "sha256-ushTvIpvRLZP3q6tLN6BA4tl2Xp/UImWugm2ZgTAm8k=";
ldflags = [ ldflags = [
"-s" "-s"
@ -37,19 +37,20 @@ buildGoModule rec {
preCheck = '' preCheck = ''
# Disable test, requires running Docker daemon # Disable test, requires running Docker daemon
rm cmd/eintopf/main_test.go rm cmd/lauti/main_test.go
rm service/email/email_test.go rm service/email/email_test.go
''; '';
passthru.tests = { passthru.tests = {
inherit (nixosTests) eintopf; inherit (nixosTests) lauti;
}; };
meta = { meta = {
description = "A calendar for Stuttgart, showing events, groups and places"; description = "An open source calendar for events, groups and places";
homepage = "https://codeberg.org/Klasse-Methode/eintopf"; homepage = "https://lauti.org";
license = lib.licenses.agpl3Only; license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ onny ]; maintainers = with lib.maintainers; [ onny ];
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
mainProgram = "lauti";
}; };
} }

View File

@ -556,6 +556,7 @@ mapAliases {
ecryptfs-helper = throw "'ecryptfs-helper' has been removed, for filesystem-level encryption, use fscrypt"; # Added 2025-04-08 ecryptfs-helper = throw "'ecryptfs-helper' has been removed, for filesystem-level encryption, use fscrypt"; # Added 2025-04-08
edUnstable = throw "edUnstable was removed; use ed instead"; # Added 2024-07-01 edUnstable = throw "edUnstable was removed; use ed instead"; # Added 2024-07-01
edgedb = throw "edgedb replaced to gel because of change of upstream"; # Added 2025-02-24 edgedb = throw "edgedb replaced to gel because of change of upstream"; # Added 2025-02-24
eintopf = lauti; # Project was renamed, added 2025-05-01
elasticsearch7Plugins = elasticsearchPlugins; elasticsearch7Plugins = elasticsearchPlugins;
electronplayer = throw "'electronplayer' has been removed as it had been discontinued upstream since October 2024"; # Added 2024-12-17 electronplayer = throw "'electronplayer' has been removed as it had been discontinued upstream since October 2024"; # Added 2024-12-17