Unverified Commit 02e08e63 authored by leiserfg's avatar leiserfg
Browse files

kitty: refactor add patch to solve darwin test errors

parent 71b99a1d

pkgs/by-name/ki/kitty/fix_setup.patch

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
diff --git a/setup.py b/setup.py

index 9e9c3f177..8183a3b69 100755

--- a/setup.py

+++ b/setup.py

@@ -1778,7 +1778,7 @@ def repl(name: str, raw: str, defval: Union[str, float, FrozenSet[str]], val: Un

             return raw

         tname = type(defval).__name__

         if tname == 'frozenset':

-            tname = 'typing.FrozenSet[str]'

+            tname = 'frozenset[str]'

         prefix = f'{name}: {tname} ='

         nraw = raw.replace(f'{prefix} {defval!r}', f'{prefix} {val!r}', 1)

         if nraw == raw:

pkgs/by-name/ki/kitty/package.nix

+12 −2
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
  makeBinaryWrapper,

  autoSignDarwinBinariesHook,

  cairo,

  fetchpatch,

}:



with python3Packages;
@@ -159,8 +160,17 @@ buildPythonApplication rec { 
    # OSError: master_fd is in error condition

    ./disable-test_ssh_bootstrap_with_different_launchers.patch



    # Temporary fix for setup.py until it's merged upstream

    ./fix_setup.patch

    # Remove after 0.40.1

    (fetchpatch {

      url = "https://github.com/kovidgoyal/kitty/commit/6171ca6.patch";

      hash = "sha256-OBB0YcgEYgw3Jcg+Dgus6rwQ4gGL6GMr6pd7m9CGq9k=";

    })



    (fetchpatch {

      url = "https://github.com/kovidgoyal/kitty/commit/8cbdd003e2.patch";

      hash = "sha256-pKIJIqIdPfB4kQ6FtpYDumpgjJkMxoLT8fKzfgWYJnw=";

    })



  ];



  hardeningDisable = [