summaryrefslogtreecommitdiffstats
path: root/tv
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-10-22 01:18:21 +0200
committerlassulus <lass@aidsballs.de>2016-10-22 01:18:21 +0200
commit7b350a5122d7933d0b47735a56d2ef3c2d9c76e2 (patch)
tree9ebcd0e908105f521acf5606a88905d1201cbbf3 /tv
parent0f38de96e8749e49af333028435edb37f7b4ae60 (diff)
parentb15eda79dffda9eb69c22f0d78e1d79120ca269b (diff)
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv')
-rw-r--r--tv/2configs/default.nix2
-rw-r--r--tv/2configs/retiolum.nix1
2 files changed, 1 insertions, 2 deletions
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index 32e4b4503..b80479eaa 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -14,7 +14,7 @@ with import <stockholm/lib>;
stockholm.file = "/home/tv/stockholm";
nixpkgs.git = {
url = https://github.com/NixOS/nixpkgs;
- ref = "b8ede35d2efa96490857c22c751e75d600bea44f";
+ ref = "31c72ce266b0179efa877bb3acd7dfd7b746537b";
};
} // optionalAttrs host.secure {
secrets-master.file = "/home/tv/secrets/master";
diff --git a/tv/2configs/retiolum.nix b/tv/2configs/retiolum.nix
index 0abc96822..ad1116d4f 100644
--- a/tv/2configs/retiolum.nix
+++ b/tv/2configs/retiolum.nix
@@ -10,7 +10,6 @@ with import <stockholm/lib>;
"prism"
"echelon"
"cd"
- "ire"
];
tincPackage = pkgs.tinc_pre;
};