Merge pull request #193740 from illustris/hbase

hbase: remove 1.7, 2.4.11 -> 2.4.15, init 2.5.1, 3.0.0-alpha-2 -> alpha-3

authored by Martin Weinelt and committed by GitHub 218e2f5e 476988ab

+12 -14
+1 -1
nixos/tests/all-tests.nix
··· 252 252 haproxy = handleTest ./haproxy.nix {}; 253 253 hardened = handleTest ./hardened.nix {}; 254 254 healthchecks = handleTest ./web-apps/healthchecks.nix {}; 255 - hbase1 = handleTest ./hbase.nix { package=pkgs.hbase1; }; 256 255 hbase2 = handleTest ./hbase.nix { package=pkgs.hbase2; }; 256 + hbase_2_4 = handleTest ./hbase.nix { package=pkgs.hbase_2_4; }; 257 257 hbase3 = handleTest ./hbase.nix { package=pkgs.hbase3; }; 258 258 hedgedoc = handleTest ./hedgedoc.nix {}; 259 259 herbstluftwm = handleTest ./herbstluftwm.nix {};
+9 -10
pkgs/servers/hbase/default.nix
··· 38 38 }; 39 39 in 40 40 { 41 - hbase_1_7 = common { 42 - version = "1.7.1"; 43 - hash = "sha256-DrH2G79QLT8L0YTTmAGC9pUWU8semSaTOsrsQRCI2rY="; 44 - jdk = jdk8_headless; 45 - tests.standalone = nixosTests.hbase1; 41 + hbase_2_4 = common { 42 + version = "2.4.15"; 43 + hash = "sha256-KJXpfQ91POVd7ZnKQyIX5qzX4JIZqh3Zn2Pz0chW48g="; 44 + tests.standalone = nixosTests.hbase_2_4; 46 45 }; 47 - hbase_2_4 = common { 48 - version = "2.4.11"; 49 - hash = "sha256-m0vjUtPaj8czHHh+rQNJJgrFAM744cHd06KE0ut7QeU="; 46 + hbase_2_5 = common { 47 + version = "2.5.1"; 48 + hash = "sha256-ddSa4q43PSJv1W4lzzaXfv4LIThs4n8g8wYufHgsZVE="; 50 49 tests.standalone = nixosTests.hbase2; 51 50 }; 52 51 hbase_3_0 = common { 53 - version = "3.0.0-alpha-2"; 54 - hash = "sha256-QPvgO1BeFWvMT5PdUm/SL92ZgvSvYIuJbzolbBTenz4="; 52 + version = "3.0.0-alpha-3"; 53 + hash = "sha256-TxuiUHc2pTb9nBth1H2XrDRLla2vqM+e1uBU+yY2/EM="; 55 54 tests.standalone = nixosTests.hbase3; 56 55 }; 57 56 }
+2 -3
pkgs/top-level/all-packages.nix
··· 23713 23713 23714 23714 hasura-cli = callPackage ../servers/hasura/cli.nix { }; 23715 23715 23716 - inherit (callPackage ../servers/hbase {}) hbase_1_7 hbase_2_4 hbase_3_0; 23717 - hbase1 = hbase_1_7; 23718 - hbase2 = hbase_2_4; 23716 + inherit (callPackage ../servers/hbase {}) hbase_2_4 hbase_2_5 hbase_3_0; 23717 + hbase2 = hbase_2_5; 23719 23718 hbase3 = hbase_3_0; 23720 23719 hbase = hbase2; # when updating, point to the latest stable release 23721 23720