Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 6c2e7b28e7c6
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 4b6bfecc0bd3
Choose a head ref
  • 4 commits
  • 2 files changed
  • 3 contributors

Commits on Apr 25, 2020

  1. maintainers: add cole-h 

    (cherry picked from commit ecf79a0)
    @cole-h @paumr
    cole-h authored and paumr committed Apr 25, 2020
    Copy the full SHA
    7535e9a View commit details
    Browse the repository at this point in the history

  2. alacritty: 0.4.1 -> 0.4.2 

    * 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
    @cole-h @paumr
    cole-h authored and paumr committed Apr 25, 2020
    Copy the full SHA
    2b9ad34 View commit details
    Browse the repository at this point in the history

  3. alacritty: fixed cargo hash 

    The cargo hash differed from the cherry-picked one due to changes to
fetchCargoTarball on the master branch #79975

On the master this happened here:
eb11fea
1f03a34

This should not effect the actual build result.
    @paumr
    paumr committed Apr 25, 2020
    Copy the full SHA
    aa9ea94 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #85908 from paumr/release-20.03-alacritty 

    [20.03] alacritty: backport 0.4.2
    @worldofpeace
    worldofpeace committed Apr 25, 2020
    Copy the full SHA
    4b6bfec View commit details
    Browse the repository at this point in the history