summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2017-10-26 21:25:54 +0200
committerlassulus <lassulus@lassul.us>2017-10-26 21:25:54 +0200
commit09f66bb817d0d0f040d188ebe2620afa09fc30cf (patch)
treedec04f862bbb0acbd2fe174f6d893a0fe88af219 /tv
parent251a86526dac86a6a605e0e2ed68a3fbec9acd8e (diff)
parent42f3a5661b4e53b76eb7315df1782b9942f47865 (diff)
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv')
-rw-r--r--tv/2configs/netzclub.nix2
-rw-r--r--tv/3modules/default.nix1
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
];
}