fix(tazjin/tverskoy): copy & paste some l2tp fix from nixpkgs#64965

Change-Id: Ib6375cd2281ce7eff87d9a1f8bd8f811ed180a87
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5155
Autosubmit: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
Vincent Ambo 2022-02-01 12:17:42 +03:00 committed by clbot
parent 586f530ec4
commit 3122cdf0c4
3 changed files with 46 additions and 37 deletions

View file

@ -1,5 +1,6 @@
# This file has been generated by Niv.
_: let
_:
let
#
# The fetchers. fetch_<type> fetches specs of type <type>.
@ -121,14 +122,17 @@ _: let
# Create the final "sources" from the config
mkSources = config:
mapAttrs (
mapAttrs
(
name: spec:
if builtins.hasAttr "outPath" spec
then abort
then
abort
"The values in sources.json should not have an 'outPath' attribute"
else
spec // { outPath = replace name (fetch config.pkgs name spec); }
) config.sources;
)
config.sources;
# The "config" used by the fetchers
mkConfig =

View file

@ -145,6 +145,11 @@ lib.fix (self: {
];
};
# from https://github.com/NixOS/nixpkgs/issues/64965
environment.etc."ipsec.secrets".text = ''
include ipsec.d/ipsec.nm-l2tp.secrets
'';
security.rtkit.enable = true;
services = {