kitty: darwin-fix #338033
Merged
kitty: darwin-fix #338033
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Closed
Closed
|
I pulled your PR into my branch with an additional fix for the package (disabling some failing tests for darwin), and I can confirm that this works in my environment. (The branch for your reference: https://github.com/booxter/nixpkgs/tree/fix-kitty-and-darwin-tests) |
|
I believe this is the relevant code causing the nerd fonts build failure: https://github.com/kovidgoyal/kitty/blob/8eb0b556b7651036f804b034c3960cd52a04c5e3/setup.py#L857 The error is not generated by |
The font is either finded by fontconfig, or from a local folder, I just copied it to the folder and that works in all platforms. |
rvolosatovs
reviewed
Aug 29, 2024
|
|
||
| # Add the font by hand because fontconfig does not finds it in darwin | ||
| mkdir ./fonts/ | ||
| cp "${(nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})}/share/fonts/truetype/NerdFonts/SymbolsNerdFontMono-Regular.ttf" ./fonts/ |
There was a problem hiding this comment.
I'm using kitty from nixpkgs-24.05-darwin branch and I have not encountered any issues in this regard with the existing derivation.
How could I reproduce the issue being fixed here?
There was a problem hiding this comment.
I'm not using macos, but someone is complaining about it here:
#337987
There was a problem hiding this comment.
I was able to reproduce this error on a Mac and fix it using this PR, however, the build still failed due to a failing test:
kitty> test_utf_8_strndup (kitty_tests.glfw.TestGLFW.test_utf_8_strndup) ... skipped 'Skipping test on macOS because glfw-cocoa.so is not built with backend_utils'
kitty> ======================================================================
kitty> ERROR: test_zsh_integration (kitty_tests.shell_integration.ShellIntegration.test_zsh_integration)
kitty> ----------------------------------------------------------------------
kitty> Traceback (most recent call last):
kitty> File "/private/tmp/nix-build-kitty-0.36.1.drv-0/source/kitty/launcher/kitty.app/Contents/MacOS/../../../../../kitty_tests/shell_integration.py", line 120, in test_zsh_integration
kitty> pty.wait_till(lambda: pty.screen_contents() == q)
kitty> ps1 = 'left>'
kitty> pty = <kitty_tests.PTY object at 0x1067eeb40>
kitty> q = 'left> <right'
kitty> rps1 = '<right'
kitty> self = <kitty_tests.shell_integration.ShellIntegration testMethod=test_zsh_integration>
kitty> File "/private/tmp/nix-build-kitty-0.36.1.drv-0/source/kitty/launcher/kitty.app/Contents/MacOS/../../../../../kitty_tests/__init__.py", line 397, in wait_till
kitty> raise TimeoutError(f'Timed out: {msg}. Screen contents: \n {repr(self.screen_contents())}')
kitty> end_time = 74605.662821416
kitty> msg = 'The condition was not met'
kitty> q = <function ShellIntegration.test_zsh_integration.<locals>.<lambda> at 0x10a200fe0>
kitty> self = <kitty_tests.PTY object at 0x1067eeb40>
kitty> timeout = 10
kitty> timeout_msg = None
kitty> TimeoutError: Timed out: The condition was not met. Screen contents:
kitty> "gpg-connect-agent: failed to create temporary file '/private/tmp/nix-build-kitty\n-0.36.1.drv-0/tmpls334ag9/.gnupg/.#lk0x0000600003200380.iridium.83077': No such \nfile or directory\ngpg-connect-agent: can't connect to the gpg-agent: No such file or directory\ngpg-connect-agent: error sending standard options: No agent running\nleft> <right"
kitty> ======================================================================
kitty> ERROR: test_zsh_integration (kitty_tests.shell_integration.ShellIntegrationWithKitten.test_zsh_integration)
kitty> ----------------------------------------------------------------------
kitty> Traceback (most recent call last):
kitty> File "/private/tmp/nix-build-kitty-0.36.1.drv-0/source/kitty/launcher/kitty.app/Contents/MacOS/../../../../../kitty_tests/shell_integration.py", line 120, in test_zsh_integration
kitty> pty.wait_till(lambda: pty.screen_contents() == q)
kitty> ps1 = 'left>'
kitty> pty = <kitty_tests.PTY object at 0x10a507470>
kitty> q = 'left> <right'
kitty> rps1 = '<right'
kitty> self = <kitty_tests.shell_integration.ShellIntegrationWithKitten testMethod=test_zsh_integration>
kitty> File "/private/tmp/nix-build-kitty-0.36.1.drv-0/source/kitty/launcher/kitty.app/Contents/MacOS/../../../../../kitty_tests/__init__.py", line 397, in wait_till
kitty> raise TimeoutError(f'Timed out: {msg}. Screen contents: \n {repr(self.screen_contents())}')
kitty> end_time = 74615.868298291
kitty> msg = 'The condition was not met'
kitty> q = <function ShellIntegration.test_zsh_integration.<locals>.<lambda> at 0x10a202e80>
kitty> self = <kitty_tests.PTY object at 0x10a507470>
kitty> timeout = 10
kitty> timeout_msg = None
kitty> TimeoutError: Timed out: The condition was not met. Screen contents:
kitty> "gpg-connect-agent: failed to create temporary file '/private/tmp/nix-build-kitty\n-0.36.1.drv-0/tmptzg42dt4/.gnupg/.#lk0x0000600003e204c0.iridium.83092': No such \nfile or directory\ngpg-connect-agent: can't connect to the gpg-agent: No such file or directory\ngpg-connect-agent: error sending standard options: No agent running\nleft> <right"
kitty> ======================================================================
kitty> FAIL: test_ssh_leading_data (kitty_tests.ssh.SSHKitten.test_ssh_leading_data) (sh='zsh')
kitty> ----------------------------------------------------------------------
kitty> Traceback (most recent call last):
kitty> File "/private/tmp/nix-build-kitty-0.36.1.drv-0/source/kitty/launcher/kitty.app/Contents/MacOS/../../../../../kitty_tests/ssh.py", line 167, in test_ssh_leading_data
kitty> self.ae(pty.screen_contents(), 'UNTAR_DONE\nld:before_tarfile')
kitty> pty = <kitty_tests.PTY object at 0x10a4a39e0>
kitty> script = 'echo "ld:$leading_data"; exit 0'
kitty> self = <kitty_tests.ssh.SSHKitten testMethod=test_ssh_leading_data>
kitty> sh = 'zsh'
kitty> tdir = '/private/tmp/nix-build-kitty-0.36.1.drv-0/tmprdnml_s6'
kitty> AssertionError: "gpg-connect-agent: failed to create temp[315 chars]file" != 'UNTAR_DONE\nld:before_tarfile'
kitty> - gpg-connect-agent: failed to create temporary file '/private/tmp/nix-build-kitty
kitty> - -0.36.1.drv-0/tmprdnml_s6/.gnupg/.#lk0x0000600002e1c500.iridium.81739': No such
kitty> - file or directory
kitty> - gpg-connect-agent: can't connect to the gpg-agent: No such file or directory
kitty> - gpg-connect-agent: error sending standard options: No agent running
kitty> UNTAR_DONE
kitty> ld:before_tarfile
kitty> ----------------------------------------------------------------------
kitty> Ran 131 tests in 35.226s
kitty> FAILED (failures=1, errors=2, skipped=3)
rvolosatovs
approved these changes
Aug 29, 2024
There was a problem hiding this comment.
I can confirm this fixes #337987, but the kitty build still fails due to a failing test:
kitty> test_utf_8_strndup (kitty_tests.glfw.TestGLFW.test_utf_8_strndup) ... skipped 'Skipping test on macOS because glfw-cocoa.so is not built with backend_utils'
kitty> ======================================================================
kitty> ERROR: test_zsh_integration (kitty_tests.shell_integration.ShellIntegration.test_zsh_integration)
kitty> ----------------------------------------------------------------------
kitty> Traceback (most recent call last):
kitty> File "/private/tmp/nix-build-kitty-0.36.1.drv-0/source/kitty/launcher/kitty.app/Contents/MacOS/../../../../../kitty_tests/shell_integration.py", line 120, in test_zsh_integration
kitty> pty.wait_till(lambda: pty.screen_contents() == q)
kitty> ps1 = 'left>'
kitty> pty = <kitty_tests.PTY object at 0x1067eeb40>
kitty> q = 'left> <right'
kitty> rps1 = '<right'
kitty> self = <kitty_tests.shell_integration.ShellIntegration testMethod=test_zsh_integration>
kitty> File "/private/tmp/nix-build-kitty-0.36.1.drv-0/source/kitty/launcher/kitty.app/Contents/MacOS/../../../../../kitty_tests/__init__.py", line 397, in wait_till
kitty> raise TimeoutError(f'Timed out: {msg}. Screen contents: \n {repr(self.screen_contents())}')
kitty> end_time = 74605.662821416
kitty> msg = 'The condition was not met'
kitty> q = <function ShellIntegration.test_zsh_integration.<locals>.<lambda> at 0x10a200fe0>
kitty> self = <kitty_tests.PTY object at 0x1067eeb40>
kitty> timeout = 10
kitty> timeout_msg = None
kitty> TimeoutError: Timed out: The condition was not met. Screen contents:
kitty> "gpg-connect-agent: failed to create temporary file '/private/tmp/nix-build-kitty\n-0.36.1.drv-0/tmpls334ag9/.gnupg/.#lk0x0000600003200380.iridium.83077': No such \nfile or directory\ngpg-connect-agent: can't connect to the gpg-agent: No such file or directory\ngpg-connect-agent: error sending standard options: No agent running\nleft> <right"
kitty> ======================================================================
kitty> ERROR: test_zsh_integration (kitty_tests.shell_integration.ShellIntegrationWithKitten.test_zsh_integration)
kitty> ----------------------------------------------------------------------
kitty> Traceback (most recent call last):
kitty> File "/private/tmp/nix-build-kitty-0.36.1.drv-0/source/kitty/launcher/kitty.app/Contents/MacOS/../../../../../kitty_tests/shell_integration.py", line 120, in test_zsh_integration
kitty> pty.wait_till(lambda: pty.screen_contents() == q)
kitty> ps1 = 'left>'
kitty> pty = <kitty_tests.PTY object at 0x10a507470>
kitty> q = 'left> <right'
kitty> rps1 = '<right'
kitty> self = <kitty_tests.shell_integration.ShellIntegrationWithKitten testMethod=test_zsh_integration>
kitty> File "/private/tmp/nix-build-kitty-0.36.1.drv-0/source/kitty/launcher/kitty.app/Contents/MacOS/../../../../../kitty_tests/__init__.py", line 397, in wait_till
kitty> raise TimeoutError(f'Timed out: {msg}. Screen contents: \n {repr(self.screen_contents())}')
kitty> end_time = 74615.868298291
kitty> msg = 'The condition was not met'
kitty> q = <function ShellIntegration.test_zsh_integration.<locals>.<lambda> at 0x10a202e80>
kitty> self = <kitty_tests.PTY object at 0x10a507470>
kitty> timeout = 10
kitty> timeout_msg = None
kitty> TimeoutError: Timed out: The condition was not met. Screen contents:
kitty> "gpg-connect-agent: failed to create temporary file '/private/tmp/nix-build-kitty\n-0.36.1.drv-0/tmptzg42dt4/.gnupg/.#lk0x0000600003e204c0.iridium.83092': No such \nfile or directory\ngpg-connect-agent: can't connect to the gpg-agent: No such file or directory\ngpg-connect-agent: error sending standard options: No agent running\nleft> <right"
kitty> ======================================================================
kitty> FAIL: test_ssh_leading_data (kitty_tests.ssh.SSHKitten.test_ssh_leading_data) (sh='zsh')
kitty> ----------------------------------------------------------------------
kitty> Traceback (most recent call last):
kitty> File "/private/tmp/nix-build-kitty-0.36.1.drv-0/source/kitty/launcher/kitty.app/Contents/MacOS/../../../../../kitty_tests/ssh.py", line 167, in test_ssh_leading_data
kitty> self.ae(pty.screen_contents(), 'UNTAR_DONE\nld:before_tarfile')
kitty> pty = <kitty_tests.PTY object at 0x10a4a39e0>
kitty> script = 'echo "ld:$leading_data"; exit 0'
kitty> self = <kitty_tests.ssh.SSHKitten testMethod=test_ssh_leading_data>
kitty> sh = 'zsh'
kitty> tdir = '/private/tmp/nix-build-kitty-0.36.1.drv-0/tmprdnml_s6'
kitty> AssertionError: "gpg-connect-agent: failed to create temp[315 chars]file" != 'UNTAR_DONE\nld:before_tarfile'
kitty> - gpg-connect-agent: failed to create temporary file '/private/tmp/nix-build-kitty
kitty> - -0.36.1.drv-0/tmprdnml_s6/.gnupg/.#lk0x0000600002e1c500.iridium.81739': No such
kitty> - file or directory
kitty> - gpg-connect-agent: can't connect to the gpg-agent: No such file or directory
kitty> - gpg-connect-agent: error sending standard options: No agent running
kitty> UNTAR_DONE
kitty> ld:before_tarfile
kitty> ----------------------------------------------------------------------
kitty> Ran 131 tests in 35.226s
kitty> FAILED (failures=1, errors=2, skipped=3)
Looks like it's a separate issue, which can be fixed in a different PR
|
|
||
| # Add the font by hand because fontconfig does not finds it in darwin | ||
| mkdir ./fonts/ | ||
| cp "${(nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})}/share/fonts/truetype/NerdFonts/SymbolsNerdFontMono-Regular.ttf" ./fonts/ |
There was a problem hiding this comment.
I was able to reproduce this error on a Mac and fix it using this PR, however, the build still failed due to a failing test:
kitty> test_utf_8_strndup (kitty_tests.glfw.TestGLFW.test_utf_8_strndup) ... skipped 'Skipping test on macOS because glfw-cocoa.so is not built with backend_utils'
kitty> ======================================================================
kitty> ERROR: test_zsh_integration (kitty_tests.shell_integration.ShellIntegration.test_zsh_integration)
kitty> ----------------------------------------------------------------------
kitty> Traceback (most recent call last):
kitty> File "/private/tmp/nix-build-kitty-0.36.1.drv-0/source/kitty/launcher/kitty.app/Contents/MacOS/../../../../../kitty_tests/shell_integration.py", line 120, in test_zsh_integration
kitty> pty.wait_till(lambda: pty.screen_contents() == q)
kitty> ps1 = 'left>'
kitty> pty = <kitty_tests.PTY object at 0x1067eeb40>
kitty> q = 'left> <right'
kitty> rps1 = '<right'
kitty> self = <kitty_tests.shell_integration.ShellIntegration testMethod=test_zsh_integration>
kitty> File "/private/tmp/nix-build-kitty-0.36.1.drv-0/source/kitty/launcher/kitty.app/Contents/MacOS/../../../../../kitty_tests/__init__.py", line 397, in wait_till
kitty> raise TimeoutError(f'Timed out: {msg}. Screen contents: \n {repr(self.screen_contents())}')
kitty> end_time = 74605.662821416
kitty> msg = 'The condition was not met'
kitty> q = <function ShellIntegration.test_zsh_integration.<locals>.<lambda> at 0x10a200fe0>
kitty> self = <kitty_tests.PTY object at 0x1067eeb40>
kitty> timeout = 10
kitty> timeout_msg = None
kitty> TimeoutError: Timed out: The condition was not met. Screen contents:
kitty> "gpg-connect-agent: failed to create temporary file '/private/tmp/nix-build-kitty\n-0.36.1.drv-0/tmpls334ag9/.gnupg/.#lk0x0000600003200380.iridium.83077': No such \nfile or directory\ngpg-connect-agent: can't connect to the gpg-agent: No such file or directory\ngpg-connect-agent: error sending standard options: No agent running\nleft> <right"
kitty> ======================================================================
kitty> ERROR: test_zsh_integration (kitty_tests.shell_integration.ShellIntegrationWithKitten.test_zsh_integration)
kitty> ----------------------------------------------------------------------
kitty> Traceback (most recent call last):
kitty> File "/private/tmp/nix-build-kitty-0.36.1.drv-0/source/kitty/launcher/kitty.app/Contents/MacOS/../../../../../kitty_tests/shell_integration.py", line 120, in test_zsh_integration
kitty> pty.wait_till(lambda: pty.screen_contents() == q)
kitty> ps1 = 'left>'
kitty> pty = <kitty_tests.PTY object at 0x10a507470>
kitty> q = 'left> <right'
kitty> rps1 = '<right'
kitty> self = <kitty_tests.shell_integration.ShellIntegrationWithKitten testMethod=test_zsh_integration>
kitty> File "/private/tmp/nix-build-kitty-0.36.1.drv-0/source/kitty/launcher/kitty.app/Contents/MacOS/../../../../../kitty_tests/__init__.py", line 397, in wait_till
kitty> raise TimeoutError(f'Timed out: {msg}. Screen contents: \n {repr(self.screen_contents())}')
kitty> end_time = 74615.868298291
kitty> msg = 'The condition was not met'
kitty> q = <function ShellIntegration.test_zsh_integration.<locals>.<lambda> at 0x10a202e80>
kitty> self = <kitty_tests.PTY object at 0x10a507470>
kitty> timeout = 10
kitty> timeout_msg = None
kitty> TimeoutError: Timed out: The condition was not met. Screen contents:
kitty> "gpg-connect-agent: failed to create temporary file '/private/tmp/nix-build-kitty\n-0.36.1.drv-0/tmptzg42dt4/.gnupg/.#lk0x0000600003e204c0.iridium.83092': No such \nfile or directory\ngpg-connect-agent: can't connect to the gpg-agent: No such file or directory\ngpg-connect-agent: error sending standard options: No agent running\nleft> <right"
kitty> ======================================================================
kitty> FAIL: test_ssh_leading_data (kitty_tests.ssh.SSHKitten.test_ssh_leading_data) (sh='zsh')
kitty> ----------------------------------------------------------------------
kitty> Traceback (most recent call last):
kitty> File "/private/tmp/nix-build-kitty-0.36.1.drv-0/source/kitty/launcher/kitty.app/Contents/MacOS/../../../../../kitty_tests/ssh.py", line 167, in test_ssh_leading_data
kitty> self.ae(pty.screen_contents(), 'UNTAR_DONE\nld:before_tarfile')
kitty> pty = <kitty_tests.PTY object at 0x10a4a39e0>
kitty> script = 'echo "ld:$leading_data"; exit 0'
kitty> self = <kitty_tests.ssh.SSHKitten testMethod=test_ssh_leading_data>
kitty> sh = 'zsh'
kitty> tdir = '/private/tmp/nix-build-kitty-0.36.1.drv-0/tmprdnml_s6'
kitty> AssertionError: "gpg-connect-agent: failed to create temp[315 chars]file" != 'UNTAR_DONE\nld:before_tarfile'
kitty> - gpg-connect-agent: failed to create temporary file '/private/tmp/nix-build-kitty
kitty> - -0.36.1.drv-0/tmprdnml_s6/.gnupg/.#lk0x0000600002e1c500.iridium.81739': No such
kitty> - file or directory
kitty> - gpg-connect-agent: can't connect to the gpg-agent: No such file or directory
kitty> - gpg-connect-agent: error sending standard options: No agent running
kitty> UNTAR_DONE
kitty> ld:before_tarfile
kitty> ----------------------------------------------------------------------
kitty> Ran 131 tests in 35.226s
kitty> FAILED (failures=1, errors=2, skipped=3)
|
Well, I guess @booxter already fixed the build in #338033 (comment) |
worked for me, which is a combination of this PR and #338070 , however, at runtime kitty failed to select the correct font (which looks like a regression, since it works fine now): |
13 tasks
I don't think it's related to this PR 'cause it's just adding a font file to a folder, it does not change the behavior of kitty in any way. |
|
@leiserfg @rvolosatovs that error seems like what's described in this issue. |
|
@rvolosatovs just use the regular FiraCode, kitty now comes with Nerd Font builtin. |
|
This pr fixes the issue I originally raised on my device, thanks! |
|
Thanks for fixing this 👍🏻 |
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/prs-already-reviewed/2617/1932 |
|
Result of 4 packages built:
|
|
Result of 4 packages built:
|
|
Result of 4 packages built:
|
natsukium
reviewed
Sep 2, 2024
There was a problem hiding this comment.
The commit message should follow the guideline.
https://github.com/NixOS/nixpkgs/tree/master/pkgs#commit-conventions
|
Sorry @natsukium I'll follow the convention next time, I didn't know there was one for refactors. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.