Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 39c585aab14f
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 03f1f355adc0
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 17, 2018

  1. exim: add optional support for PAM (#46744) 

    (cherry picked from commit f607f45)
    @pacien @xeji
    pacien authored and xeji committed Sep 17, 2018
    Copy the full SHA
    48bdc51 View commit details

  2. nixos/lightdm: use systemd.tmpfiles (#46734) 

    This also makes logs appear at /var/log/lightdm

(cherry picked from commit 67e9571)
    @worldofpeace @xeji
    worldofpeace authored and xeji committed Sep 17, 2018
    Copy the full SHA
    03f1f35 View commit details
Showing with 18 additions and 4 deletions.
  1. +10 −3 nixos/modules/services/x11/display-managers/lightdm.nix
  2. +8 −1 pkgs/servers/mail/exim/default.nix
13 changes: 10 additions & 3 deletions nixos/modules/services/x11/display-managers/lightdm.nix
View file
Original file line number Diff line number Diff line change
@@ -197,7 +197,7 @@ in
# lightdm relaunches itself via just `lightdm`, so needs to be on the PATH
execCmd = ''
export PATH=${lightdm}/sbin:$PATH
exec ${lightdm}/sbin/lightdm --log-dir=/var/log --run-dir=/run
exec ${lightdm}/sbin/lightdm
'';
};

@@ -246,12 +246,19 @@ in
'';

users.users.lightdm = {
createHome = true;
home = "/var/lib/lightdm-data";
home = "/var/lib/lightdm";
group = "lightdm";
uid = config.ids.uids.lightdm;
};

systemd.tmpfiles.rules = [
"d /var/run/lightdm 0711 lightdm lightdm 0"
"d /var/cache/lightdm 0711 root lightdm -"
"d /var/lib/lightdm 1770 lightdm lightdm -"
"d /var/lib/lightdm-data 1775 lightdm lightdm -"
"d /var/log/lightdm 0711 root lightdm -"
];

users.groups.lightdm.gid = config.ids.gids.lightdm;
services.xserver.tty = null; # We might start multiple X servers so let the tty increment themselves..
services.xserver.display = null; # We specify our own display (and logfile) in xserver-wrapper up there
9 changes: 8 additions & 1 deletion pkgs/servers/mail/exim/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,7 @@
, enableLDAP ? false, openldap
, enableMySQL ? false, mysql, zlib
, enableAuthDovecot ? false, dovecot
, enablePAM ? false, pam
}:

stdenv.mkDerivation rec {
@@ -16,7 +17,8 @@ stdenv.mkDerivation rec {
buildInputs = [ coreutils db openssl perl pcre ]
++ stdenv.lib.optional enableLDAP openldap
++ stdenv.lib.optionals enableMySQL [ mysql zlib ]
++ stdenv.lib.optional enableAuthDovecot dovecot;
++ stdenv.lib.optional enableAuthDovecot dovecot
++ stdenv.lib.optional enablePAM pam;

preBuild = ''
${stdenv.lib.optionalString enableMySQL "PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${mysql}/share/mysql/pkgconfig/"}
@@ -57,6 +59,11 @@ stdenv.mkDerivation rec {
${stdenv.lib.optionalString enableAuthDovecot ''
s:^# \(AUTH_DOVECOT\)=.*:\1=yes:
''}
${stdenv.lib.optionalString enablePAM ''
s:^# \(SUPPORT_PAM\)=.*:\1=yes:
s:^\(EXTRALIBS_EXIM\)=\(.*\):\1=\2 -lpam:
s:^# \(EXTRALIBS_EXIM\)=.*:\1=-lpam:
''}
#/^\s*#.*/d
#/^\s*$/d
' < src/EDITME > Local/Makefile