From 23264904d8b275ee00b7b6a724ca541ecf35e5e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sol=C3=A8ne=20Rapenne?= Date: Wed, 31 Aug 2022 15:15:02 +0200 Subject: [PATCH 1/2] zram module: rewording documentation to avoid misconception --- nixos/modules/config/zram.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix index 34e80df47a40..ab73eb544a07 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. ''; }; From ca4361d5ded27f8249a34545c7ef5116b8475b53 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 31 Aug 2022 08:46:41 +0100 Subject: [PATCH 2/2] dmd: disable whitespace-sensitive tests for binutils-2.39 Without the change two tests fail on `binutils-2.39` due to whitespace change in `objdump` output as: FAILED targets: - runnable/cdvecfill.sh - compilable/cdcmp.d Let's disable the tests until they are fixed upstream: https://issues.dlang.org/show_bug.cgi?id=23317 --- pkgs/development/compilers/dmd/default.nix | 5 +++++ 1 file changed, 5 insertions(+) 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