From 5cf4e4a70ea305be8f1f425e4bc009bf10ebf472 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 18 Sep 2025 12:37:08 -0700 Subject: [PATCH] nixVersions.nixComponents_git.nix-functional-tests: disable two tests broken because of the state of staging -> master --- .../nix/modular/tests/functional/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/package-management/nix/modular/tests/functional/package.nix b/pkgs/tools/package-management/nix/modular/tests/functional/package.nix index c6963ba3298a..6beb61c945a7 100644 --- a/pkgs/tools/package-management/nix/modular/tests/functional/package.nix +++ b/pkgs/tools/package-management/nix/modular/tests/functional/package.nix @@ -15,6 +15,7 @@ nix-store, nix-expr, nix-cli, + toml11, busybox-sandbox-shell ? null, @@ -72,6 +73,13 @@ mkMesonDerivation ( echo $PWD | grep tests/functional ''; + # `toml11` upgrade causes these to fail in 2.32+: https://github.com/NixOS/nixpkgs/pull/442682 + # Remove when that PR lands in master. + ${if lib.versionAtLeast (lib.versions.majorMinor version) "2.32" then "preCheck" else null} = + lib.optionalString (lib.versionOlder toml11.version "4.0") '' + rm -f ../lang/eval-fail-fromTOML-{over,under}flow* + ''; + mesonCheckFlags = [ "--print-errorlogs" ];