movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Merge recent master into staging

Browse source 
Hydra nixpkgs: ?compare=1156478
This commit is contained in:
Vladimír Čunát 2014-10-23 17:40:41 +02:00
commit 2cf17b0802
271 changed files with 5900 additions and 2711 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/system/boot/systemd.nix
View file

@ -10,15 +10,19 @@ let
systemd = cfg.package;
makeUnit = name: unit:
let
pathSafeName = lib.replaceChars ["@" "\\"] ["-" "-"] name;
in
if unit.enable then
pkgs.runCommand "unit" { preferLocalBuild = true; inherit (unit) text; }
pkgs.runCommand "unit-${pathSafeName}" { preferLocalBuild = true; inherit (unit) text; }
''
mkdir -p $out
echo -n "$text" > $out/${shellEscape name}
''
else
pkgs.runCommand "unit" { preferLocalBuild = true; }
pkgs.runCommand "unit-${pathSafeName}-disabled" { preferLocalBuild = true; }
''
mkdir -p $out
ln -s /dev/null $out/${shellEscape name}