diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-11-21 00:01:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-21 00:01:46 +0000 |
| commit | 43d088886e7d37a96b9f0dea97d5d3778f85c75b (patch) | |
| tree | c9807fce7d52ef02624fd422000b588eb0c8d48b /nixos | |
| parent | f515d91189c208e5e3ca47687d3bceed2a2fec49 (diff) | |
| parent | 6aded65e28c8805bfb81e6b5fc1613633480eb16 (diff) | |
| download | nixpkgs-43d088886e7d37a96b9f0dea97d5d3778f85c75b.tar nixpkgs-43d088886e7d37a96b9f0dea97d5d3778f85c75b.tar.gz nixpkgs-43d088886e7d37a96b9f0dea97d5d3778f85c75b.tar.bz2 nixpkgs-43d088886e7d37a96b9f0dea97d5d3778f85c75b.tar.lz nixpkgs-43d088886e7d37a96b9f0dea97d5d3778f85c75b.tar.xz nixpkgs-43d088886e7d37a96b9f0dea97d5d3778f85c75b.tar.zst nixpkgs-43d088886e7d37a96b9f0dea97d5d3778f85c75b.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/databases/hbase.nix | 5 | ||||
| -rw-r--r-- | nixos/tests/hibernate.nix | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/nixos/modules/services/databases/hbase.nix b/nixos/modules/services/databases/hbase.nix index 183c8a2f46d..181be2d6b0b 100644 --- a/nixos/modules/services/databases/hbase.nix +++ b/nixos/modules/services/databases/hbase.nix @@ -22,7 +22,10 @@ let configAttr)); configFile = pkgs.writeText "hbase-site.xml" - (buildProperty (defaultConfig // cfg.settings)); + ''<configuration> + ${buildProperty (defaultConfig // cfg.settings)} + </configuration> + ''; configDir = pkgs.runCommand "hbase-config-dir" { preferLocalBuild = true; } '' mkdir -p $out diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix index 4f05b99a5a1..fc6857e2fd0 100644 --- a/nixos/tests/hibernate.nix +++ b/nixos/tests/hibernate.nix @@ -51,6 +51,7 @@ in makeTest { connect-timeout = 1 ''; + virtualisation.memorySize = 2048; virtualisation.diskSize = 8 * 1024; virtualisation.emptyDiskImages = [ # Small root disk for installer |