Merge pull request #264358 from RaitoBezarius/drop-nodejs (d3530f49) · Commits · nix / nixpkgs

nixos/doc/manual/release-notes/rl-2311.section.md

+4 −0

Original line number	Diff line number	Diff line
		@@ -550,6 +550,10 @@ The module update takes care of the new config syntax and the data itself (user

		## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals}

		- Node.js v14, v16 has been removed as they were end of life. Any dependent packages that contributors were not able to reasonably upgrade were dropped after a month of notice to their maintainers, were removed.
		- This includes VSCode Server.
		- This includes Kibana 7 as the ELK stack is unmaintained in nixpkgs and is marked for slow removal.

		- The use of `sourceRoot = "source";`, `sourceRoot = "source/subdir";`, and similar lines in package derivations using the default `unpackPhase` is deprecated as it requires `unpackPhase` to always produce a directory named "source". Use `sourceRoot = src.name`, `sourceRoot = "${src.name}/subdir";`, or `setSourceRoot = "sourceRoot=$(echo */subdir)";` or similar instead.

		- The `django` alias in the python package set was upgraded to Django 4.x.

nixos/modules/module-list.nix

+0 −2

Original line number	Diff line number	Diff line
		@@ -1147,7 +1147,6 @@
		./services/search/elasticsearch-curator.nix
		./services/search/elasticsearch.nix
		./services/search/hound.nix
		./services/search/kibana.nix
		./services/search/meilisearch.nix
		./services/search/opensearch.nix
		./services/search/qdrant.nix
		@@ -1241,7 +1240,6 @@
		./services/web-apps/changedetection-io.nix
		./services/web-apps/chatgpt-retrieval-plugin.nix
		./services/web-apps/cloudlog.nix
		./services/web-apps/code-server.nix
		./services/web-apps/convos.nix
		./services/web-apps/dex.nix
		./services/web-apps/discourse.nix

nixos/modules/services/search/kibana.nix

deleted100644 → 0

+0 −213

Original line number	Diff line number	Diff line
		{ config, lib, options, pkgs, ... }:

		with lib;

		let
		cfg = config.services.kibana;
		opt = options.services.kibana;

		ge7 = builtins.compareVersions cfg.package.version "7" >= 0;
		lt6_6 = builtins.compareVersions cfg.package.version "6.6" < 0;

		cfgFile = pkgs.writeText "kibana.json" (builtins.toJSON (
		(filterAttrsRecursive (n: v: v != null && v != []) ({
		server.host = cfg.listenAddress;
		server.port = cfg.port;
		server.ssl.certificate = cfg.cert;
		server.ssl.key = cfg.key;

		kibana.index = cfg.index;
		kibana.defaultAppId = cfg.defaultAppId;

		elasticsearch.url = cfg.elasticsearch.url;
		elasticsearch.hosts = cfg.elasticsearch.hosts;
		elasticsearch.username = cfg.elasticsearch.username;
		elasticsearch.password = cfg.elasticsearch.password;

		elasticsearch.ssl.certificate = cfg.elasticsearch.cert;
		elasticsearch.ssl.key = cfg.elasticsearch.key;
		elasticsearch.ssl.certificateAuthorities = cfg.elasticsearch.certificateAuthorities;
		} // cfg.extraConf)
		)));

		in {
		options.services.kibana = {
		enable = mkEnableOption (lib.mdDoc "kibana service");

		listenAddress = mkOption {
		description = lib.mdDoc "Kibana listening host";
		default = "127.0.0.1";
		type = types.str;
		};

		port = mkOption {
		description = lib.mdDoc "Kibana listening port";
		default = 5601;
		type = types.port;
		};

		cert = mkOption {
		description = lib.mdDoc "Kibana ssl certificate.";
		default = null;
		type = types.nullOr types.path;
		};

		key = mkOption {
		description = lib.mdDoc "Kibana ssl key.";
		default = null;
		type = types.nullOr types.path;
		};

		index = mkOption {
		description = lib.mdDoc "Elasticsearch index to use for saving kibana config.";
		default = ".kibana";
		type = types.str;
		};

		defaultAppId = mkOption {
		description = lib.mdDoc "Elasticsearch default application id.";
		default = "discover";
		type = types.str;
		};

		elasticsearch = {
		url = mkOption {
		description = lib.mdDoc ''
		Elasticsearch url.

		Defaults to `"http://localhost:9200"`.

		Don't set this when using Kibana >= 7.0.0 because it will result in a
		configuration error. Use {option}`services.kibana.elasticsearch.hosts`
		instead.
		'';
		default = null;
		type = types.nullOr types.str;
		};

		hosts = mkOption {
		description = lib.mdDoc ''
		The URLs of the Elasticsearch instances to use for all your queries.
		All nodes listed here must be on the same cluster.

		Defaults to `[ "http://localhost:9200" ]`.

		This option is only valid when using kibana >= 6.6.
		'';
		default = null;
		type = types.nullOr (types.listOf types.str);
		};

		username = mkOption {
		description = lib.mdDoc "Username for elasticsearch basic auth.";
		default = null;
		type = types.nullOr types.str;
		};

		password = mkOption {
		description = lib.mdDoc "Password for elasticsearch basic auth.";
		default = null;
		type = types.nullOr types.str;
		};

		ca = mkOption {
		description = lib.mdDoc ''
		CA file to auth against elasticsearch.

		It's recommended to use the {option}`certificateAuthorities` option
		when using kibana-5.4 or newer.
		'';
		default = null;
		type = types.nullOr types.path;
		};

		certificateAuthorities = mkOption {
		description = lib.mdDoc ''
		CA files to auth against elasticsearch.

		Please use the {option}`ca` option when using kibana \< 5.4
		because those old versions don't support setting multiple CA's.

		This defaults to the singleton list [ca] when the {option}`ca` option is defined.
		'';
		default = lib.optional (cfg.elasticsearch.ca != null) ca;
		defaultText = literalExpression ''
		lib.optional (config.${opt.elasticsearch.ca} != null) ca
		'';
		type = types.listOf types.path;
		};

		cert = mkOption {
		description = lib.mdDoc "Certificate file to auth against elasticsearch.";
		default = null;
		type = types.nullOr types.path;
		};

		key = mkOption {
		description = lib.mdDoc "Key file to auth against elasticsearch.";
		default = null;
		type = types.nullOr types.path;
		};
		};

		package = mkOption {
		description = lib.mdDoc "Kibana package to use";
		default = pkgs.kibana;
		defaultText = literalExpression "pkgs.kibana";
		type = types.package;
		};

		dataDir = mkOption {
		description = lib.mdDoc "Kibana data directory";
		default = "/var/lib/kibana";
		type = types.path;
		};

		extraConf = mkOption {
		description = lib.mdDoc "Kibana extra configuration";
		default = {};
		type = types.attrs;
		};
		};

		config = mkIf (cfg.enable) {
		assertions = [
		{
		assertion = ge7 -> cfg.elasticsearch.url == null;
		message =
		"The option services.kibana.elasticsearch.url has been removed when using kibana >= 7.0.0. " +
		"Please use option services.kibana.elasticsearch.hosts instead.";
		}
		{
		assertion = lt6_6 -> cfg.elasticsearch.hosts == null;
		message =
		"The option services.kibana.elasticsearch.hosts is only valid for kibana >= 6.6.";
		}
		];
		systemd.services.kibana = {
		description = "Kibana Service";
		wantedBy = [ "multi-user.target" ];
		after = [ "network.target" "elasticsearch.service" ];
		environment = { BABEL_CACHE_PATH = "${cfg.dataDir}/.babelcache.json"; };
		serviceConfig = {
		ExecStart =
		"${cfg.package}/bin/kibana" +
		" --config ${cfgFile}" +
		" --path.data ${cfg.dataDir}";
		User = "kibana";
		WorkingDirectory = cfg.dataDir;
		};
		};

		environment.systemPackages = [ cfg.package ];

		users.users.kibana = {
		isSystemUser = true;
		description = "Kibana service user";
		home = cfg.dataDir;
		createHome = true;
		group = "kibana";
		};
		users.groups.kibana = {};
		};
		}

nixos/modules/services/web-apps/code-server.nix

deleted100644 → 0

+0 −259

Original line number	Diff line number	Diff line
		{ config, lib, pkgs, ... }:

		let
		cfg = config.services.code-server;
		defaultUser = "code-server";
		defaultGroup = defaultUser;
		in {
		options = {
		services.code-server = {
		enable = lib.mkEnableOption (lib.mdDoc "code-server");

		package = lib.mkPackageOptionMD pkgs "code-server" {
		example = ''
		pkgs.vscode-with-extensions.override {
		vscode = pkgs.code-server;
		vscodeExtensions = with pkgs.vscode-extensions; [
		bbenoist.nix
		dracula-theme.theme-dracula
		];
		}
		'';
		};

		extraPackages = lib.mkOption {
		default = [ ];
		description = lib.mdDoc ''
		Additional packages to add to the code-server {env}`PATH`.
		'';
		example = lib.literalExpression "[ pkgs.go ]";
		type = lib.types.listOf lib.types.package;
		};

		extraEnvironment = lib.mkOption {
		type = lib.types.attrsOf lib.types.str;
		description = lib.mdDoc ''
		Additional environment variables to pass to code-server.
		'';
		default = { };
		example = { PKG_CONFIG_PATH = "/run/current-system/sw/lib/pkgconfig"; };
		};

		extraArguments = lib.mkOption {
		default = [ ];
		description = lib.mdDoc ''
		Additional arguments to pass to code-server.
		'';
		example = lib.literalExpression ''[ "--log=info" ]'';
		type = lib.types.listOf lib.types.str;
		};

		host = lib.mkOption {
		default = "localhost";
		description = lib.mdDoc ''
		The host name or IP address the server should listen to.
		'';
		type = lib.types.str;
		};

		port = lib.mkOption {
		default = 4444;
		description = lib.mdDoc ''
		The port the server should listen to.
		'';
		type = lib.types.port;
		};

		auth = lib.mkOption {
		default = "password";
		description = lib.mdDoc ''
		The type of authentication to use.
		'';
		type = lib.types.enum [ "none" "password" ];
		};

		hashedPassword = lib.mkOption {
		default = "";
		description = lib.mdDoc ''
		Create the password with: `echo -n 'thisismypassword' \| npx argon2-cli -e`.
		'';
		type = lib.types.str;
		};

		user = lib.mkOption {
		default = defaultUser;
		example = "yourUser";
		description = lib.mdDoc ''
		The user to run code-server as.
		By default, a user named `${defaultUser}` will be created.
		'';
		type = lib.types.str;
		};

		group = lib.mkOption {
		default = defaultGroup;
		example = "yourGroup";
		description = lib.mdDoc ''
		The group to run code-server under.
		By default, a group named `${defaultGroup}` will be created.
		'';
		type = lib.types.str;
		};

		extraGroups = lib.mkOption {
		default = [ ];
		description = lib.mdDoc ''
		An array of additional groups for the `${defaultUser}` user.
		'';
		example = [ "docker" ];
		type = lib.types.listOf lib.types.str;
		};

		socket = lib.mkOption {
		default = null;
		example = "/run/code-server/socket";
		description = lib.mdDoc ''
		Path to a socket (bind-addr will be ignored).
		'';
		type = lib.types.nullOr lib.types.str;
		};

		socketMode = lib.mkOption {
		default = null;
		description = lib.mdDoc ''
		File mode of the socket.
		'';
		type = lib.types.nullOr lib.types.str;
		};

		userDataDir = lib.mkOption {
		default = null;
		description = lib.mdDoc ''
		Path to the user data directory.
		'';
		type = lib.types.nullOr lib.types.str;
		};

		extensionsDir = lib.mkOption {
		default = null;
		description = lib.mdDoc ''
		Path to the extensions directory.
		'';
		type = lib.types.nullOr lib.types.str;
		};

		proxyDomain = lib.mkOption {
		default = null;
		example = "code-server.lan";
		description = lib.mdDoc ''
		Domain used for proxying ports.
		'';
		type = lib.types.nullOr lib.types.str;
		};

		disableTelemetry = lib.mkOption {
		default = false;
		example = true;
		description = lib.mdDoc ''
		Disable telemetry.
		'';
		type = lib.types.bool;
		};

		disableUpdateCheck = lib.mkOption {
		default = false;
		example = true;
		description = lib.mdDoc ''
		Disable update check.
		Without this flag, code-server checks every 6 hours against the latest github release and
		then notifies you once every week that a new release is available.
		'';
		type = lib.types.bool;
		};

		disableFileDownloads = lib.mkOption {
		default = false;
		example = true;
		description = lib.mdDoc ''
		Disable file downloads from Code.
		'';
		type = lib.types.bool;
		};

		disableWorkspaceTrust = lib.mkOption {
		default = false;
		example = true;
		description = lib.mdDoc ''
		Disable Workspace Trust feature.
		'';
		type = lib.types.bool;
		};

		disableGettingStartedOverride = lib.mkOption {
		default = false;
		example = true;
		description = lib.mdDoc ''
		Disable the coder/coder override in the Help: Getting Started page.
		'';
		type = lib.types.bool;
		};

		};
		};

		config = lib.mkIf cfg.enable {
		systemd.services.code-server = {
		description = "Code server";
		wantedBy = [ "multi-user.target" ];
		after = [ "network-online.target" ];
		path = cfg.extraPackages;
		environment = {
		HASHED_PASSWORD = cfg.hashedPassword;
		} // cfg.extraEnvironment;
		serviceConfig = {
		ExecStart = ''
		${lib.getExe cfg.package} \
		--auth=${cfg.auth} \
		--bind-addr=${cfg.host}:${toString cfg.port} \
		'' + lib.optionalString (cfg.socket != null) ''
		--socket=${cfg.socket} \
		'' + lib.optionalString (cfg.userDataDir != null) ''
		--user-data-dir=${cfg.userDataDir} \
		'' + lib.optionalString (cfg.extensionsDir != null) ''
		--extensions-dir=${cfg.extensionsDir} \
		'' + lib.optionalString (cfg.disableTelemetry == true) ''
		--disable-telemetry \
		'' + lib.optionalString (cfg.disableUpdateCheck == true) ''
		--disable-update-check \
		'' + lib.optionalString (cfg.disableFileDownloads == true) ''
		--disable-file-downloads \
		'' + lib.optionalString (cfg.disableWorkspaceTrust == true) ''
		--disable-workspace-trust \
		'' + lib.optionalString (cfg.disableGettingStartedOverride == true) ''
		--disable-getting-started-override \
		'' + lib.escapeShellArgs cfg.extraArguments;
		ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
		RuntimeDirectory = cfg.user;
		User = cfg.user;
		Group = cfg.group;
		Restart = "on-failure";
		};
		};

		users.users."${cfg.user}" = lib.mkMerge [
		(lib.mkIf (cfg.user == defaultUser) {
		isNormalUser = true;
		description = "code-server user";
		inherit (cfg) group;
		})
		{
		packages = cfg.extraPackages;
		inherit (cfg) extraGroups;
		}
		];

		users.groups."${defaultGroup}" = lib.mkIf (cfg.group == defaultGroup) { };
		};

		meta.maintainers = [ lib.maintainers.stackshadow ];
		}

nixos/tests/all-tests.nix

+0 −1

Original line number	Diff line number	Diff line
		@@ -192,7 +192,6 @@ in {
		cntr = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cntr.nix {};
		cockpit = handleTest ./cockpit.nix {};
		cockroachdb = handleTestOn ["x86_64-linux"] ./cockroachdb.nix {};
		code-server = handleTest ./code-server.nix {};
		coder = handleTest ./coder.nix {};
		collectd = handleTest ./collectd.nix {};
		connman = handleTest ./connman.nix {};