Skip to content
This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
base: 6c2e7b28e7c6
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
compare: 74a80c5a9ab0
Choose a head ref
  • 7 commits
  • 4 files changed
  • 6 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. ncview: Unmark as broken 

    Tested that the GUI works using an example netCDF file.
    @knedlsepp
    knedlsepp committed Apr 25, 2020
    Copy the full SHA
    1489d61 View commit details
    Browse the repository at this point in the history

  5. 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

  6. nixos/documentation: Allow specifying extraSources 

    Because there was absolutely no way of setting this without rewriting
parts of the module otherwise.

(cherry picked from commit 34dd64b)
    @bb010g @infinisil
    bb010g authored and infinisil committed Apr 25, 2020
    Copy the full SHA
    6df8f27 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2020

  1. Merge pull request #86023 from knedlsepp/fix-ncview 

    ncview: Unmark as broken on 20.03
    @bhipple
    bhipple committed Apr 26, 2020
    Copy the full SHA
    74a80c5 View commit details
    Browse the repository at this point in the history