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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: db4cdd05cc65
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 959034d8e981
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 9, 2020

  1. nixos/gdm: Fix tmpfiles configuration syntax 

    Fixes this error from `nixos-rebuild switch` introduced by #75893:

setting up tmpfiles
[/etc/tmpfiles.d/nixos.conf:7] Invalid age 'yes'.
warning: error(s) occurred while switching to the new configuration

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
    @andersk
    andersk committed Jan 9, 2020
    Copy the full SHA
    07ccbc0 View commit details

  2. Merge pull request #77355 from andersk/gdm-tmpfiles 

    nixos/gdm: Fix tmpfiles configuration syntax
    @flokli
    flokli authored Jan 9, 2020
    Copy the full SHA
    959034d View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 nixos/modules/services/x11/display-managers/gdm.nix
2 changes: 1 addition & 1 deletion nixos/modules/services/x11/display-managers/gdm.nix
View file
Original file line number Diff line number Diff line change
@@ -171,7 +171,7 @@ in
"L+ /run/gdm/.config/pulse - - - - ${pulseConfig}"
] ++ optionals config.services.gnome3.gnome-initial-setup.enable [
# Create stamp file for gnome-initial-setup to prevent it starting in GDM.
"f /run/gdm/.config/gnome-initial-setup-done 0711 gdm gdm yes"
"f /run/gdm/.config/gnome-initial-setup-done 0711 gdm gdm - yes"
];

systemd.services.display-manager.wants = [