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

[20.03] alacritty: backport 0.4.2 #85908

Merged
merged 3 commits into from Apr 25, 2020
Merged

[20.03] alacritty: backport 0.4.2 #85908

merged 3 commits into from Apr 25, 2020

Conversation

paumr
Copy link
Contributor

@paumr paumr commented Apr 24, 2020 •
edited

Motivation for this change

This change was initially motivated by unexpected behavior of alacritty after updating from 19.09 to 20.03.
The application seemed to randomly close, upon further investigation it turns out that this was probably related to Alacritty not ignoring keyboard events for changing WM focus on X11.
0.4.2 also includes other X11 related bugfixes ( https://github.com/alacritty/alacritty/releases/tag/v0.4.2 )

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@paumr paumr changed the title alacritty: backport 0.4.2 [20.03] alacritty: backport 0.4.2 Apr 24, 2020
@worldofpeace
Copy link
Contributor

@paumr You'll need to backport the commit that adds cole-h as a maintainer.
That would be in maintainers-list.nix.

cole-h and others added 3 commits April 25, 2020 21:43
@cole-h @paumr
maintainers: add cole-h
7535e9a 
(cherry picked from commit ecf79a0)
@cole-h @paumr
alacritty: 0.4.1 -> 0.4.2
2b9ad34 
* alacritty now has its own org, so I changed the URLs to point there
* updated the description to match upstream's description
* formatted with nixpkgs-format

(cherry picked from commit 45f53cc)
Reason:
Fixes some bugs on X11, namely:
- Crash when starting on some X11 systems
- Alacritty not ignoring keyboard events for changing WM focus on X11
- Incorrect modifiers tracking on X11 and macOS, leading to 'sticky' modifiers
@paumr
alacritty: fixed cargo hash
aa9ea94 
The cargo hash differed from the cherry-picked one due to changes to
fetchCargoTarball on the master branch NixOS#79975

On the master this happened here:
eb11fea
1f03a34

This should not effect the actual build result.
@ofborg ofborg bot requested review from cole-h, Br1ght0ne and Mic92 April 25, 2020 19:50
@paumr
Copy link
Contributor Author

paumr commented Apr 25, 2020

@paumr You'll need to backport the commit that adds cole-h as a maintainer.
That would be in maintainers-list.nix.

Fixed, thanks

cole-h
cole-h approved these changes Apr 25, 2020
View reviewed changes
Copy link
Member

@cole-h cole-h left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Diff looks beautiful! I wonder who wrote it originally?
Binary runs just fine for me.

[3 built, 85 copied (1294.9 MiB), 349.8 MiB DL]
https://github.com/NixOS/nixpkgs/pull/85908
1 package built:
alacritty

@worldofpeace worldofpeace merged commit 4b6bfec into NixOS:release-20.03 Apr 25, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cole-h cole-h cole-h approved these changes

@Br1ght0ne Br1ght0ne Awaiting requested review from Br1ght0ne

@Mic92 Mic92 Awaiting requested review from Mic92

Assignees
No one assigned
Labels
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.

None yet
3 participants
@paumr @worldofpeace @cole-h