mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 07:00:43 +00:00
Code Issues Wiki Activity

elasticsearch6: new default version

Browse source
This commit is contained in:
Jörg Thalheim 2018-08-03 09:42:53 +01:00
parent f644675bc9
commit bedf471a08
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/search/elasticsearch.nix
View file

@ -58,8 +58,8 @@ in {
package = mkOption {
description = "Elasticsearch package to use.";
default = pkgs.elasticsearch2;
defaultText = "pkgs.elasticsearch2";
default = pkgs.elasticsearch;
defaultText = "pkgs.elasticsearch";
type = types.package;
};

0
pkgs/servers/search/elasticsearch/6.x.nix → pkgs/servers/search/elasticsearch/default.nix
View file

8
pkgs/top-level/all-packages.nix
View file

@ -2272,13 +2272,15 @@ with pkgs;
elk5Version = "5.6.9";
elk6Version = "6.3.2";
elasticsearch = callPackage ../servers/search/elasticsearch { };
elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { };
elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { };
elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { };
elasticsearch6-oss = callPackage ../servers/search/elasticsearch/6.x.nix {
elasticsearch6 = callPackage ../servers/search/elasticsearch { };
elasticsearch6-oss = callPackage ../servers/search/elasticsearch {
enableUnfree = false;
};
elasticsearch = elasticsearch6;
elasticsearch-oss = elasticsearch6-oss;
elasticsearchPlugins = recurseIntoAttrs (
callPackage ../servers/search/elasticsearch/plugins.nix { }