diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 0852f2350e1d..29db0c948cea 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -408,6 +408,7 @@ in { headscale = handleTest ./headscale.nix {}; healthchecks = handleTest ./web-apps/healthchecks.nix {}; hbase2 = handleTest ./hbase.nix { package=pkgs.hbase2; }; + hbase_2_5 = handleTest ./hbase.nix { package=pkgs.hbase_2_5; }; hbase_2_4 = handleTest ./hbase.nix { package=pkgs.hbase_2_4; }; hbase3 = handleTest ./hbase.nix { package=pkgs.hbase3; }; hddfancontrol = handleTest ./hddfancontrol.nix {}; diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix index a93677e9545c..401ebef8bd2b 100644 --- a/pkgs/servers/hbase/default.nix +++ b/pkgs/servers/hbase/default.nix @@ -39,18 +39,23 @@ let common = { version, hash, jdk ? jdk11_headless, tests }: in { hbase_2_4 = common { - version = "2.4.17"; - hash = "sha256-1JT57kpp+dqoXY5ZZig1nHDtSqvfLjEWviu73J7hKj0="; + version = "2.4.18"; + hash = "sha256-zYrHAxzlPRrRchHGVp3fhQT0BD0+wavZ4cAWncrv+MQ="; tests.standalone = nixosTests.hbase_2_4; }; hbase_2_5 = common { - version = "2.5.4"; - hash = "sha256-/7kp0f/K8DCeFheDPzs2ZFqcnZwQtH1rrMx+UMbQ7TM="; + version = "2.5.9"; + hash = "sha256-rJGeJ9zmUn28q1Sfk5cdEdEZxbAnvFjRjdcTCx9x1Qc="; + tests.standalone = nixosTests.hbase_2_5; + }; + hbase_2_6 = common { + version = "2.6.0"; + hash = "sha256-zjQ5HgUCiHmrMQuyMN4IAuLR0fVrJ+YKDUfPQb05Dp4="; tests.standalone = nixosTests.hbase2; }; hbase_3_0 = common { - version = "3.0.0-alpha-3"; - hash = "sha256-TxuiUHc2pTb9nBth1H2XrDRLla2vqM+e1uBU+yY2/EM="; + version = "3.0.0-beta-1"; + hash = "sha256-lmeaH2gDP6sBwZpzROKhR2Je7dcrwnq7qlMUh0B5fZs="; tests.standalone = nixosTests.hbase3; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cad427f99100..02d3d04f02df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25419,8 +25419,8 @@ with pkgs; hasura-cli = callPackage ../servers/hasura/cli.nix { }; - inherit (callPackage ../servers/hbase {}) hbase_2_4 hbase_2_5 hbase_3_0; - hbase2 = hbase_2_5; + inherit (callPackage ../servers/hbase {}) hbase_2_4 hbase_2_5 hbase_2_6 hbase_3_0; + hbase2 = hbase_2_6; hbase3 = hbase_3_0; hbase = hbase2; # when updating, point to the latest stable release