summaryrefslogtreecommitdiffstats
path: root/0make
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2015-07-27 10:09:13 +0200
committerlassulus <lass@aidsballs.de>2015-07-27 10:09:13 +0200
commitbfc33453e972d643a5f78187812add30550c8f3f (patch)
treef2c86d609106856ef92c605dc11da222132d1aaa /0make
parent09031485dcea56d5207f7c668c5cec6830a588d5 (diff)
parentdc9b0d7ce100c1286353e1ce3a8b11c42e48738d (diff)
Merge branch 'tv' into master
Diffstat (limited to '0make')
-rw-r--r--0make/makefu/pnp.makefile4
-rw-r--r--0make/tv/nomic.makefile2
2 files changed, 5 insertions, 1 deletions
diff --git a/0make/makefu/pnp.makefile b/0make/makefu/pnp.makefile
new file mode 100644
index 0000000..a18efe0
--- /dev/null
+++ b/0make/makefu/pnp.makefile
@@ -0,0 +1,4 @@
+deploy_host := root@pnp
+nixpkgs_url := https://github.com/nixos/nixpkgs
+nixpkgs_rev := 4c01e6d91993b6de128795f4fbdd25f6227fb870
+secrets_dir := /home/makefu/secrets/pnp
diff --git a/0make/tv/nomic.makefile b/0make/tv/nomic.makefile
index 4ae1ccd..9e0b867 100644
--- a/0make/tv/nomic.makefile
+++ b/0make/tv/nomic.makefile
@@ -1,4 +1,4 @@
deploy_host := root@nomic.gg23
nixpkgs_url := https://github.com/NixOS/nixpkgs
-nixpkgs_rev := 6ad8fab785695d04a6925e8b3464ca7c71a85c3f
+nixpkgs_rev := 9d5508d85c33b8fb22d79dde6176792eac2c2696
secrets_dir := /home/tv/secrets/nomic