Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main

1 files changed, 5 insertions, 4 deletions

diff --git a/infra/libkookie/nixpkgs/pkgs/development/python-modules/yq/default.nix b/infra/libkookie/nixpkgs/pkgs/development/python-modules/yq/default.nix
index 610876392651..b3e651fd2b0e 100644
--- a/infra/libkookie/nixpkgs/pkgs/development/python-modules/yq/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/development/python-modules/yq/default.nix
@@ -10,7 +10,6 @@
 , flake8
 , jq
 , pytest
-, unixtools
 , toml
 }:
 
@@ -23,6 +22,10 @@ buildPythonPackage rec {
     sha256 = "1q4rky0a6n4izmq7slb91a54g8swry1xrbfqxwc8lkd3hhvlxxkl";
   };
 
+  postPatch = ''
+    substituteInPlace test/test.py --replace "expect_exit_codes={0} if sys.stdin.isatty() else {2}" "expect_exit_codes={0}"
+  '';
+
   propagatedBuildInputs = [
     pyyaml
     xmltodict
@@ -32,7 +35,6 @@ buildPythonPackage rec {
   doCheck = true;
 
   checkInputs = [
-   unixtools.script
    pytest
    coverage
    flake8
@@ -40,8 +42,7 @@ buildPythonPackage rec {
    toml
   ];
 
-  # tests fails if stdin is not a tty
-  checkPhase = "echo | script -c 'pytest ./test/test.py'";
+  checkPhase = "pytest ./test/test.py";
 
   pythonImportsCheck = [ "yq" ];