diff options
| author | makefu <github@syntax-fehler.de> | 2015-10-23 15:38:01 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-10-23 15:38:01 +0200 |
| commit | a1d05482e5527d32baef9d9343b900dee8d46694 (patch) | |
| tree | 2de3ac509481799f6188620987cdf1678ea675a5 /tv/2configs | |
| parent | 709ebf6bbcc2e0d4644ed35cd42db47c4f2e78c5 (diff) | |
| parent | 93dcfe5ad61903f90f422d9d6c97e499b240aa86 (diff) | |
Merge remote-tracking branch 'cloudkrebs/master'
Diffstat (limited to 'tv/2configs')
| -rw-r--r-- | tv/2configs/base.nix | 6 | ||||
| -rw-r--r-- | tv/2configs/test.nix | 2 | ||||
| -rw-r--r-- | tv/2configs/urlwatch.nix | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/tv/2configs/base.nix b/tv/2configs/base.nix index 010d4b326..4de980cf1 100644 --- a/tv/2configs/base.nix +++ b/tv/2configs/base.nix @@ -15,6 +15,12 @@ in imports = [ { + # stockholm dependencies + environment.systemPackages = with pkgs; [ + git + ]; + } + { # TODO never put hashedPassword into the store users.extraUsers = mapAttrs (_: h: { hashedPassword = h; }) diff --git a/tv/2configs/test.nix b/tv/2configs/test.nix index 409b4e9b4..f5f068d6f 100644 --- a/tv/2configs/test.nix +++ b/tv/2configs/test.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -with import ../4lib { inherit lib pkgs; }; +with lib; let out = { diff --git a/tv/2configs/urlwatch.nix b/tv/2configs/urlwatch.nix index c1c5d19d9..373803cc6 100644 --- a/tv/2configs/urlwatch.nix +++ b/tv/2configs/urlwatch.nix @@ -29,10 +29,6 @@ # 2014-09-24 ref https://github.com/4z3/xintmap http://www.mathstat.dal.ca/~selinger/quipper/ - # 2014-12-12 remove nixopsUnstable when nixops get's bumped to 1.3 - # ref https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/package-management/nixops/unstable.nix - http://nixos.org/releases/nixops/ - ## other https://nixos.org/channels/nixos-unstable/git-revision |