diff --git a/machines/pointjig/configuration.nix b/machines/pointjig/configuration.nix index 91cf2e27..7cfc36d6 100644 --- a/machines/pointjig/configuration.nix +++ b/machines/pointjig/configuration.nix @@ -138,9 +138,6 @@ in }; storage.blob = "db"; - config.resource = { - webadmin = "file://${fPkgs.stalwart-webadmin.webadmin}/webadmin.zip"; - }; authentication.fallback-admin = { user = "admin"; secret = "%{env:FALLBACK_ADMIN_PASSWORD}%"; diff --git a/machines/tank/configuration.nix b/machines/tank/configuration.nix index a15c0831..25b82e16 100644 --- a/machines/tank/configuration.nix +++ b/machines/tank/configuration.nix @@ -539,9 +539,6 @@ in }; storage.blob = "db"; - config.resource = { - webadmin = "file://${fPkgs.stalwart-webadmin.webadmin}/webadmin.zip"; - }; authentication.fallback-admin = { user = "admin"; secret = "%{env:FALLBACK_ADMIN_PASSWORD}%"; diff --git a/machines/trivia-gs/configuration.nix b/machines/trivia-gs/configuration.nix index 6642268e..12aeddca 100644 --- a/machines/trivia-gs/configuration.nix +++ b/machines/trivia-gs/configuration.nix @@ -75,9 +75,6 @@ in }; storage.blob = "db"; - config.resource = { - webadmin = "file://${fPkgs.stalwart-webadmin.webadmin}/webadmin.zip"; - }; authentication.fallback-admin = { user = "admin"; secret = "%{env:FALLBACK_ADMIN_PASSWORD}%"; diff --git a/packages/default.nix b/packages/default.nix index abfcbc76..c30b6875 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -15,7 +15,6 @@ in pg-upgrade = pkgs.callPackage ./pg-upgrade { }; generate-zrepl-ssl = pkgs.callPackage ./shellscripts/generate-zrepl-ssl.nix { }; vm-grafana-datasource = pkgs.callPackage ./vm-grafana-datasource { }; - stalwart-webadmin = pkgs.callPackage ./stalwart-webadmin { }; # remove with 24.11 victoriametrics = pkgs.callPackage ./victoriametrics { }; }; diff --git a/packages/stalwart-webadmin/default.nix b/packages/stalwart-webadmin/default.nix deleted file mode 100644 index 5531c889..00000000 --- a/packages/stalwart-webadmin/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - stdenv, - fetchurl, -}: -stdenv.mkDerivation (finalAttrs: { - pname = "stalwart-webadmin"; - version = "0.1.13"; - - src = fetchurl { - url = "https://github.com/stalwartlabs/webadmin/releases/download/v${finalAttrs.version}/webadmin.zip"; - hash = "sha256-ZSaLFtPgse+991tbLJDHccRQEVrVcm/a/rfw0zx1m6U="; - }; - - outputs = [ - "out" - "webadmin" - ]; - - buildCommand = '' - runHook preBuild - - # Make it impossible to add to an environment. You should use the appropriate NixOS option. - # Also leave some breadcrumbs in the file. - echo "${finalAttrs.pname} should not be installed into environments. Please use services.stalwart-mail.settings.config.resource.webadmin instead." > $out - - mkdir -p $webadmin - ln -s $src $webadmin/webadmin.zip - - runHook postBuild - ''; - - passthru.runUpdate = true; - - meta = with lib; { - homepage = "https://github.com/stalwartlabs/webadmin"; - description = "Web-based admin for Stalwart Mail Server "; - license = licenses.agpl3Only; - maintainers = with maintainers; [ shawn8901 ]; - platforms = lib.platforms.all; - }; -})