summaryrefslogtreecommitdiffstats
path: root/modules/cd
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-07-07 05:55:28 +0200
committertv <tv@shackspace.de>2015-07-07 05:55:28 +0200
commit366373e9c6d20501e0756a7e97cced2cb96d447d (patch)
tree94d4afccec8b669ea7564fed069513807fd4ff8b /modules/cd
parent9c2bc5b4d0c6a87d5902eea3c3838d28dfe89a85 (diff)
deploy: refactor to use modified/*/paths.nix
Diffstat (limited to 'modules/cd')
-rw-r--r--modules/cd/default.nix6
-rw-r--r--modules/cd/paths.nix12
2 files changed, 12 insertions, 6 deletions
diff --git a/modules/cd/default.nix b/modules/cd/default.nix
index d57d46be2..45b798e27 100644
--- a/modules/cd/default.nix
+++ b/modules/cd/default.nix
@@ -10,7 +10,6 @@ in
{ users.extraUsers = import <secrets/extraUsers.nix>; }
./networking.nix
./users.nix
- ../common/nixpkgs.nix
../tv/base.nix
../tv/base-cac-CentOS-7-64bit.nix
../tv/ejabberd.nix # XXX echtes modul
@@ -50,11 +49,6 @@ in
# "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
diff --git a/modules/cd/paths.nix b/modules/cd/paths.nix
new file mode 100644
index 000000000..f873912fb
--- /dev/null
+++ b/modules/cd/paths.nix
@@ -0,0 +1,12 @@
+{
+ lib.file.url = ../../lib;
+ modules.file.url = ../../modules;
+ nixpkgs.git = {
+ url = https://github.com/NixOS/nixpkgs;
+ rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870";
+ cache = ../../tmp/git-cache;
+ };
+ pubkeys.file.url = ../../pubkeys;
+ retiolum-hosts.file.url = ../../hosts;
+ secrets.file.url = ../../secrets/cd/nix;
+}