ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 06:45:54 +03:00
Code Issues Projects Releases Wiki Activity

elasticsearch-oss: remove

Browse Source
This commit is contained in:
ajs124 2022-10-04 15:59:54 +02:00
parent 426fbcb5a6
commit 3acb3d73ae
4 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/tests/graylog.nix
View File

@ -8,7 +8,6 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
services.mongodb.enable = true; services.mongodb.enable = true;
services.elasticsearch.enable = true; services.elasticsearch.enable = true;
services.elasticsearch.package = pkgs.elasticsearch-oss;
services.elasticsearch.extraConf = '' services.elasticsearch.extraConf = ''
network.publish_host: 127.0.0.1 network.publish_host: 127.0.0.1
network.bind_host: 127.0.0.1 network.bind_host: 127.0.0.1

4
nixos/tests/parsedmarc/default.nix
View File

@ -84,8 +84,6 @@ in
}; };
}; };
services.elasticsearch.package = pkgs.elasticsearch-oss;
environment.systemPackages = [ environment.systemPackages = [
(sendEmail "dmarc@localhost") (sendEmail "dmarc@localhost")
pkgs.jq pkgs.jq
@ -158,8 +156,6 @@ in
}; };
}; };
services.elasticsearch.package = pkgs.elasticsearch-oss;
environment.systemPackages = [ environment.systemPackages = [
pkgs.jq pkgs.jq
]; ];

1
pkgs/top-level/aliases.nix
View File

@ -411,6 +411,7 @@ mapAliases ({
elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # Added 2021-01-17 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 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 = 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 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 elasticsearch6Plugins = throw "elasticsearch6Plugins has been removed because it reached end of life"; # Added 2022-10-04

5
pkgs/top-level/all-packages.nix
View File

@ -7153,12 +7153,9 @@ with pkgs;
jre_headless = jdk11_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 jre_headless = jdk11_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
}; };
elasticsearch = elasticsearch7; elasticsearch = elasticsearch7;
elasticsearch-oss = elasticsearch7-oss;
elasticsearchPlugins = recurseIntoAttrs ( elasticsearchPlugins = recurseIntoAttrs (
callPackage ../servers/search/elasticsearch/plugins.nix { callPackage ../servers/search/elasticsearch/plugins.nix {}
elasticsearch = elasticsearch-oss;
}
); );
elasticsearch-curator = callPackage ../tools/admin/elasticsearch-curator { }; elasticsearch-curator = callPackage ../tools/admin/elasticsearch-curator { };