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: 748bc9952070
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 53f810cb4b40
Choose a head ref
  • 5 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 10, 2020

  1. xmonad: put the correct xmonad binary in PATH

    @xaverdh
    xaverdh committed Oct 10, 2020
    Copy the full SHA
    67eb45d View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2020

  1. nixosTests.xmonad: don't rely on xmonad being "vanilla" after restart 

    The old (slightly broken) behavior of the xmonad module was to put the vanilla xmonad binary into PATH. This was changed to put the users xmonad into PATH instead.

But since the config for the xmonad test uses `launch` (to avoid xmonads self-recompilation logic), it now can't handle the `--restart` flag anymore. So instead use a key binding for restarting, and let xmonad spawn a new xterm on restart.

The key binding has to be explicitly added because the default binding
will shell out to `xmonad --restart` and therefore not work with the `launch` entrypoint.
    @xaverdh
    xaverdh committed Oct 12, 2020
    Copy the full SHA
    0a42b8c View commit details
    Browse the repository at this point in the history

  2. nixos/xmonad: improve module docs

    @xaverdh
    xaverdh committed Oct 12, 2020
    Copy the full SHA
    206c668 View commit details
    Browse the repository at this point in the history

  3. nixos/xmonad: add lassulus and xaverdh as maintainers

    @xaverdh
    xaverdh committed Oct 12, 2020
    Copy the full SHA
    7389407 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2020

  1. Merge pull request #100141 from xaverdh/xmonad-correct-path 

    xmonad: put the correct xmonad binary in PATH
    @Lassulus
    Lassulus committed Oct 13, 2020
    Copy the full SHA
    53f810c View commit details
    Browse the repository at this point in the history