summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-05-19 22:04:36 +0200
committertv <tv@shackspace.de>2015-05-19 23:17:20 +0200
commit7378dd4f1c0b3893ed7a707eecaec9141139012f (patch)
treecb9f4b940a973adac3a20068a8483552a09908f6 /modules
parentb57585d3e5c2351d1fd5ddafca03edc62ad5292a (diff)
host cd: use common nixpkgs
Diffstat (limited to 'modules')
-rw-r--r--modules/cd/default.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/modules/cd/default.nix b/modules/cd/default.nix
index 2301f2d95..7ceaf71f3 100644
--- a/modules/cd/default.nix
+++ b/modules/cd/default.nix
@@ -6,6 +6,7 @@
<secrets/hashedPasswords.nix>
./iptables.nix
./networking.nix
+ ../common/nixpkgs.nix
../tv/base.nix
../tv/base-cac-CentOS-7-64bit.nix
../tv/ejabberd.nix # XXX echtes modul
@@ -17,8 +18,13 @@
# "Developer 2" plan has two vCPUs.
nix.maxJobs = 2;
+ nixpkgs = {
+ url = "https://github.com/NixOS/nixpkgs";
+ rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870";
+ };
environment.systemPackages = with pkgs; [
+ git # required for ./deploy, clone_or_update
htop
iftop
iotop