Unverified Commit 4fd1a2c8 authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #298600 from anthonyroussel/update/elasticsearch-curator 

elasticsearch-curator: 8.0.10 -> 8.0.12
parents 93975548 2ac8d672

pkgs/tools/admin/elasticsearch-curator/default.nix→pkgs/by-name/el/elasticsearch-curator/package.nix

+16 −14
Original line number Diff line number Diff line 
{ lib

, elasticsearch-curator

, fetchFromGitHub

, nix-update-script

, python3

, testers

}:



python3.pkgs.buildPythonApplication rec {

  pname = "elasticsearch-curator";

  version = "8.0.10";

  version = "8.0.12";

  format = "pyproject";



  src = fetchFromGitHub {

    owner = "elastic";

    repo = "curator";

    rev = "refs/tags/v${version}";

    hash = "sha256-hGG7lyrVviZSKTUo+AOPIutn/mxtDo+ewFxCRdj/jts=";

    hash = "sha256-CU/8l5607eKodcdpMKu0Wdlg+K6YnFX6uoDju12NDR0=";

  };



  postPatch = ''

    substituteInPlace pyproject.toml \

      --replace "elasticsearch8==" "elasticsearch8>=" \

      --replace "es_client==" "es_client>=" \

      --replace "ecs-logging==" "ecs-logging>=" \

      --replace "click==" "click>="\

      --replace "pyyaml==" "pyyaml>="

  '';



  nativeBuildInputs = with python3.pkgs; [

  build-system = with python3.pkgs; [

    hatchling

  ];



  propagatedBuildInputs = with python3.pkgs; [

  dependencies = with python3.pkgs; [

    certifi

    click

    ecs-logging
@@ -40,7 +34,6 @@ python3.pkgs.buildPythonApplication rec { 
  ];



  nativeCheckInputs = with python3.pkgs; [

    mock

    requests

    pytestCheckHook

  ];
@@ -76,6 +69,14 @@ python3.pkgs.buildPythonApplication rec { 
    "test_api_key_set"

  ];



  passthru = {

    tests.version = testers.testVersion {

      package = elasticsearch-curator;

      command = "${lib.getExe elasticsearch-curator} --version";

    };

    updateScript = nix-update-script { };

  };



  meta = with lib; {

    description = "Curate, or manage, your Elasticsearch indices and snapshots";

    homepage = "https://github.com/elastic/curator";
@@ -93,6 +94,7 @@ python3.pkgs.buildPythonApplication rec { 


      * Perform various actions on the items which remain in the actionable list.

    '';

    mainProgram = "curator";

    maintainers = with maintainers; [ basvandijk ];

  };

}

pkgs/development/python-modules/es-client/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -20,16 +20,16 @@ 


buildPythonPackage rec {

  pname = "es-client";

  version = "8.12.5";

  version = "8.12.8";

  pyproject = true;



  disabled = pythonOlder "3.7";

  disabled = pythonOlder "3.8";



  src = fetchFromGitHub {

    owner = "untergeek";

    repo = "es_client";

    rev = "refs/tags/v${version}";

    hash = "sha256-gaeNIxHnNulUOGhYHf9dIgBSh2rJIdsYdpPT8OTyEdg=";

    hash = "sha256-qv06zb3hIK/TeOZwtMXrV+n8mYSA/UKiyHvRyKEvZkQ=";

  };



  pythonRelaxDeps = true;

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -7866,8 +7866,6 @@ with pkgs; 
    callPackage ../servers/search/elasticsearch/plugins.nix {}

  );













  elasticsearch-curator = callPackage ../tools/admin/elasticsearch-curator { };



























  embree = callPackage ../development/libraries/embree { };















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