diff options
author | lassulus <lass@aidsballs.de> | 2015-07-27 10:09:13 +0200 |
---|---|---|
committer | lassulus <lass@aidsballs.de> | 2015-07-27 10:09:13 +0200 |
commit | 54a01c0c74bdd4233962d62c4e6631f7f8b50f77 (patch) | |
tree | 705a3f8307b49e52bd95ecac8cd6d6ca828921a4 /0make | |
parent | 6476abd6ac7e000d0759569a1e2754acb2f518ca (diff) | |
parent | 3197897292f0fc8f38d30ad6ddc9742be4a7cc1d (diff) |
Merge branch 'tv' into master
Diffstat (limited to '0make')
-rw-r--r-- | 0make/makefu/pnp.makefile | 4 | ||||
-rw-r--r-- | 0make/tv/nomic.makefile | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/0make/makefu/pnp.makefile b/0make/makefu/pnp.makefile new file mode 100644 index 000000000..a18efe0e0 --- /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 4ae1ccd10..9e0b8671b 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 |