From 61f1aba8bc69dc522710d5871545cf4b4ec8645b Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 27 Nov 2018 21:06:20 +0100 Subject: * krops: get nixpkgs from store for ci --- jeschli/krops.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'jeschli') diff --git a/jeschli/krops.nix b/jeschli/krops.nix index d45d57c63..fff014377 100644 --- a/jeschli/krops.nix +++ b/jeschli/krops.nix @@ -1,11 +1,13 @@ { name }: let inherit (import ../krebs/krops.nix { inherit name; }) + krebs-nixpkgs krebs-source lib pkgs ; source = { test }: lib.evalSource [ + (krebs-nixpkgs { test = test; }) krebs-source { nixos-config.symlink = "stockholm/jeschli/1systems/${name}/config.nix"; -- cgit v1.2.3 From 95f6255f586e93e096d56de75add76d7560b9df1 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 28 Nov 2018 21:30:46 +0100 Subject: * krops: merge krebs-nixpkgs into krebs-source --- jeschli/krops.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'jeschli') diff --git a/jeschli/krops.nix b/jeschli/krops.nix index fff014377..989abcdd0 100644 --- a/jeschli/krops.nix +++ b/jeschli/krops.nix @@ -1,14 +1,12 @@ { name }: let inherit (import ../krebs/krops.nix { inherit name; }) - krebs-nixpkgs krebs-source lib pkgs ; source = { test }: lib.evalSource [ - (krebs-nixpkgs { test = test; }) - krebs-source + (krebs-source { test = test; }) { nixos-config.symlink = "stockholm/jeschli/1systems/${name}/config.nix"; secrets = if test then { -- cgit v1.2.3