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: 6fd5a4383b5d
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 6be14ee97b5a
Choose a head ref
  • 7 commits
  • 28 files changed
  • 2 contributors

Commits on Dec 15, 2019

  1. Copy the full SHA
    d362df6 View commit details
    Browse the repository at this point in the history
  2. nixos/sessionPackages: provide session names in passthru

    We want access to the valid session names at evaluation time.
    hedning authored and jtojnar committed Dec 15, 2019
    Copy the full SHA
    dd7144b View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    58e5290 View commit details
    Browse the repository at this point in the history
  4. nixos/displayManager: introduce defaultSession

    There's two ways of providing graphical sessions now:
    - `displayManager.session` via. `desktopManager.session` and
      `windowManager.session`
    - `displayManager.sessionPackages`
    
    `sessionPackages` doesn't make a distinction between desktop and window
    managers. This makes selecting a session provided by a package using
    `desktopManager.default` nonsensical.
    
    We therefor introduce `displayManager.defaultSession` which can select a session
    from either `displayManager.session` or `displayManager.sessionPackages`.
    
    It will default to `desktopManager.default + windowManager.default` as before.
    If the dm default is "none" it will select the first provided session from
    `sessionPackages`.
    hedning authored and jtojnar committed Dec 15, 2019
    Copy the full SHA
    d25365c View commit details
    Browse the repository at this point in the history
  5. nixos/lightdm: enable wayland sessions

    Note: can't launch gnome on wayland due to duplicate entry names:
      canonical/lightdm#16
    hedning authored and jtojnar committed Dec 15, 2019
    Copy the full SHA
    53ef29c View commit details
    Browse the repository at this point in the history
  6. nixos/displayManager: deprecate separate options for default wm/dm

    The upstream session files display managers use have no concept of sessions being composed from
    desktop manager and window manager. To be able to set upstream session files as default
    session, we need a single option. Having two different ways to set default session would be confusing,
    though, so we decided to deprecate the old method.
    
    We also created separate script for each session, just like we already had a separate desktop
    file for each one, and started using displayManager.sessionPackages mechanism to make the
    session handling more uniform.
    jtojnar committed Dec 15, 2019
    1
    Copy the full SHA
    8dc5ff7 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2019

  1. Merge pull request #53843 from hedning/session-default

    nixos/displayManager: introduce defaultSession
    jtojnar committed Dec 18, 2019
    Copy the full SHA
    6be14ee View commit details
    Browse the repository at this point in the history