From 366373e9c6d20501e0756a7e97cced2cb96d447d Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 7 Jul 2015 05:55:28 +0200 Subject: deploy: refactor to use modified/*/paths.nix --- modules/rmdir/default.nix | 6 ------ modules/rmdir/paths.nix | 12 ++++++++++++ 2 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 modules/rmdir/paths.nix (limited to 'modules/rmdir') diff --git a/modules/rmdir/default.nix b/modules/rmdir/default.nix index 62fbd84f..d24ad573 100644 --- a/modules/rmdir/default.nix +++ b/modules/rmdir/default.nix @@ -10,7 +10,6 @@ in { users.extraUsers = import ; } ./networking.nix ./users.nix - ../common/nixpkgs.nix ../tv/base.nix ../tv/base-cac-CentOS-7-64bit.nix ../tv/exim-smarthost.nix @@ -50,11 +49,6 @@ in nix.maxJobs = 1; - 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/rmdir/paths.nix b/modules/rmdir/paths.nix new file mode 100644 index 00000000..f873912f --- /dev/null +++ b/modules/rmdir/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; +} -- cgit v1.2.3