Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

kitty: 0.39.1->0.40.0 #388182

Merged
merged 4 commits into from
Mar 12, 2025
Merged

kitty: 0.39.1->0.40.0 #388182

merged 4 commits into from
Mar 12, 2025
+26 −6

Conversation

leiserfg
Copy link
Contributor

@leiserfg leiserfg commented Mar 8, 2025 •
edited
Loading

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

Add a 👍 reaction to pull requests you find important.

@nix-owners nix-owners bot requested review from tex, Luflosi, kashw2 and rvolosatovs March 8, 2025 11:41
@leiserfg
Copy link
Contributor Author

leiserfg commented Mar 8, 2025

The patch included was already accepted upstream.

@leiserfg leiserfg force-pushed the kitty-0.40.0 branch 2 times, most recently from 0f9da67 to 221d91c Compare March 8, 2025 15:25
@github-actions github-actions bot added the 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` label Mar 8, 2025
@illdefined
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 388182

x86_64-linux

✅ 4 packages built:
  • kitty
  • kitty.kitten
  • kitty.shell_integration
  • kitty.terminfo

aarch64-linux

✅ 4 packages built:
  • kitty
  • kitty.kitten
  • kitty.shell_integration
  • kitty.terminfo

@illdefined
Copy link
Contributor

Successfully tested the binaries on x86_64-linux. On aarch64-linux the binaries produce text output, but I unfortunately do not have a graphical environment to test the rest of the functionality.

@leiserfg leiserfg mentioned this pull request Mar 11, 2025
Open
3 tasks
@leiserfg
Copy link
Contributor Author

leiserfg commented Mar 11, 2025 •
edited
Loading

Hey @natsukium, can I get this merged? By far not my first version bump / kitty fix landed in nixpkgs.

I'm linking you as you merged my last one, I'm sorry to bother.

@devusb
Copy link
Contributor

devusb commented Mar 11, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 388182

x86_64-linux

❌ 4 packages failed to build:
  • kitty
  • kitty.kitten
  • kitty.shell_integration
  • kitty.terminfo

@devusb
Copy link
Contributor

devusb commented Mar 11, 2025 •
edited
Loading

this is what I get on x86_64-linux

       last 25 log lines:
       >     dirfd = 52
       >     func = <built-in function rmdir>
       >     name = 'generated_completions'
       >     onexc = <function rmtree.<locals>.onexc at 0x7fffdfaef9c0>
       >     orig_entry = <DirEntry 'generated_completions'>
       >     path = '/build/tmpvgxe1dk9/.cache/fish/generated_completions'
       >     stack = []
       >   File "/nix/store/26yi95240650jxp5dj78xzch70i1kzlz-python3-3.12.9/lib/python3.12/shutil.py", line 662, in _rmtree_safe_fd
       >     os.rmdir(name, dir_fd=dirfd)
       >     dirfd = 52
       >     func = <built-in function rmdir>
       >     name = 'generated_completions'
       >     onexc = <function rmtree.<locals>.onexc at 0x7fffdfaef9c0>
       >     orig_entry = <DirEntry 'generated_completions'>
       >     path = '/build/tmpvgxe1dk9/.cache/fish/generated_completions'
       >     stack = []
       > OSError: [Errno 39] Directory not empty: '/build/tmpvgxe1dk9/.cache/fish/generated_completions'
       >
       > ----------------------------------------------------------------------
       > Ran 152 tests in 7.533s
       >
       > FAILED (errors=1, skipped=2)
       > All Go tests succeeded, ran in 7.7 seconds
       > Error: Some tests failed!
       > make: *** [Makefile:16: test] Error 1
       For full logs, run 'nix log /nix/store/fx4fvdkj8da1syqi2qsfmvgga8av3nlg-kitty-0.40.0.drv'.
error: builder for '/nix/store/fx4fvdkj8da1syqi2qsfmvgga8av3nlg-kitty-0.40.0.drv' failed with exit code 1

looks like OfBorg also produced the same result? looks similiar/same to issues seen in #388238.

@devusb
Copy link
Contributor

devusb commented Mar 11, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 388182

aarch64-darwin

❌ 4 packages failed to build:
  • kitty
  • kitty.kitten
  • kitty.shell_integration
  • kitty.terminfo

@leiserfg
Copy link
Contributor Author

@devusb I can't reproduce that problem, building (both with nix build .#kitty and with nix run 'nixpkgs#nixpkgs-review' pr 388182) works as it must to.

@leiserfg
Copy link
Contributor Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 388182

x86_64-linux

✅ 4 packages built:
  • kitty
  • kitty.kitten
  • kitty.shell_integration
  • kitty.terminfo

@leiserfg
Copy link
Contributor Author

leiserfg commented Mar 11, 2025 •
edited
Loading

looks like OfBorg also produced the same result? looks similiar/same to issues seen in #388238.

For what I see in that issue, the problem is not related to this PR but to the fish 4.0 release.

@leiserfg
Copy link
Contributor Author

leiserfg commented Mar 11, 2025 •
edited
Loading

Regardless, this last commit should fix it. I just extracted this patch from kitty master. @devusb can you test the pr again?

@leiserfg leiserfg mentioned this pull request Mar 11, 2025
Open
3 tasks
@devusb
Copy link
Contributor

devusb commented Mar 11, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 388182

x86_64-linux

✅ 4 packages built:
  • kitty
  • kitty.kitten
  • kitty.shell_integration
  • kitty.terminfo

@devusb
Copy link
Contributor

devusb commented Mar 11, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 388182

aarch64-darwin

✅ 4 packages built:
  • kitty
  • kitty.kitten
  • kitty.shell_integration
  • kitty.terminfo

@devusb
Copy link
Contributor

devusb commented Mar 11, 2025

@leiserfg build LGTM. would it be possible to use fetchpatch for the shell integration patch instead of committing it here?

@leiserfg
Copy link
Contributor Author

Let me have a look.

@lfdominguez
Copy link

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 388182

aarch64-darwin

✅ 4 packages built:
  • kitty
  • kitty.kitten
  • kitty.shell_integration
  • kitty.terminfo

@leiserfg
Copy link
Contributor Author

leiserfg commented Mar 11, 2025 •
edited
Loading

Done @devusb, I replaced both patches with fetched ones.

@khaneliman
Copy link
Contributor

khaneliman commented Mar 12, 2025 •
edited
Loading

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 388182

x86_64-linux

✅ 4 packages built:
  • kitty
  • kitty.kitten
  • kitty.shell_integration
  • kitty.terminfo

aarch64-linux

✅ 4 packages built:
  • kitty
  • kitty.kitten
  • kitty.shell_integration
  • kitty.terminfo

x86_64-darwin

✅ 4 packages built:
  • kitty
  • kitty.kitten
  • kitty.shell_integration
  • kitty.terminfo

aarch64-darwin

❌ 4 packages failed to build:
  • kitty
  • kitty.kitten
  • kitty.shell_integration
  • kitty.terminfo
test_fallback_font_not_last_resort (kitty_tests.fonts.Rendering.test_fallback_font_not_last_resort) ... FAIL
test_font_rendering (kitty_tests.fonts.Rendering.test_font_rendering) ... make: *** [Makefile:16: test] Segmentation fault: 11

@khaneliman
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 388182

x86_64-linux

✅ 4 packages built:
  • kitty
  • kitty.kitten
  • kitty.shell_integration
  • kitty.terminfo

aarch64-linux

✅ 4 packages built:
  • kitty
  • kitty.kitten
  • kitty.shell_integration
  • kitty.terminfo

x86_64-darwin

✅ 4 packages built:
  • kitty
  • kitty.kitten
  • kitty.shell_integration
  • kitty.terminfo

aarch64-darwin

✅ 4 packages built:
  • kitty
  • kitty.kitten
  • kitty.shell_integration
  • kitty.terminfo

@khaneliman
Copy link
Contributor

Alright, just looks like a flaky test.

@khaneliman khaneliman merged commit 65bbf7a into NixOS:master Mar 12, 2025
30 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@devusb devusb devusb approved these changes

@kashw2 kashw2 kashw2 approved these changes

@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
8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@leiserfg @illdefined @devusb @lfdominguez @khaneliman @kashw2