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: 5940f6b3f068
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: aa0baea2c0c3
Choose a head ref
  • 4 commits
  • 2 files changed
  • 2 contributors

Commits on Jun 4, 2019

  1. wlroots: 0.5 -> 0.6

    @Synthetica9
    Synthetica9 committed Jun 4, 2019
    Copy the full SHA
    67f340e View commit details
    Browse the repository at this point in the history

  2. sway: 1.0 -> 1.1.1

    @Synthetica9
    Synthetica9 committed Jun 4, 2019
    Copy the full SHA
    9ab064b View commit details
    Browse the repository at this point in the history

  3. sway: manually update version in meson.build 

    This wasn't done upstream. Adapted from:

https://github.com/primeos/nixpkgs-primeos/blob/5956e993dd320183f943e72fd6ec200232900249/default.nix#L32-L34

Co-Authored-By: Michael Weiss <dev.primeos@gmail.com>
    @Synthetica9 @primeos
    Synthetica9 and primeos committed Jun 4, 2019
    Copy the full SHA
    e7be569 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #62608 from Synthetica9/sway11 

    wlroots: 0.5 -> 0.6
sway: 1.0 -> 1.1.1
    @primeos
    primeos committed Jun 4, 2019
    Copy the full SHA
    aa0baea View commit details
    Browse the repository at this point in the history