diff --git a/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix index b162fbc311e3..cc2ca6314433 100644 --- a/nixos/modules/config/zram.nix +++ b/nixos/modules/config/zram.nix @@ -73,10 +73,10 @@ in default = 50; type = types.int; description = lib.mdDoc '' - Maximum amount of memory that can be used by the zram swap devices + Maximum total amount of memory that can be stored in the zram swap devices (as a percentage of your total memory). Defaults to 1/2 of your total - RAM. Run `zramctl` to check how good memory is - compressed. + RAM. Run `zramctl` to check how good memory is compressed. + This doesn't define how much memory will be used by the zram swap devices. ''; }; @@ -84,8 +84,9 @@ in default = null; type = with types; nullOr int; description = lib.mdDoc '' - Maximum total amount of memory (in bytes) that can be used by the zram + Maximum total amount of memory (in bytes) that can be stored in the zram swap devices. + This doesn't define how much memory will be used by the zram swap devices. ''; }; diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 4565128f52b0..1c15e8b970b7 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -84,6 +84,11 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs . + + # Disable tests that rely on objdump whitespace until fixed upstream: + # https://issues.dlang.org/show_bug.cgi?id=23317 + rm dmd/test/runnable/cdvecfill.sh + rm dmd/test/compilable/cdcmp.d '' # This one has tested against a hardcoded year, then against a current year on