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: a81c1d1fd9a0
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: ebf11e405d7a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 11, 2020

  1. nixos/xmonad: Fix behavior of config opt

    Prior to this change, the `config` option (which allows you define the
    haskell configuration for xmonad in your configuration.nix instead of
    needing something in the home directory) prevents desktop manager
    resources from starting. This can be demonstrated by configuring the
    following:
    
    ```
      services.xserver = {
        displayManager.defaultSession = "xfce+xmonad";
        displayManager.lightdm.enable = true;
    
        desktopManager.xterm.enable = false;
        desktopManager.xfce.enable = true;
        desktopManager.xfce.enableXfwm = false;
        desktopManager.xfce.noDesktop = true;
    
        windowManager.xmonad = {
          enable = true;
          enableContribAndExtras = true;
          extraPackages = haskellPackages: [
            haskellPackages.xmonad-contrib
            haskellPackages.xmonad-extras
            haskellPackages.xmonad
          ];
          config = ''
            import XMonad
            import XMonad.Config.Xfce
            main = xmonad xfceConfig
                   { terminal = "terminator"
                   , modMask = mod4Mask }
          '';
        };
      };
    ```
    
    and after user log in, search for xfce processes `ps aux | grep xfce`.
    You will not find xfce processes running until after the xmonad process is killed.
    
    The bug prevents utilities included with the desktopManager,
    (e.g. powerManagement, session logout, etc.)
    from working as expected.
    rudolph9 committed Aug 11, 2020
    Copy the full SHA
    c54beb9 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2020

  1. Merge pull request #95122 from rudolph9/nixos/xmonad

    nixos/xmonad: Fix behavior of config opt
    Lassulus committed Aug 21, 2020
    Copy the full SHA
    ebf11e4 View commit details
    Browse the repository at this point in the history