From 51575400a3291441bffcbcd7ab240ba516d0b6b1 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 3 Feb 2025 19:11:59 +0300 Subject: [PATCH] buildPython*: fix mismerge --- pkgs/development/interpreters/python/mk-python-derivation.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index a5392dbbdc2f..3e0cbdcb4212 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -437,11 +437,9 @@ let } // optionalAttrs (attrs.doCheck or true) ( optionalAttrs (disabledTestPaths != [ ]) { - disabledTestPaths = escapeShellArgs disabledTestPaths; + disabledTestPaths = disabledTestPaths; } // optionalAttrs (attrs ? disabledTests) { - # `escapeShellArgs` should be used as well as `disabledTestPaths`, - # but some packages rely on existing raw strings. disabledTests = attrs.disabledTests; } // optionalAttrs (attrs ? pytestFlags) {