diff options
| -rw-r--r-- | nixos/tests/all-tests.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/hbase/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
3 files changed, 12 insertions, 14 deletions
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 011d7b11b4f86..ea526a5ecd783 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -245,8 +245,8 @@ in { haproxy = handleTest ./haproxy.nix {}; hardened = handleTest ./hardened.nix {}; healthchecks = handleTest ./web-apps/healthchecks.nix {}; - hbase1 = handleTest ./hbase.nix { package=pkgs.hbase1; }; hbase2 = handleTest ./hbase.nix { package=pkgs.hbase2; }; + hbase_2_4 = handleTest ./hbase.nix { package=pkgs.hbase_2_4; }; hbase3 = handleTest ./hbase.nix { package=pkgs.hbase3; }; hedgedoc = handleTest ./hedgedoc.nix {}; herbstluftwm = handleTest ./herbstluftwm.nix {}; diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix index 40b5dc7e0b65e..aa00fe80743ac 100644 --- a/pkgs/servers/hbase/default.nix +++ b/pkgs/servers/hbase/default.nix @@ -38,20 +38,19 @@ let common = { version, hash, jdk ? jdk11_headless, tests }: }; in { - hbase_1_7 = common { - version = "1.7.1"; - hash = "sha256-DrH2G79QLT8L0YTTmAGC9pUWU8semSaTOsrsQRCI2rY="; - jdk = jdk8_headless; - tests.standalone = nixosTests.hbase1; - }; hbase_2_4 = common { - version = "2.4.11"; - hash = "sha256-m0vjUtPaj8czHHh+rQNJJgrFAM744cHd06KE0ut7QeU="; + version = "2.4.15"; + hash = "sha256-KJXpfQ91POVd7ZnKQyIX5qzX4JIZqh3Zn2Pz0chW48g="; + tests.standalone = nixosTests.hbase_2_4; + }; + hbase_2_5 = common { + version = "2.5.1"; + hash = "sha256-ddSa4q43PSJv1W4lzzaXfv4LIThs4n8g8wYufHgsZVE="; tests.standalone = nixosTests.hbase2; }; hbase_3_0 = common { - version = "3.0.0-alpha-2"; - hash = "sha256-QPvgO1BeFWvMT5PdUm/SL92ZgvSvYIuJbzolbBTenz4="; + version = "3.0.0-alpha-3"; + hash = "sha256-TxuiUHc2pTb9nBth1H2XrDRLla2vqM+e1uBU+yY2/EM="; tests.standalone = nixosTests.hbase3; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b95a9bb2f5b19..93170054a0413 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23121,9 +23121,8 @@ with pkgs; hasura-cli = callPackage ../servers/hasura/cli.nix { }; - inherit (callPackage ../servers/hbase {}) hbase_1_7 hbase_2_4 hbase_3_0; - hbase1 = hbase_1_7; - hbase2 = hbase_2_4; + inherit (callPackage ../servers/hbase {}) hbase_2_4 hbase_2_5 hbase_3_0; + hbase2 = hbase_2_5; hbase3 = hbase_3_0; hbase = hbase2; # when updating, point to the latest stable release |