From 814015be43ead7f61d0d3c9a7e9c4d17449021cc Mon Sep 17 00:00:00 2001 From: illustris Date: Fri, 20 Dec 2024 12:10:24 +0530 Subject: [PATCH 1/2] nixos/hadoop: fix HBase --- nixos/modules/services/cluster/hadoop/hbase.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/cluster/hadoop/hbase.nix b/nixos/modules/services/cluster/hadoop/hbase.nix index 43b8ff79168d..1d63530406c2 100644 --- a/nixos/modules/services/cluster/hadoop/hbase.nix +++ b/nixos/modules/services/cluster/hadoop/hbase.nix @@ -57,7 +57,9 @@ let systemd.services."hbase-${lib.toLower name}" = { description = "HBase ${name}"; wantedBy = [ "multi-user.target" ]; - path = with cfg; [ hbase.package ] ++ optional (with cfg.hbase.master; enable && initHDFS) package; + path = + with cfg; + [ hbase.package ] ++ lib.optional (with cfg.hbase.master; enable && initHDFS) package; preStart = lib.mkIf (with cfg.hbase.master; enable && initHDFS) ( lib.concatStringsSep "\n" ( map (x: "HADOOP_USER_NAME=hdfs hdfs --config /etc/hadoop-conf ${x}") [ From 0a9e59f6a4094e1ae32997a063e6badf29712239 Mon Sep 17 00:00:00 2001 From: illustris Date: Fri, 20 Dec 2024 12:22:07 +0530 Subject: [PATCH 2/2] HBase: 2.5.9 -> 2.5.10, 2.6.0 -> 2.6.1 --- pkgs/servers/hbase/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix index be4396a2d56b..5d924252d1e9 100644 --- a/pkgs/servers/hbase/default.nix +++ b/pkgs/servers/hbase/default.nix @@ -51,13 +51,13 @@ in tests.standalone = nixosTests.hbase_2_4; }; hbase_2_5 = common { - version = "2.5.9"; - hash = "sha256-rJGeJ9zmUn28q1Sfk5cdEdEZxbAnvFjRjdcTCx9x1Qc="; + version = "2.5.10"; + hash = "sha256-uYc5IZGQdLOm5gAEyyGtJtcgf+GxADEEuxjixZbG3Qs="; tests.standalone = nixosTests.hbase_2_5; }; hbase_2_6 = common { - version = "2.6.0"; - hash = "sha256-zjQ5HgUCiHmrMQuyMN4IAuLR0fVrJ+YKDUfPQb05Dp4="; + version = "2.6.1"; + hash = "sha256-dubu/4Ilk82NtNEcKt8uLbcH8n81EncxOvkZOwk2kVA="; tests.standalone = nixosTests.hbase2; }; hbase_3_0 = common {