diff options
author | Shea Levy <shea@shealevy.com> | 2018-03-01 14:38:53 -0500 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2018-03-01 14:38:53 -0500 |
commit | fec543436d4d35dacde01a9e8b69a2781841f901 (patch) | |
tree | b44b65ddbc7482e767d562f3f27c523c9ffbfcc0 /nixos/modules/services/networking | |
parent | e70f61f5a19b00337082ab28a5013e0b440bda92 (diff) | |
download | nixpkgs-fec543436d4d35dacde01a9e8b69a2781841f901.tar nixpkgs-fec543436d4d35dacde01a9e8b69a2781841f901.tar.gz nixpkgs-fec543436d4d35dacde01a9e8b69a2781841f901.tar.bz2 nixpkgs-fec543436d4d35dacde01a9e8b69a2781841f901.tar.lz nixpkgs-fec543436d4d35dacde01a9e8b69a2781841f901.tar.xz nixpkgs-fec543436d4d35dacde01a9e8b69a2781841f901.tar.zst nixpkgs-fec543436d4d35dacde01a9e8b69a2781841f901.zip |
nixos: Move uses of stdenv.shell to runtimeShell.
Diffstat (limited to 'nixos/modules/services/networking')
-rw-r--r-- | nixos/modules/services/networking/amuled.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/networking/firewall.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/networking/flashpolicyd.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/networking/nftables.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/networking/rdnssd.nix | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/services/networking/amuled.nix b/nixos/modules/services/networking/amuled.nix index fc7d56a24fa..9898f164c5c 100644 --- a/nixos/modules/services/networking/amuled.nix +++ b/nixos/modules/services/networking/amuled.nix @@ -68,7 +68,7 @@ in ''; script = '' - ${pkgs.su}/bin/su -s ${pkgs.stdenv.shell} ${user} \ + ${pkgs.su}/bin/su -s ${pkgs.runtimeShell} ${user} \ -c 'HOME="${cfg.dataDir}" ${pkgs.amuleDaemon}/bin/amuled' ''; }; diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index bce48c8f65e..20c0b0acf16 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -54,7 +54,7 @@ let ''; writeShScript = name: text: let dir = pkgs.writeScriptBin name '' - #! ${pkgs.stdenv.shell} -e + #! ${pkgs.runtimeShell} -e ${text} ''; in "${dir}/bin/${name}"; diff --git a/nixos/modules/services/networking/flashpolicyd.nix b/nixos/modules/services/networking/flashpolicyd.nix index 5ba85178179..5b83ce13138 100644 --- a/nixos/modules/services/networking/flashpolicyd.nix +++ b/nixos/modules/services/networking/flashpolicyd.nix @@ -22,7 +22,7 @@ let flashpolicydWrapper = pkgs.writeScriptBin "flashpolicyd" '' - #! ${pkgs.stdenv.shell} + #! ${pkgs.runtimeShell} exec ${flashpolicyd}/Perl_xinetd/in.flashpolicyd.pl \ --file=${pkgs.writeText "flashpolixy.xml" cfg.policy} \ 2> /dev/null diff --git a/nixos/modules/services/networking/nftables.nix b/nixos/modules/services/networking/nftables.nix index 56b94205414..ad7c013a544 100644 --- a/nixos/modules/services/networking/nftables.nix +++ b/nixos/modules/services/networking/nftables.nix @@ -116,7 +116,7 @@ in include "${cfg.rulesetFile}" ''; checkScript = pkgs.writeScript "nftables-check" '' - #! ${pkgs.stdenv.shell} -e + #! ${pkgs.runtimeShell} -e if $(${pkgs.kmod}/bin/lsmod | grep -q ip_tables); then echo "Unload ip_tables before using nftables!" 1>&2 exit 1 diff --git a/nixos/modules/services/networking/rdnssd.nix b/nixos/modules/services/networking/rdnssd.nix index 95833d31e99..a102242eae7 100644 --- a/nixos/modules/services/networking/rdnssd.nix +++ b/nixos/modules/services/networking/rdnssd.nix @@ -6,7 +6,7 @@ with lib; let mergeHook = pkgs.writeScript "rdnssd-merge-hook" '' - #! ${pkgs.stdenv.shell} -e + #! ${pkgs.runtimeShell} -e ${pkgs.openresolv}/bin/resolvconf -u ''; in |