nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix

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

authored by

Yt and committed by
GitHub
e3fa38df a38f5515

+47 -45
+3 -3
nixos/modules/services/web-apps/eintopf.nix
··· 15 15 { 16 16 options.services.eintopf = { 17 17 18 - enable = mkEnableOption "Eintopf community event calendar web app"; 18 + enable = mkEnableOption "Lauti (Eintopf) community event calendar web app"; 19 19 20 20 settings = mkOption { 21 21 type = types.attrsOf types.str; 22 22 default = { }; 23 23 description = '' 24 24 Settings to configure web service. See 25 - <https://codeberg.org/Klasse-Methode/eintopf/src/branch/main/DEPLOYMENT.md> 25 + <https://codeberg.org/Klasse-Methode/lauti/src/branch/main/DEPLOYMENT.md> 26 26 for available options. 27 27 ''; 28 28 example = literalExpression '' ··· 54 54 wants = [ "network-online.target" ]; 55 55 environment = cfg.settings; 56 56 serviceConfig = { 57 - ExecStart = "${pkgs.eintopf}/bin/eintopf"; 57 + ExecStart = lib.getExe pkgs.lauti; 58 58 WorkingDirectory = "/var/lib/eintopf"; 59 59 StateDirectory = "eintopf"; 60 60 EnvironmentFile = [ cfg.secrets ];
+1 -1
nixos/tests/all-tests.nix
··· 421 421 ecryptfs = handleTest ./ecryptfs.nix { }; 422 422 fscrypt = handleTest ./fscrypt.nix { }; 423 423 fastnetmon-advanced = runTest ./fastnetmon-advanced.nix; 424 - eintopf = handleTest ./eintopf.nix { }; 424 + eintopf = runTest ./eintopf.nix; 425 425 ejabberd = handleTest ./xmpp/ejabberd.nix { }; 426 426 elk = handleTestOn [ "x86_64-linux" ] ./elk.nix { }; 427 427 emacs-daemon = runTest ./emacs-daemon.nix;
+22 -24
nixos/tests/eintopf.nix
··· 1 - import ./make-test-python.nix ( 2 - { pkgs, ... }: 3 - { 4 - name = "eintopf"; 5 - meta = with pkgs.lib.maintainers; { 6 - maintainers = [ onny ]; 7 - }; 1 + { 2 + lib, 3 + pkgs, 4 + ... 5 + }: 8 6 9 - nodes = { 10 - eintopf = 11 - { config, pkgs, ... }: 12 - { 13 - services.eintopf = { 14 - enable = true; 15 - }; 16 - }; 17 - }; 7 + { 8 + name = "eintopf"; 9 + meta.maintainers = with lib.maintainers; [ onny ]; 18 10 19 - testScript = '' 20 - eintopf.start 21 - eintopf.wait_for_unit("eintopf.service") 22 - eintopf.wait_for_open_port(3333) 23 - eintopf.succeed("curl -sSfL http://eintopf:3333 | grep 'Es sind keine Veranstaltungen eingetragen'") 24 - ''; 25 - } 26 - ) 11 + nodes = { 12 + eintopf = { 13 + services.eintopf.enable = true; 14 + }; 15 + }; 16 + 17 + testScript = '' 18 + eintopf.start 19 + eintopf.wait_for_unit("eintopf.service") 20 + eintopf.wait_for_open_port(3333) 21 + eintopf.succeed("curl -sSfL http://eintopf:3333 | grep 'No events available'") 22 + ''; 23 + 24 + }
+9 -7
pkgs/by-name/ei/eintopf/frontend.nix pkgs/by-name/la/lauti/frontend.nix
··· 4 4 src, 5 5 version, 6 6 nodejs, 7 - eintopf, 7 + lauti, 8 8 yarnConfigHook, 9 9 yarnBuildHook, 10 10 }: 11 11 12 12 stdenv.mkDerivation (finalAttrs: { 13 - pname = "eintopf"; 13 + pname = "lauti"; 14 14 inherit version src; 15 15 16 - sourceRoot = "${finalAttrs.src.name}/backstage"; 17 - 18 16 offlineCache = fetchYarnDeps { 19 - yarnLock = "${finalAttrs.src}/backstage/yarn.lock"; 20 - hash = "sha256-3TPBrQxvTfmBfhAavHy8eDcZwRZMwu0dCovnE1fcuTE="; 17 + yarnLock = "${finalAttrs.src}/yarn.lock"; 18 + hash = "sha256-uIDBE4ewdzrtJqOjFQTAei1TpAjQMRqls7CtG1h8KnA="; 21 19 }; 22 20 23 21 nativeBuildInputs = [ ··· 24 26 # Needed for executing package.json scripts 25 27 nodejs 26 28 ]; 29 + 30 + preBuild = '' 31 + cd backstage 32 + ''; 27 33 28 34 installPhase = '' 29 35 runHook preInstall ··· 41 39 ''; 42 40 43 41 meta = { 44 - inherit (eintopf.meta) 42 + inherit (lauti.meta) 45 43 homepage 46 44 description 47 45 license
+11 -10
pkgs/by-name/ei/eintopf/package.nix pkgs/by-name/la/lauti/package.nix
··· 7 7 }: 8 8 9 9 let 10 - version = "0.14.3"; 10 + version = "1.0.0"; 11 11 src = fetchFromGitea { 12 12 domain = "codeberg.org"; 13 13 owner = "Klasse-Methode"; 14 - repo = "eintopf"; 15 - rev = "v${version}"; 16 - hash = "sha256-cWHWRxZFoArBB5PiuY6EQubKJKm3/79fwNhnABOtBrM="; 14 + repo = "lauti"; 15 + tag = "v${version}"; 16 + hash = "sha256-cO9rK7GAVRlv5x4WI/xbXNJ594QqB+KIPUteB3TifKM="; 17 17 }; 18 18 frontend = callPackage ./frontend.nix { inherit src version; }; 19 19 in 20 20 21 21 buildGoModule rec { 22 - pname = "eintopf"; 22 + pname = "lauti"; 23 23 inherit version src; 24 24 25 - vendorHash = "sha256-ysAgyaewREI8TaMnKH+kh33QT6AN1eLhog35lv7CbVU="; 25 + vendorHash = "sha256-ushTvIpvRLZP3q6tLN6BA4tl2Xp/UImWugm2ZgTAm8k="; 26 26 27 27 ldflags = [ 28 28 "-s" ··· 37 37 38 38 preCheck = '' 39 39 # Disable test, requires running Docker daemon 40 - rm cmd/eintopf/main_test.go 40 + rm cmd/lauti/main_test.go 41 41 rm service/email/email_test.go 42 42 ''; 43 43 44 44 passthru.tests = { 45 - inherit (nixosTests) eintopf; 45 + inherit (nixosTests) lauti; 46 46 }; 47 47 48 48 meta = { 49 - description = "A calendar for Stuttgart, showing events, groups and places"; 50 - homepage = "https://codeberg.org/Klasse-Methode/eintopf"; 49 + description = "An open source calendar for events, groups and places"; 50 + homepage = "https://lauti.org"; 51 51 license = lib.licenses.agpl3Only; 52 52 maintainers = with lib.maintainers; [ onny ]; 53 53 platforms = lib.platforms.unix; 54 + mainProgram = "lauti"; 54 55 }; 55 56 }
+1
pkgs/top-level/aliases.nix
··· 556 556 ecryptfs-helper = throw "'ecryptfs-helper' has been removed, for filesystem-level encryption, use fscrypt"; # Added 2025-04-08 557 557 edUnstable = throw "edUnstable was removed; use ed instead"; # Added 2024-07-01 558 558 edgedb = throw "edgedb replaced to gel because of change of upstream"; # Added 2025-02-24 559 + eintopf = lauti; # Project was renamed, added 2025-05-01 559 560 elasticsearch7Plugins = elasticsearchPlugins; 560 561 electronplayer = throw "'electronplayer' has been removed as it had been discontinued upstream since October 2024"; # Added 2024-12-17 561 562