diff options
author | tv <tv@krebsco.de> | 2015-08-29 00:19:52 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2015-08-29 00:20:58 +0200 |
commit | ff4283704f16b2f708ab9a0063063149379e0f5e (patch) | |
tree | b8c912fdd43dfda3106e2082303151636317cc3a /tv/2configs | |
parent | b9ba0d66d1b34831eba134bc27f13099fd184795 (diff) |
tv: use only pkgs
Diffstat (limited to 'tv/2configs')
-rw-r--r-- | tv/2configs/charybdis.nix | 6 | ||||
-rw-r--r-- | tv/2configs/mail-client.nix | 5 | ||||
-rw-r--r-- | tv/2configs/test.nix | 6 |
3 files changed, 5 insertions, 12 deletions
diff --git a/tv/2configs/charybdis.nix b/tv/2configs/charybdis.nix index 6be6c02..a949026 100644 --- a/tv/2configs/charybdis.nix +++ b/tv/2configs/charybdis.nix @@ -1,9 +1,5 @@ { config, lib, pkgs, ... }: -let - tvpkgs = import ../5pkgs { inherit lib pkgs; }; -in - with builtins; with lib; let @@ -63,7 +59,7 @@ let ExecStart = pkgs.writeScript "charybdis-service" '' #! /bin/sh set -euf - exec ${tvpkgs.charybdis}/bin/charybdis-ircd \ + exec ${pkgs.charybdis}/bin/charybdis-ircd \ -foreground \ -logfile /dev/stderr \ -configfile ${configFile} diff --git a/tv/2configs/mail-client.nix b/tv/2configs/mail-client.nix index 1daacdb..8b6f8bb 100644 --- a/tv/2configs/mail-client.nix +++ b/tv/2configs/mail-client.nix @@ -1,7 +1,6 @@ -{ lib, pkgs, ... }: - -with import ../5pkgs { inherit lib pkgs; }; +{ pkgs, ... }: +with pkgs; { environment.systemPackages = [ much diff --git a/tv/2configs/test.nix b/tv/2configs/test.nix index fa556ec..409b4e9 100644 --- a/tv/2configs/test.nix +++ b/tv/2configs/test.nix @@ -3,8 +3,6 @@ with import ../4lib { inherit lib pkgs; }; let - tvpkgs = import ../5pkgs { inherit lib pkgs; }; - out = { environment.systemPackages = [ su-test @@ -17,12 +15,12 @@ let }; }; - su-test = tvpkgs.execveBin "su-test" rec { + su-test = pkgs.execveBin "su-test" rec { filename = "/var/setuid-wrappers/sudo"; argv = ["sudo" "-u" "test" "-i"]; }; - test-shell = tvpkgs.execve "test-shell" rec { + test-shell = pkgs.execve "test-shell" rec { filename = "${pkgs.bash}/bin/bash"; argv = ["sh" "--noprofile" "-l"]; envp.ENV = pkgs.writeText "test-env" '' |