Skip to content

kitty: 0.28.1 -> 0.29.0#242896

Merged
SuperSandro2000 merged 1 commit intoNixOS:masterfrom
adamcstephens:kitty/0.29.0
Jul 12, 2023
Merged

kitty: 0.28.1 -> 0.29.0#242896
SuperSandro2000 merged 1 commit intoNixOS:masterfrom
adamcstephens:kitty/0.29.0

Conversation

@adamcstephens
Copy link
Copy Markdown
Contributor

@adamcstephens adamcstephens commented Jul 11, 2023 •
edited
Loading

Description of changes

https://github.com/kovidgoyal/kitty/blob/v0.29.0/docs/changelog.rst#0290-2023-07-10

Also includes a fix to resolve vendorHash not updating correctly with nix-update.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@adamcstephens adamcstephens mentioned this pull request Jul 11, 2023
Merged
12 tasks
@ofborg ofborg bot requested review from Luflosi, rvolosatovs and tex July 11, 2023 18:57
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jul 11, 2023
SuperSandro2000
SuperSandro2000 reviewed Jul 11, 2023
View reviewed changes
SuperSandro2000
SuperSandro2000 reviewed Jul 11, 2023
View reviewed changes
@SuperSandro2000
Copy link
Copy Markdown
Member

SuperSandro2000 commented Jul 12, 2023

darwin tests are unhappy....

======================================================================
ERROR: test_bash_integration (kitty_tests.shell_integration.ShellIntegrationWithKitten) (argv='bash -s arg1 --rcfile rcfile')
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/private/tmp/nix-build-kitty-0.29.0.drv-0/source/kitty/launcher/kitty.app/Contents/MacOS/../../../../../kitty_tests/shell_integration.py", line 352, in run_test
    pty.wait_till(lambda: wait_string in pty.screen_contents())
    argv = 'bash -s arg1 --rcfile rcfile'
    assert_not_in = True
    excluded = ()
    expected = ('rcfile',)
    pty = <kitty_tests.PTY object at 0x1081a05e0>
    rc = 'echo ok;read'
    self = <kitty_tests.shell_integration.ShellIntegrationWithKitten testMethod=test_bash_integration>
    setup_env = <function ShellIntegration.test_bash_integration.<locals>.setup_env at 0x1090d0af0>
    wait_string = 'ok'
  File "/private/tmp/nix-build-kitty-0.29.0.drv-0/source/kitty/launcher/kitty.app/Contents/MacOS/../../../../../kitty_tests/__init__.py", line 296, in wait_till
    raise TimeoutError(f'The condition was not met. Screen contents: \n {repr(self.screen_contents())}')
    end_time = 16339622.9105604
    q = <function ShellIntegration.test_bash_integration.<locals>.run_test.<locals>.<lambda> at 0x1091cd510>
    self = <kitty_tests.PTY object at 0x1081a05e0>
    timeout = 10
TimeoutError: The condition was not met. Screen contents: 
 '[profile]\n[.bash_profile]\nPROMPT $ '
======================================================================
FAIL: test_bash_integration (kitty_tests.shell_integration.ShellIntegrationWithKitten) (argv='bash')
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/private/tmp/nix-build-kitty-0.29.0.drv-0/source/kitty/launcher/kitty.app/Contents/MacOS/../../../../../kitty_tests/shell_integration.py", line 358, in run_test
    self.assertIn(f'[{x}]', q)
    argv = 'bash'
    assert_not_in = False
    excluded = ()
    expected = ('bash.bashrc', '.bashrc')
    pty = <kitty_tests.PTY object at 0x1088f73a0>
    q = '[profile]\n[.bash_profile]\nPROMPT $ '
    rc = ''
    self = <kitty_tests.shell_integration.ShellIntegrationWithKitten testMethod=test_bash_integration>
    setup_env = <function ShellIntegration.test_bash_integration.<locals>.setup_env at 0x1090d0af0>
    wait_string = 'PROMPT $'
    x = 'bash.bashrc'
AssertionError: '[bash.bashrc]' not found in '[profile]\n[.bash_profile]\nPROMPT $ '
======================================================================
FAIL: test_bash_integration (kitty_tests.shell_integration.ShellIntegrationWithKitten) (argv='bash --rcfile rcfile')
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/private/tmp/nix-build-kitty-0.29.0.drv-0/source/kitty/launcher/kitty.app/Contents/MacOS/../../../../../kitty_tests/shell_integration.py", line 358, in run_test
    self.assertIn(f'[{x}]', q)
    argv = 'bash --rcfile rcfile'
    assert_not_in = False
    excluded = ()
    expected = ('bash.bashrc', 'rcfile')
    pty = <kitty_tests.PTY object at 0x108f21a80>
    q = '[profile]\n[.bash_profile]\nPROMPT $ '
    rc = ''
    self = <kitty_tests.shell_integration.ShellIntegrationWithKitten testMethod=test_bash_integration>
    setup_env = <function ShellIntegration.test_bash_integration.<locals>.setup_env at 0x1090d0af0>
    wait_string = 'PROMPT $'
    x = 'bash.bashrc'
AssertionError: '[bash.bashrc]' not found in '[profile]\n[.bash_profile]\nPROMPT $ '
======================================================================
FAIL: test_bash_integration (kitty_tests.shell_integration.ShellIntegrationWithKitten) (argv='bash --init-file rcfile')
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/private/tmp/nix-build-kitty-0.29.0.drv-0/source/kitty/launcher/kitty.app/Contents/MacOS/../../../../../kitty_tests/shell_integration.py", line 358, in run_test
    self.assertIn(f'[{x}]', q)
    argv = 'bash --init-file rcfile'
    assert_not_in = False
    excluded = ()
    expected = ('bash.bashrc', 'rcfile')
    pty = <kitty_tests.PTY object at 0x10807af80>
    q = '[profile]\n[.bash_profile]\nPROMPT $ '
    rc = ''
    self = <kitty_tests.shell_integration.ShellIntegrationWithKitten testMethod=test_bash_integration>
    setup_env = <function ShellIntegration.test_bash_integration.<locals>.setup_env at 0x1090d0af0>
    wait_string = 'PROMPT $'
    x = 'bash.bashrc'
AssertionError: '[bash.bashrc]' not found in '[profile]\n[.bash_profile]\nPROMPT $ '
======================================================================
FAIL: test_bash_integration (kitty_tests.shell_integration.ShellIntegrationWithKitten)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/private/tmp/nix-build-kitty-0.29.0.drv-0/source/kitty/launcher/kitty.app/Contents/MacOS/../../../../../kitty_tests/shell_integration.py", line 381, in test_bash_integration
    self.ae(env.get('ES'), 'a\n `b` c\n$d', f'Screen contents: {pty.screen_contents()!r}')
    env = {'BASH_SILENCE_DEPRECATION_WARNING': '1', 'KITTY_INSTALLATION_DIR': '/private/tmp/nix-build-kitty-0.29.0.drv-0/source', 'LANG': 'en_US.UTF-8'}
    ps1 = 'line1\nprompt> '
    pty = <kitty_tests.PTY object at 0x108f22dd0>
    q = '/private/tmp/nix-build-kitty-0.29.0.drv-0/tmpgvmpel70/testing-cwd-notification-🐱'
    redrawn = <function ShellIntegration.test_bash_integration.<locals>.redrawn at 0x108fd2cb0>
    run_test = <function ShellIntegration.test_bash_integration.<locals>.run_test at 0x1090d09d0>
    self = <kitty_tests.shell_integration.ShellIntegrationWithKitten testMethod=test_bash_integration>
    setup_env = <function ShellIntegration.test_bash_integration.<locals>.setup_env at 0x1090d0af0>
AssertionError: None != 'a\n `b` c\n$d' : Screen contents: '[profile]\n[.bash_profile]\nclone-in-kitty\nPROMPT $ clone-in-kitty\nPROMPT $ '
----------------------------------------------------------------------

@adamcstephens
Copy link
Copy Markdown
Contributor Author

adamcstephens commented Jul 12, 2023

Darwin tests "fixed".

@SuperSandro2000 SuperSandro2000 merged commit f278bec into NixOS:master Jul 12, 2023
@adamcstephens adamcstephens deleted the kitty/0.29.0 branch July 12, 2023 19:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@tex tex Awaiting requested review from tex

@Luflosi Luflosi Awaiting requested review from Luflosi

@rvolosatovs rvolosatovs Awaiting requested review from rvolosatovs

Assignees

No one assigned

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@adamcstephens @SuperSandro2000