public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

elasticsearch-curator: add top-level package using older click

Browse Source 
See https://github.com/NixOS/nixpkgs/pull/58023 for a discussion
of why this is necessary. The upstream issue can be found at
https://github.com/elastic/curator/pull/1280.
This commit is contained in:
Robert Schütz 2019-03-21 11:44:08 +01:00
parent 0b87a56015
commit c0409de98d
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/search/elasticsearch-curator.nix
View File

@ -86,7 +86,7 @@ in {
startAt = cfg.interval; startAt = cfg.interval;
serviceConfig = { serviceConfig = {
ExecStart = ExecStart =
"${pkgs.python3Packages.elasticsearch-curator}/bin/curator" + "${pkgs.elasticsearch-curator}/bin/curator" +
" --config ${curatorConfig} ${curatorAction}"; " --config ${curatorConfig} ${curatorAction}";
}; };
}; };

10
pkgs/development/python-modules/elasticsearch-curator/default.nix
View File

@ -45,13 +45,6 @@ buildPythonPackage rec {
funcsigs 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; { meta = with stdenv.lib; {
homepage = https://github.com/elastic/curator; homepage = https://github.com/elastic/curator;
description = "Curate, or manage, your Elasticsearch indices and snapshots"; description = "Curate, or manage, your Elasticsearch indices and snapshots";
@ -69,5 +62,8 @@ buildPythonPackage rec {
* Perform various actions on the items which remain in the actionable list. * Perform various actions on the items which remain in the actionable list.
''; '';
maintainers = with maintainers; [ basvandijk ]; maintainers = with maintainers; [ basvandijk ];
# https://github.com/elastic/curator/pull/1280
broken = versionAtLeast click.version "7.0";
}; };
} }

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

@ -2534,6 +2534,18 @@ in
callPackage ../servers/search/elasticsearch/plugins.nix { } 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 { }; embree2 = callPackage ../development/libraries/embree/2.x.nix { };
emem = callPackage ../applications/misc/emem { }; emem = callPackage ../applications/misc/emem { };