Merge pull request #33774 from LumiGuide/elasticsearch-curator-5.4.1-cleanup

Elasticsearch curator 5.4.1 cleanup
This commit is contained in:
Frederik Rietdijk 2018-01-14 15:00:02 +01:00 committed by GitHub
commit 4475995685
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 25 deletions

View File

@ -16,7 +16,6 @@
buildPythonPackage rec {
pname = "elasticsearch-curator";
version = "5.4.1";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

View File

@ -0,0 +1,29 @@
{ buildPythonPackage
, fetchPypi
, urllib3, requests
, nosexcover, mock
, stdenv
}:
buildPythonPackage (rec {
pname = "elasticsearch";
version = "6.0.0";
src = fetchPypi {
inherit pname version;
sha256 = "029q603g95fzkh87xkbxxmjfq5s9xkr9y27nfik6d4prsl0zxmlz";
};
# Check is disabled because running them destroy the content of the local cluster!
# https://github.com/elasticsearch/elasticsearch-py/tree/master/test_elasticsearch
doCheck = false;
propagatedBuildInputs = [ urllib3 requests ];
buildInputs = [ nosexcover mock ];
meta = with stdenv.lib; {
description = "Official low-level client for Elasticsearch";
homepage = https://github.com/elasticsearch/elasticsearch-py;
license = licenses.asl20;
maintainers = with maintainers; [ desiderius ];
};
})

View File

@ -3,7 +3,6 @@
buildPythonPackage rec {
pname = "voluptuous";
version = "0.10.5";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;

View File

@ -4427,29 +4427,7 @@ in {
edward = callPackage ../development/python-modules/edward { };
elasticsearch = buildPythonPackage (rec {
pname = "elasticsearch";
version = "6.0.0";
name = "${pname}-${version}";
src = fetchPypi {
inherit pname version;
sha256 = "029q603g95fzkh87xkbxxmjfq5s9xkr9y27nfik6d4prsl0zxmlz";
};
# Check is disabled because running them destroy the content of the local cluster!
# https://github.com/elasticsearch/elasticsearch-py/tree/master/test_elasticsearch
doCheck = false;
propagatedBuildInputs = with self; [ urllib3 requests ];
buildInputs = with self; [ nosexcover mock ];
meta = {
description = "Official low-level client for Elasticsearch";
homepage = https://github.com/elasticsearch/elasticsearch-py;
license = licenses.asl20;
maintainers = with maintainers; [ desiderius ];
};
});
elasticsearch = callPackage ../development/python-modules/elasticsearch { };
elasticsearchdsl = buildPythonPackage (rec {
name = "elasticsearch-dsl-0.0.9";