diff options
| author | ajs124 <git@ajs124.de> | 2022-10-04 15:59:54 +0200 |
|---|---|---|
| committer | ajs124 <git@ajs124.de> | 2023-04-04 10:32:26 +0200 |
| commit | 3acb3d73ae12e38dc69909b23efa36918232bd87 (patch) | |
| tree | 24d60f1eac941a6b9979e279991a3315368f15ee | |
| parent | *beat6: remove (diff) | |
| download | nixpkgs-3acb3d73ae12e38dc69909b23efa36918232bd87.tar.gz | |
elasticsearch-oss: remove
| -rw-r--r-- | nixos/tests/graylog.nix | 1 | ||||
| -rw-r--r-- | nixos/tests/parsedmarc/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
4 files changed, 2 insertions, 9 deletions
diff --git a/nixos/tests/graylog.nix b/nixos/tests/graylog.nix index 23f426fc7af9..3f7cc3a91439 100644 --- a/nixos/tests/graylog.nix +++ b/nixos/tests/graylog.nix @@ -8,7 +8,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { services.mongodb.enable = true; services.elasticsearch.enable = true; - services.elasticsearch.package = pkgs.elasticsearch-oss; services.elasticsearch.extraConf = '' network.publish_host: 127.0.0.1 network.bind_host: 127.0.0.1 diff --git a/nixos/tests/parsedmarc/default.nix b/nixos/tests/parsedmarc/default.nix index 837cf9d7e6dc..1feadcb7f39b 100644 --- a/nixos/tests/parsedmarc/default.nix +++ b/nixos/tests/parsedmarc/default.nix @@ -84,8 +84,6 @@ in }; }; - services.elasticsearch.package = pkgs.elasticsearch-oss; - environment.systemPackages = [ (sendEmail "dmarc@localhost") pkgs.jq @@ -158,8 +156,6 @@ in }; }; - services.elasticsearch.package = pkgs.elasticsearch-oss; - environment.systemPackages = [ pkgs.jq ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 15414418637a..2f61cd10a6a5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -411,6 +411,7 @@ mapAliases ({ elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # Added 2021-01-17 elasticsearch7-oss = throw "elasticsearch7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09 + elasticsearch-oss = throw "elasticsearch-oss has been removed because there is no oss version of elasticsearch anymore. Use opensearch instead."; # Added 2022-10-04 elasticsearch6 = throw "elasticsearch6 has been removed because it reached end of life"; # Added 2022-10-04 elasticsearch6-oss = throw "elasticsearch6-oss has been removed because it reached end of life"; # Added 2022-10-04 elasticsearch6Plugins = throw "elasticsearch6Plugins has been removed because it reached end of life"; # Added 2022-10-04 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e40b662ff91..eacd780a2f99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7153,12 +7153,9 @@ with pkgs; jre_headless = jdk11_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; elasticsearch = elasticsearch7; - elasticsearch-oss = elasticsearch7-oss; elasticsearchPlugins = recurseIntoAttrs ( - callPackage ../servers/search/elasticsearch/plugins.nix { - elasticsearch = elasticsearch-oss; - } + callPackage ../servers/search/elasticsearch/plugins.nix {} ); elasticsearch-curator = callPackage ../tools/admin/elasticsearch-curator { }; |