Merge remote-tracking branch 'lass/master'

4 files changed, 0 insertions, 35 deletions

diff --git a/nin/1systems/axon/source.nix b/nin/1systems/axon/source.nix
deleted file mode 100644
index 6a40296da..000000000
--- a/nin/1systems/axon/source.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import <stockholm/nin/source.nix> {
-  name = "axon";
-  secure = true;
-}
diff --git a/nin/1systems/hiawatha/source.nix b/nin/1systems/hiawatha/source.nix
deleted file mode 100644
index a4b366b9c..000000000
--- a/nin/1systems/hiawatha/source.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import <stockholm/nin/source.nix> {
-  name = "hiawatha";
-  secure = true;
-}
diff --git a/nin/1systems/onondaga/source.nix b/nin/1systems/onondaga/source.nix
deleted file mode 100644
index 60d020222..000000000
--- a/nin/1systems/onondaga/source.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import <stockholm/nin/source.nix> {
-  name = "onondaga";
-  secure = true;
-}
diff --git a/nin/source.nix b/nin/source.nix
deleted file mode 100644
index a4bf0a98c..000000000
--- a/nin/source.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-with import <stockholm/lib>;
-host@{ name, secure ? false }: let
-  builder = if getEnv "dummy_secrets" == "true"
-              then "buildbot"
-              else "nin";
-  _file = <stockholm> + "/nin/1systems/${name}/source.nix";
-  pkgs = import <nixpkgs> {
-    overlays = map import [
-      <stockholm/krebs/5pkgs>
-      <stockholm/submodules/nix-writers/pkgs>
-    ];
-  };
-in
-  evalSource (toString _file) {
-    nixos-config.symlink = "stockholm/nin/1systems/${name}/config.nix";
-    secrets.file = getAttr builder {
-      buildbot = toString <stockholm/nin/0tests/dummysecrets>;
-      nin = "/home/nin/secrets/${name}";
-    };
-    stockholm.file = toString <stockholm>;
-    stockholm-version.pipe = "${pkgs.stockholm}/bin/get-version";
-    nixpkgs = (import <stockholm/krebs/source.nix> host).nixpkgs;
-  }