From b513fc742038b50f348f30d6f833011630d20c04 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Thu, 21 Dec 2017 22:06:11 +0100 Subject: [PATCH 1/4] python.pkgs.voluptuous: init at 0.10.5 Needed by elasticsearch-curator. --- .../python-modules/voluptuous/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 1 + 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/python-modules/voluptuous/default.nix diff --git a/pkgs/development/python-modules/voluptuous/default.nix b/pkgs/development/python-modules/voluptuous/default.nix new file mode 100644 index 000000000000..250a0951d96c --- /dev/null +++ b/pkgs/development/python-modules/voluptuous/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, nose }: + +buildPythonPackage rec { + pname = "voluptuous"; + version = "0.10.5"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "15i3gaap8ilhpbah1ffc6q415wkvliqxilc6s69a4rinvkw6cx3s"; + }; + + checkInputs = [ nose ]; + + meta = with stdenv.lib; { + description = "Voluptuous is a Python data validation library"; + homepage = http://alecthomas.github.io/voluptuous/; + license = licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 91943c87fe69..2929145cf268 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23290,6 +23290,7 @@ EOF ephem = callPackage ../development/python-modules/ephem { }; + voluptuous = callPackage ../development/python-modules/voluptuous { }; }); in fix' (extends overrides packages) From f0c4bea507f5bd96e447d121b4eda1c7cfd26139 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 21 Dec 2017 23:38:57 +0000 Subject: [PATCH 2/4] python.pkgs.pyelasticsearch: delete because it requires python.pkgs.elasticsearch 1.x.y, which is compatible only with the ancient Elasticsearch 1. --- pkgs/top-level/python-packages.nix | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2929145cf268..a13e291c6514 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14328,26 +14328,6 @@ in { }; }; - pyelasticsearch = buildPythonPackage (rec { - name = "pyelasticsearch-1.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pyelasticsearch/${name}.tar.gz"; - sha256 = "18wp6llfjv6hvyhr3f6i8dm9wc5rf46wiqsfxwpvnf6mdrvk6xr7"; - }; - - # Tests require a local instance of elasticsearch - doCheck = false; - propagatedBuildInputs = with self; [ elasticsearch six simplejson certifi ]; - buildInputs = with self; [ nose mock ]; - - meta = { - description = "A clean, future-proof, high-scale API to elasticsearch"; - homepage = https://pyelasticsearch.readthedocs.org; - license = licenses.bsd3; - }; - }); - pyelftools = buildPythonPackage rec { pname = "pyelftools"; version = "0.24"; From d513afcfc7850d0b3555eaad18f86c33f0865921 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Thu, 21 Dec 2017 22:07:26 +0100 Subject: [PATCH 3/4] python.pkgs.elasticsearch: 1.9.0 -> 6.0.0 --- pkgs/top-level/python-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a13e291c6514..8bb43b011d32 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4598,11 +4598,13 @@ in { edward = callPackage ../development/python-modules/edward { }; elasticsearch = buildPythonPackage (rec { - name = "elasticsearch-1.9.0"; + pname = "elasticsearch"; + version = "6.0.0"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/e/elasticsearch/${name}.tar.gz"; - sha256 = "091s60ziwhyl9kjfm833i86rcpjx46v9h16jkgjgkk5441dln3gb"; + src = fetchPypi { + inherit pname version; + sha256 = "029q603g95fzkh87xkbxxmjfq5s9xkr9y27nfik6d4prsl0zxmlz"; }; # Check is disabled because running them destroy the content of the local cluster! @@ -4619,7 +4621,6 @@ in { }; }); - elasticsearchdsl = buildPythonPackage (rec { name = "elasticsearch-dsl-0.0.9"; From 85ee9df0e16935b742dfc6361f2461a31bc05ec7 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Thu, 21 Dec 2017 22:09:41 +0100 Subject: [PATCH 4/4] python.pkgs.elasticsearch-curator: init at 5.4.1 --- .../elasticsearch-curator/default.nix | 65 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/development/python-modules/elasticsearch-curator/default.nix diff --git a/pkgs/development/python-modules/elasticsearch-curator/default.nix b/pkgs/development/python-modules/elasticsearch-curator/default.nix new file mode 100644 index 000000000000..bbd2904fd9ee --- /dev/null +++ b/pkgs/development/python-modules/elasticsearch-curator/default.nix @@ -0,0 +1,65 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, click +, certifi +, voluptuous +, pyyaml +, elasticsearch +, nosexcover +, coverage +, nose +, mock +, funcsigs +} : + +buildPythonPackage rec { + pname = "elasticsearch-curator"; + version = "5.4.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bhiqa61h6bbrfp0aygwwchr785x281hnwk8qgnjhb8g4r8ppr3s"; + }; + + # The integration tests require a running elasticsearch cluster. + postUnpackPhase = '' + rm -r test/integration + ''; + + propagatedBuildInputs = [ + click + certifi + voluptuous + pyyaml + elasticsearch + ]; + + checkInputs = [ + nosexcover + coverage + nose + mock + funcsigs + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/elastic/curator; + description = "Curate, or manage, your Elasticsearch indices and snapshots"; + license = licenses.asl20; + longDescription = '' + Elasticsearch Curator helps you curate, or manage, your Elasticsearch + indices and snapshots by: + + * Obtaining the full list of indices (or snapshots) from the cluster, as the + actionable list + + * Iterate through a list of user-defined filters to progressively remove + indices (or snapshots) from this actionable list as needed. + + * Perform various actions on the items which remain in the actionable list. + ''; + maintainers = with maintainers; [ basvandijk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8bb43b011d32..2970edf52293 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4643,6 +4643,8 @@ in { }; }); + elasticsearch-curator = callPackage ../development/python-modules/elasticsearch-curator { }; + entrypoints = callPackage ../development/python-modules/entrypoints { }; enzyme = callPackage ../development/python-modules/enzyme {};