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

Merge pull request #91092 from helsinki-systems/systemd-path-noapply 

nixos/systemd: Don't use apply for $PATH
This commit is contained in:
Silvan Mosberger 2020-09-04 02:50:12 +02:00 committed by GitHub
parent 0fd664e0b0 8cf4ec8b97
commit 41c29f2540
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/doc/manual/release-notes/rl-2009.xml
View File

@ -777,6 +777,11 @@ CREATE ROLE postgres LOGIN SUPERUSER;
<link xlink:href="https://github.com/NixOS/nixpkgs/pull/63103">PR #63103</link>. <link xlink:href="https://github.com/NixOS/nixpkgs/pull/63103">PR #63103</link>.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
<literal>config.systemd.services.${name}.path</literal> now returns a list of paths instead of a colon-separated string.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>

1
nixos/modules/system/boot/systemd-unit-options.nix
View File

@ -234,7 +234,6 @@ in rec {
path = mkOption { path = mkOption {
default = []; default = [];
type = with types; listOf (oneOf [ package str ]); type = with types; listOf (oneOf [ package str ]);
apply = ps: "${makeBinPath ps}:${makeSearchPathOutput "bin" "sbin" ps}";
description = '' description = ''
Packages added to the service's <envar>PATH</envar> Packages added to the service's <envar>PATH</envar>
environment variable. Both the <filename>bin</filename> environment variable. Both the <filename>bin</filename>

2
nixos/modules/system/boot/systemd.nix
View File

@ -257,7 +257,7 @@ let
pkgs.gnused pkgs.gnused
systemd systemd
]; ];
environment.PATH = config.path; environment.PATH = "${makeBinPath config.path}:${makeSearchPathOutput "bin" "sbin" config.path}";
} }
(mkIf (config.preStart != "") (mkIf (config.preStart != "")
{ serviceConfig.ExecStartPre = { serviceConfig.ExecStartPre =