From 1b0161b595430812dee2a29396557a9cb289c4ea Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Fri, 11 Aug 2017 15:44:53 +0200
Subject: l nixpkgs: d9c85b3 -> 861b7e4

---
 lass/source.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/source.nix')

diff --git a/lass/source.nix b/lass/source.nix
index 7d60730f1..cfd965989 100644
--- a/lass/source.nix
+++ b/lass/source.nix
@@ -19,6 +19,6 @@ in
       #   87a4615 & 334ac4f
       # + acme permissions for groups
       #   fd7a8f1
-      ref = "d9c85b3";
+      ref = "861b7e4";
     };
   }
-- 
cgit v1.2.3


From 3e6e26bad14accc1064c9c42f01fd29795994e91 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 12 Aug 2017 12:36:35 +0200
Subject: l nixpkgs: 861b7e4 -> ac13f30

---
 lass/source.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/source.nix')

diff --git a/lass/source.nix b/lass/source.nix
index cfd965989..219e3d5fc 100644
--- a/lass/source.nix
+++ b/lass/source.nix
@@ -19,6 +19,6 @@ in
       #   87a4615 & 334ac4f
       # + acme permissions for groups
       #   fd7a8f1
-      ref = "861b7e4";
+      ref = "ac13f30";
     };
   }
-- 
cgit v1.2.3


From 82e715bf20c1e830879f0767477a97884c3ea61e Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Mon, 14 Aug 2017 22:28:45 +0200
Subject: l nixpkgs: ac13f30 -> 60dc02d

---
 lass/source.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lass/source.nix')

diff --git a/lass/source.nix b/lass/source.nix
index 219e3d5fc..8430ecb16 100644
--- a/lass/source.nix
+++ b/lass/source.nix
@@ -13,12 +13,12 @@ in
     };
     stockholm.file = toString <stockholm>;
     nixpkgs.git = {
-      url = https://cgit.lassul.us/nixpkgs;
+      url = http://cgit.lassul.us/nixpkgs;
       # nixos-17.03
       # + copytoram:
       #   87a4615 & 334ac4f
       # + acme permissions for groups
       #   fd7a8f1
-      ref = "ac13f30";
+      ref = "60dc02d";
     };
   }
-- 
cgit v1.2.3


From 522f6c03cfaada59e4c571a735b5022acbc31c18 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Thu, 31 Aug 2017 00:26:37 +0200
Subject: l nixpkgs: 60dc02d -> fe46ffc

---
 lass/source.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/source.nix')

diff --git a/lass/source.nix b/lass/source.nix
index 8430ecb16..26c668241 100644
--- a/lass/source.nix
+++ b/lass/source.nix
@@ -19,6 +19,6 @@ in
       #   87a4615 & 334ac4f
       # + acme permissions for groups
       #   fd7a8f1
-      ref = "60dc02d";
+      ref = "fe46ffc";
     };
   }
-- 
cgit v1.2.3


From 04626b6b0a0bcbf978735e6f2abb74b4f5631c9e Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 2 Sep 2017 16:16:37 +0200
Subject: l source: make overrideable

---
 lass/source.nix | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

(limited to 'lass/source.nix')

diff --git a/lass/source.nix b/lass/source.nix
index 26c668241..52b0d99f2 100644
--- a/lass/source.nix
+++ b/lass/source.nix
@@ -1,24 +1,27 @@
 with import <stockholm/lib>;
-host@{ name, secure ? false }: let
+host@{ name, secure ? false, override ? {} }: let
   builder = if getEnv "dummy_secrets" == "true"
               then "buildbot"
               else "lass";
   _file = <stockholm> + "/lass/1systems/${name}/source.nix";
 in
-  evalSource (toString _file) {
-    nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix";
-    secrets.file = getAttr builder {
-      buildbot = toString <stockholm/lass/2configs/tests/dummy-secrets>;
-      lass = "/home/lass/secrets/${name}";
-    };
-    stockholm.file = toString <stockholm>;
-    nixpkgs.git = {
-      url = http://cgit.lassul.us/nixpkgs;
-      # nixos-17.03
-      # + copytoram:
-      #   87a4615 & 334ac4f
-      # + acme permissions for groups
-      #   fd7a8f1
-      ref = "fe46ffc";
-    };
-  }
+  evalSource (toString _file) [
+    {
+      nixos-config.symlink = "stockholm/lass/1systems/${name}/config.nix";
+      nixpkgs.git = {
+        url = http://cgit.lassul.us/nixpkgs;
+        # nixos-17.03
+        # + copytoram:
+        #   87a4615 & 334ac4f
+        # + acme permissions for groups
+        #   fd7a8f1
+        ref = "fe46ffc";
+      };
+      secrets.file = getAttr builder {
+        buildbot = toString <stockholm/lass/2configs/tests/dummy-secrets>;
+        lass = "/home/lass/secrets/${name}";
+      };
+      stockholm.file = toString <stockholm>;
+    }
+    override
+  ]
-- 
cgit v1.2.3