public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove uses of mkFixStrictness 

mkFixStrictness is no longer needed, woohoo!
This commit is contained in:
Eelco Dolstra 2013-10-28 01:14:16 +01:00
parent 0e333688ce
commit 4b1a9dd00b
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/options.nix
View File

@ -6,6 +6,7 @@ with import ./trivial.nix;
with import ./lists.nix; with import ./lists.nix;
with import ./misc.nix; with import ./misc.nix;
with import ./attrsets.nix; with import ./attrsets.nix;
with import ./strings.nix;
rec { rec {

2
nixos/modules/services/x11/display-managers/kdm.nix
View File

@ -128,7 +128,7 @@ in
services.xserver.displayManager.slim.enable = false; services.xserver.displayManager.slim.enable = false;
services.xserver.displayManager.job = services.xserver.displayManager.job =
{ execCmd = mkFixStrictness { execCmd =
'' ''
mkdir -m 0755 -p /var/lib/kdm mkdir -m 0755 -p /var/lib/kdm
chown kdm /var/lib/kdm chown kdm /var/lib/kdm

2
nixos/modules/services/x11/display-managers/lightdm.nix
View File

@ -96,7 +96,7 @@ in
logsXsession = true; logsXsession = true;
# lightdm relaunches itself via just `lightdm`, so needs to be on the PATH # lightdm relaunches itself via just `lightdm`, so needs to be on the PATH
execCmd = mkFixStrictness '' execCmd = ''
export PATH=${lightdm}/sbin:$PATH export PATH=${lightdm}/sbin:$PATH
${lightdm}/sbin/lightdm --log-dir=/var/log --run-dir=/run --config=${lightdmConf} ${lightdm}/sbin/lightdm --log-dir=/var/log --run-dir=/run --config=${lightdmConf}
''; '';

4
nixos/modules/system/boot/loader/grub/memtest.nix
View File

@ -23,7 +23,7 @@ in
config = mkIf config.boot.loader.grub.memtest86 { config = mkIf config.boot.loader.grub.memtest86 {
boot.loader.grub.extraEntries = mkFixStrictness ( boot.loader.grub.extraEntries =
if config.boot.loader.grub.version == 2 then if config.boot.loader.grub.version == 2 then
'' ''
menuentry "Memtest86+" { menuentry "Memtest86+" {
@ -31,7 +31,7 @@ in
} }
'' ''
else else
throw "Memtest86+ is not supported with GRUB 1."); throw "Memtest86+ is not supported with GRUB 1.";
boot.loader.grub.extraFiles."memtest.bin" = "${memtest86}/memtest.bin"; boot.loader.grub.extraFiles."memtest.bin" = "${memtest86}/memtest.bin";