From 4851c2fe0e2f4df65b06ece3e0a84c6bab88a525 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 24 Jan 2018 14:49:09 +0100 Subject: nixpkgs: 0b30c1d -> b222a0 --- krebs/source.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs/source.nix') diff --git a/krebs/source.nix b/krebs/source.nix index b952aa2a..2a45a009 100644 --- a/krebs/source.nix +++ b/krebs/source.nix @@ -17,6 +17,6 @@ in stockholm.file = toString ; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "0b30c1dd4c638e318957fc6a9198cf2429e38cb5"; # nixos-17.09 @ 2018-01-04 + ref = "b222a0713f4a689519686421b3fbf5ca0c9bd3da"; # nixos-17.09 @ 2018-01-23 }; } -- cgit v1.2.3 From e00acc20944364ba185cbdedab9347179d2004d8 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 24 Jan 2018 17:26:24 +0100 Subject: source: enable override --- krebs/source.nix | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) (limited to 'krebs/source.nix') diff --git a/krebs/source.nix b/krebs/source.nix index 2a45a009..fcc7fb74 100644 --- a/krebs/source.nix +++ b/krebs/source.nix @@ -1,22 +1,25 @@ with import ; -host@{ name, secure ? false }: let +host@{ name, secure ? false, override ? {} }: let builder = if getEnv "dummy_secrets" == "true" then "buildbot" else "krebs"; _file = + "/krebs/1systems/${name}/source.nix"; in - evalSource (toString _file) { - nixos-config.symlink = "stockholm/krebs/1systems/${name}/config.nix"; - secrets = getAttr builder { - buildbot.file = toString ; - krebs.pass = { - dir = "${getEnv "HOME"}/brain"; - name = "krebs-secrets/${name}"; + evalSource (toString _file) [ + { + nixos-config.symlink = "stockholm/krebs/1systems/${name}/config.nix"; + secrets = getAttr builder { + buildbot.file = toString ; + krebs.pass = { + dir = "${getEnv "HOME"}/brain"; + name = "krebs-secrets/${name}"; + }; }; - }; - stockholm.file = toString ; - nixpkgs.git = { - url = https://github.com/NixOS/nixpkgs; - ref = "b222a0713f4a689519686421b3fbf5ca0c9bd3da"; # nixos-17.09 @ 2018-01-23 - }; - } + stockholm.file = toString ; + nixpkgs.git = { + url = https://github.com/NixOS/nixpkgs; + ref = "b222a0713f4a689519686421b3fbf5ca0c9bd3da"; # nixos-17.09 @ 2018-01-23 + }; + } + override + ] -- cgit v1.2.3 From d5aa4524f478a29779b4219e1a8dea10fef74065 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 9 Feb 2018 09:23:14 +0100 Subject: nixpkgs: b222a07 -> b34a5f6 --- krebs/source.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs/source.nix') diff --git a/krebs/source.nix b/krebs/source.nix index fcc7fb74..60303c7c 100644 --- a/krebs/source.nix +++ b/krebs/source.nix @@ -18,7 +18,7 @@ in stockholm.file = toString ; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "b222a0713f4a689519686421b3fbf5ca0c9bd3da"; # nixos-17.09 @ 2018-01-23 + ref = "b34a5f6d874e3c3f3f7812371b858b79ddb5be35"; # nixos-17.09 @ 2018-02-09 }; } override -- cgit v1.2.3 From 2f9edee631e353cb250cc1c10e015b7f4c14fb4f Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 9 Feb 2018 17:31:23 +0100 Subject: nixpkgs: b34a5f6 -> e18442d --- krebs/source.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs/source.nix') diff --git a/krebs/source.nix b/krebs/source.nix index 60303c7c..ca87b33f 100644 --- a/krebs/source.nix +++ b/krebs/source.nix @@ -18,7 +18,7 @@ in stockholm.file = toString ; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "b34a5f6d874e3c3f3f7812371b858b79ddb5be35"; # nixos-17.09 @ 2018-02-09 + ref = "e18442d46621ee7e1204db0b14025621a9d49cbd"; # nixos-17.09 @ 2018-02-09 }; } override -- cgit v1.2.3 From e155044112209e4a63b9c27ef100dc5d748a2e32 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 10 Feb 2018 12:30:26 +0100 Subject: nixpkgs: e18442d -> 2062ac5 --- krebs/source.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs/source.nix') diff --git a/krebs/source.nix b/krebs/source.nix index ca87b33f..27450c2a 100644 --- a/krebs/source.nix +++ b/krebs/source.nix @@ -18,7 +18,7 @@ in stockholm.file = toString ; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "e18442d46621ee7e1204db0b14025621a9d49cbd"; # nixos-17.09 @ 2018-02-09 + ref = "2062ac5aa2dc0770322272e3d2b647cf431dd893"; # nixos-17.09 @ 2018-02-09 }; } override -- cgit v1.2.3 From 11a7d704e22f56c83c1af3c8ca0bfcbb510316f2 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 15 Feb 2018 13:18:17 +0100 Subject: nixpkgs: 2062ac5 -> c831224 --- krebs/source.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs/source.nix') diff --git a/krebs/source.nix b/krebs/source.nix index 27450c2a..73ebf135 100644 --- a/krebs/source.nix +++ b/krebs/source.nix @@ -18,7 +18,7 @@ in stockholm.file = toString ; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "2062ac5aa2dc0770322272e3d2b647cf431dd893"; # nixos-17.09 @ 2018-02-09 + ref = "c831224528cd6bfd49bfc2c18b9c5d9015651077"; # nixos-17.09 @ 2018-02-15 }; } override -- cgit v1.2.3 From 1b61fa920eb775406bb00855fb22485f4e9c160a Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 22 Feb 2018 22:17:38 +0100 Subject: nixpkgs: c831224 -> d09e425 --- krebs/source.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'krebs/source.nix') diff --git a/krebs/source.nix b/krebs/source.nix index 73ebf135..c2fbbc5f 100644 --- a/krebs/source.nix +++ b/krebs/source.nix @@ -18,7 +18,7 @@ in stockholm.file = toString ; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs; - ref = "c831224528cd6bfd49bfc2c18b9c5d9015651077"; # nixos-17.09 @ 2018-02-15 + ref = "d09e425aea3e09b6cec5c7b05cc0603f6853748b"; # nixos-17.09 @ 2018-02-22 }; } override -- cgit v1.2.3