summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Hihn <markus.hihn@dcso.de>2018-01-09 11:16:43 +0100
committerMarkus Hihn <markus.hihn@dcso.de>2018-01-09 11:16:43 +0100
commit2b418e2c18ba3013808b39c50e152a0163c3a60c (patch)
tree0895ed75f1b8b4d90961eaf4fa73173cd9e42738
parent99065dfd7ad990ea7ad4c44b7b209de7e3859926 (diff)
jeschli: meltdown fix
-rw-r--r--jeschli/2configs/default.nix1
-rw-r--r--jeschli/source.nix2
2 files changed, 2 insertions, 1 deletions
diff --git a/jeschli/2configs/default.nix b/jeschli/2configs/default.nix
index 7fb240951..77281b301 100644
--- a/jeschli/2configs/default.nix
+++ b/jeschli/2configs/default.nix
@@ -4,6 +4,7 @@ with import <stockholm/lib>;
imports = [
./vim.nix
./retiolum.nix
+ <stockholm/lass/2configs/security-workarounds.nix>
{
environment.variables = {
NIX_PATH = mkForce "secrets=/var/src/stockholm/null:/var/src";
diff --git a/jeschli/source.nix b/jeschli/source.nix
index ae9e1e72e..382dd61bc 100644
--- a/jeschli/source.nix
+++ b/jeschli/source.nix
@@ -10,7 +10,7 @@ in
nixos-config.symlink = "stockholm/jeschli/1systems/${name}/config.nix";
nixpkgs.git = {
url = https://github.com/nixos/nixpkgs;
- ref = "d83c808";
+ ref = "0653b73";
};
secrets.file = getAttr builder {
buildbot = toString <stockholm/jeschli/2configs/tests/dummy-secrets>;