summaryrefslogtreecommitdiffstats
path: root/nin
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2018-09-13 16:41:25 +0200
committermakefu <github@syntax-fehler.de>2018-09-13 16:41:25 +0200
commitb830d7476a8f19f968513a219d53c0e091d4a03f (patch)
tree261db8acf25fe0d372a2d8d49bf512425fc8ad2f /nin
parentb658de054d724064a3531de2d4a53a7a28cdc6ac (diff)
parentd580af7fd9c210f584603aa32318761b4eb3a877 (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'nin')
-rw-r--r--nin/1systems/axon/source.nix4
-rw-r--r--nin/1systems/hiawatha/source.nix4
-rw-r--r--nin/1systems/onondaga/source.nix4
-rw-r--r--nin/source.nix23
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;
- }