From 198cadf3968b116a2f3d74f83f4f636cde925203 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 11 Jul 2016 20:43:56 +0200
Subject: ma: nixpkgs@0546a4a

---
 makefu/2configs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu/2configs/default.nix')

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 422927b28..4e6cc0b44 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -24,7 +24,7 @@ with config.krebs.lib;
       source =  mapAttrs (_: mkDefault) {
         nixpkgs = {
           url = https://github.com/nixos/nixpkgs;
-          rev = "63b9785"; # stable @ 2016-06-01
+          rev = "8bf31d7"; # stable @ 2016-06-11
         };
         secrets = if getEnv "dummy_secrets" == "true"
                   then toString <stockholm/makefu/6tests/data/secrets>
-- 
cgit v1.2.3


From 1c8ee1239fe57aabd55b686aca49960a9521ed8c Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 11 Jul 2016 20:47:22 +0200
Subject: m: nixpkgs@0546a4a

---
 makefu/2configs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'makefu/2configs/default.nix')

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 4e6cc0b44..48cfcb7cb 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -24,7 +24,7 @@ with config.krebs.lib;
       source =  mapAttrs (_: mkDefault) {
         nixpkgs = {
           url = https://github.com/nixos/nixpkgs;
-          rev = "8bf31d7"; # stable @ 2016-06-11
+          rev = "0546a4a"; # stable @ 2016-06-11
         };
         secrets = if getEnv "dummy_secrets" == "true"
                   then toString <stockholm/makefu/6tests/data/secrets>
-- 
cgit v1.2.3


From 0691d1ba14a3c9c69ba6b6f50246b6402b29b3ad Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 14 Jul 2016 17:55:41 +0200
Subject: m 2 default:remove useroaming no as it is disabled by default

---
 makefu/2configs/default.nix | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'makefu/2configs/default.nix')

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index 48cfcb7cb..c40256db3 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -62,9 +62,6 @@ with config.krebs.lib;
 
   programs.ssh = {
     startAgent = false;
-    extraConfig = ''
-      UseRoaming no
-    '';
   };
   services.openssh.enable = true;
   nix.useChroot = true;
-- 
cgit v1.2.3


From 14242c68f234f6de0bed015817ac206f99dc4f20 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 14 Jul 2016 22:31:27 +0200
Subject: m binary-cache: split lass and nixos

---
 makefu/2configs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'makefu/2configs/default.nix')

diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix
index c40256db3..acd34b0d3 100644
--- a/makefu/2configs/default.nix
+++ b/makefu/2configs/default.nix
@@ -2,8 +2,6 @@
 
 with config.krebs.lib;
 {
-  system.stateVersion = "15.09";
-
   imports = [
     {
       users.extraUsers =
@@ -11,6 +9,8 @@ with config.krebs.lib;
                  (import <secrets/hashedPasswords.nix>);
     }
     ./vim.nix
+    ./binary-cache/nixos.nix
+    ./binary-cache/lass.nix
   ];
 
   nixpkgs.config.allowUnfreePredicate =  (pkg: pkgs.lib.hasPrefix "unrar-" pkg.name);
-- 
cgit v1.2.3