diff options
| author | Michele Guerini Rocco <rnhmjoj@users.noreply.github.com> | 2020-02-14 10:50:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-14 10:50:47 +0100 |
| commit | 3d3392a492fe3bba2debe35ed53c7534d555d940 (patch) | |
| tree | 44cc6bf26417c12e3fd2954c6f9b8763f57dd199 /nixos | |
| parent | 30bc29280a07b595d26cb78e264c5a1fbd8355f0 (diff) | |
| parent | 0f8d1ac47d9e64d4536c13fb9940d44a89fdb2ec (diff) | |
| download | nixpkgs-3d3392a492fe3bba2debe35ed53c7534d555d940.tar nixpkgs-3d3392a492fe3bba2debe35ed53c7534d555d940.tar.gz nixpkgs-3d3392a492fe3bba2debe35ed53c7534d555d940.tar.bz2 nixpkgs-3d3392a492fe3bba2debe35ed53c7534d555d940.tar.lz nixpkgs-3d3392a492fe3bba2debe35ed53c7534d555d940.tar.xz nixpkgs-3d3392a492fe3bba2debe35ed53c7534d555d940.tar.zst nixpkgs-3d3392a492fe3bba2debe35ed53c7534d555d940.zip | |
Merge pull request #80090 from crabtw/master
nixos/pppd: fix build error
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/networking/pppd.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/networking/pppd.nix b/nixos/modules/services/networking/pppd.nix index b31bfa64235..c1cbdb46176 100644 --- a/nixos/modules/services/networking/pppd.nix +++ b/nixos/modules/services/networking/pppd.nix @@ -130,7 +130,7 @@ in systemdConfigs = listToAttrs (map mkSystemd enabledConfigs); in mkIf cfg.enable { - environment.etc = mkMerge etcFiles; - systemd.services = mkMerge systemdConfigs; + environment.etc = etcFiles; + systemd.services = systemdConfigs; }; } |