diff options
author | lassulus <lassulus@lassul.us> | 2017-10-26 21:25:54 +0200 |
---|---|---|
committer | lassulus <lassulus@lassul.us> | 2017-10-26 21:25:54 +0200 |
commit | 09f66bb817d0d0f040d188ebe2620afa09fc30cf (patch) | |
tree | dec04f862bbb0acbd2fe174f6d893a0fe88af219 | |
parent | 251a86526dac86a6a605e0e2ed68a3fbec9acd8e (diff) | |
parent | 42f3a5661b4e53b76eb7315df1782b9942f47865 (diff) |
Merge remote-tracking branch 'ni/master'
-rw-r--r-- | tv/2configs/netzclub.nix | 2 | ||||
-rw-r--r-- | tv/3modules/default.nix | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tv/2configs/netzclub.nix b/tv/2configs/netzclub.nix index 659e0d4e4..dc2de7147 100644 --- a/tv/2configs/netzclub.nix +++ b/tv/2configs/netzclub.nix @@ -39,7 +39,7 @@ ''; environment.systemPackages = [ - ppp + pkgs.ppp ]; } diff --git a/tv/3modules/default.nix b/tv/3modules/default.nix index 0fcf8cc9d..493cc8b72 100644 --- a/tv/3modules/default.nix +++ b/tv/3modules/default.nix @@ -5,7 +5,6 @@ ./hosts.nix ./iptables.nix ./nixpkgs-overlays.nix - ./umts.nix ./x0vncserver.nix ]; } |