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

Commits on Dec 2, 2019

  1. nixos/pantheon fix GNOME_SESSION_DEBUG conflict 

    When session debugging was enabled in GNOME but not in Pantheon

	{
	  services.xserver = {
	    desktopManager.pantheon = {
	      enable = true;
	    };
	    desktopManager.gnome3 = {
	      enable = true;
	      debug = true;
	    };
	  };
	}

it caused a conflict:

	error: The option `environment.sessionVariables.GNOME_SESSION_DEBUG' has conflicting definitions, in `<nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix>' and `<nixpkgs/nixos/modules/services/x11/desktop-managers/gnome3.nix>'.
    @jtojnar
    jtojnar committed Dec 2, 2019
    Copy the full SHA
    9129616 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #74838 from jtojnar/pantheon-debug 

    nixos/pantheon fix GNOME_SESSION_DEBUG conflict
    @worldofpeace
    worldofpeace committed Dec 2, 2019
    Copy the full SHA
    5350db9 View commit details
    Browse the repository at this point in the history