Skip to content

Commit

Permalink
elasticsearch-curator: add top-level package using older click
Browse files Browse the repository at this point in the history
See NixOS#58023 for a discussion
of why this is necessary. The upstream issue can be found at
elastic/curator#1280.
  • Loading branch information
Robert Schütz committed Mar 21, 2019
1 parent 0b87a56 commit c0409de
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
2 changes: 1 addition & 1 deletion nixos/modules/services/search/elasticsearch-curator.nix
Expand Up @@ -86,7 +86,7 @@ in {
startAt = cfg.interval;
serviceConfig = {
ExecStart =
"${pkgs.python3Packages.elasticsearch-curator}/bin/curator" +
"${pkgs.elasticsearch-curator}/bin/curator" +
" --config ${curatorConfig} ${curatorAction}";
};
};
Expand Down
Expand Up @@ -45,13 +45,6 @@ buildPythonPackage rec {
funcsigs
];

postPatch = ''
substituteInPlace setup.cfg \
--replace 'click>=6.7,<7.0' 'click'
substituteInPlace setup.py \
--replace 'click>=6.7,<7.0' 'click'
'';

meta = with stdenv.lib; {
homepage = https://github.com/elastic/curator;
description = "Curate, or manage, your Elasticsearch indices and snapshots";
Expand All @@ -69,5 +62,8 @@ buildPythonPackage rec {
* Perform various actions on the items which remain in the actionable list.
'';
maintainers = with maintainers; [ basvandijk ];

# https://github.com/elastic/curator/pull/1280
broken = versionAtLeast click.version "7.0";
};
}
12 changes: 12 additions & 0 deletions pkgs/top-level/all-packages.nix
Expand Up @@ -2534,6 +2534,18 @@ in
callPackage ../servers/search/elasticsearch/plugins.nix { }
);

elasticsearch-curator = with (python3.override {
packageOverrides = self: super: {
click = super.click.overridePythonAttrs (oldAttrs: rec {
version = "6.7";
src = oldAttrs.src.override {
inherit version;
sha256 = "f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b";
};
});
};
}).pkgs; toPythonApplication elasticsearch-curator;

embree2 = callPackage ../development/libraries/embree/2.x.nix { };

emem = callPackage ../applications/misc/emem { };
Expand Down

0 comments on commit c0409de

Please sign in to comment.