diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 0cecbad5a4af..ad464dfa198d 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -81,7 +81,7 @@ In addition to numerous new and upgraded packages, this release has the followin - [ergochat](https://ergo.chat), a modern IRC with IRCv3 features. Available as [services.ergochat](#opt-services.ergochat.enable). -- [ethercalc](https://github.com/audreyt/ethercalc), an online collaborative spreadsheet. Available as [services.ethercalc](#opt-services.ethercalc.enable). +- [ethercalc](https://github.com/audreyt/ethercalc), an online collaborative spreadsheet. Available as {option}`services.ethercalc`. - [filebeat](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-overview.html), a lightweight shipper for forwarding and centralizing log data. Available as [services.filebeat](#opt-services.filebeat.enable). diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index 47a2563d6fa7..5ef93e7e8fce 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -35,6 +35,8 @@ of pulling the upstream container image from Docker Hub. If you want the old beh } ``` +- Ethercalc and its associated module have been removed, as the package is unmaintained and cannot be installed from source with npm now. + ## Other Notable Changes {#sec-release-26.05-notable-changes} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d10f2a026d5b..ad90be849271 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1602,7 +1602,6 @@ ./services/web-apps/eintopf.nix ./services/web-apps/engelsystem.nix ./services/web-apps/ente.nix - ./services/web-apps/ethercalc.nix ./services/web-apps/fediwall.nix ./services/web-apps/fider.nix ./services/web-apps/filebrowser.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 8b9a1c998520..d42c7fbf1d52 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -168,6 +168,9 @@ in To wrap a resolver with DNSCrypt you can instead use dnsdist. See options `services.dnsdist.dnscrypt.*` '') + (mkRemovedOptionModule [ "services" "ethercalc" ] '' + The ethercalc module has been removed from nixpkgs as the project was old, unmaintained, and could not be packaged well in nixpkgs. + '') (mkRemovedOptionModule [ "services" "exhibitor" diff --git a/nixos/modules/services/web-apps/ethercalc.nix b/nixos/modules/services/web-apps/ethercalc.nix deleted file mode 100644 index e9bd924041a5..000000000000 --- a/nixos/modules/services/web-apps/ethercalc.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -with lib; - -let - cfg = config.services.ethercalc; -in -{ - options = { - services.ethercalc = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - ethercalc, an online collaborative spreadsheet server. - - Persistent state will be maintained under - {file}`/var/lib/ethercalc`. Upstream supports using a - redis server for storage and recommends the redis backend for - intensive use; however, the Nix module doesn't currently support - redis. - - Note that while ethercalc is a good and robust project with an active - issue tracker, there haven't been new commits since the end of 2020. - ''; - }; - - package = mkPackageOption pkgs "ethercalc" { }; - - host = mkOption { - type = types.str; - default = "0.0.0.0"; - description = "Address to listen on (use 0.0.0.0 to allow access from any address)."; - }; - - port = mkOption { - type = types.port; - default = 8000; - description = "Port to bind to."; - }; - }; - }; - - config = mkIf cfg.enable { - systemd.services.ethercalc = { - description = "Ethercalc service"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - serviceConfig = { - DynamicUser = true; - ExecStart = "${cfg.package}/bin/ethercalc --host ${cfg.host} --port ${toString cfg.port}"; - Restart = "always"; - StateDirectory = "ethercalc"; - WorkingDirectory = "/var/lib/ethercalc"; - }; - }; - }; -}