summaryrefslogtreecommitdiffstats
path: root/tv/1systems
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-11-06 22:23:46 +0100
committermakefu <github@syntax-fehler.de>2015-11-06 22:23:46 +0100
commit736e1426d5a7ec76d0987840552d56c6b4f0248e (patch)
tree944c5595dfbb2c66dfe934d48cc8349522c91aa8 /tv/1systems
parent2dcb2918d1cd159d9282096ef3b5cecc4239bfbc (diff)
parent12597b1febb0bc47cf98529a12e5fc6af1d8f5a4 (diff)
Merge branch 'master' of pnp:stockholm
Diffstat (limited to 'tv/1systems')
-rw-r--r--tv/1systems/cd.nix4
-rw-r--r--tv/1systems/mkdir.nix2
-rw-r--r--tv/1systems/nomic.nix4
-rw-r--r--tv/1systems/rmdir.nix2
-rw-r--r--tv/1systems/wu.nix4
-rw-r--r--tv/1systems/xu.nix3
6 files changed, 10 insertions, 9 deletions
diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index 69f1300be..1122e6a19 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd.nix
@@ -10,8 +10,8 @@ with lib;
krebs.build.source = {
git.nixpkgs = {
- url = https://github.com/4z3/nixpkgs;
- rev = "03130ec91356cd250b80f144022ee2f4d665ca36"; # 1357692
+ url = https://github.com/NixOS/nixpkgs;
+ rev = "c44a593aa43bba6a0708f6f36065a514a5110613";
};
dir.secrets = {
host = config.krebs.hosts.wu;
diff --git a/tv/1systems/mkdir.nix b/tv/1systems/mkdir.nix
index 305ea7269..e8e354197 100644
--- a/tv/1systems/mkdir.nix
+++ b/tv/1systems/mkdir.nix
@@ -24,7 +24,7 @@ in
krebs.build.source = {
git.nixpkgs = {
url = https://github.com/NixOS/nixpkgs;
- rev = "e57024f821c94caf5684964474073649b8b6356b";
+ rev = "c44a593aa43bba6a0708f6f36065a514a5110613";
};
dir.secrets = {
host = config.krebs.hosts.wu;
diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix
index 61f833d41..df45b8177 100644
--- a/tv/1systems/nomic.nix
+++ b/tv/1systems/nomic.nix
@@ -10,8 +10,8 @@ with lib;
krebs.build.source = {
git.nixpkgs = {
- url = https://github.com/4z3/nixpkgs;
- rev = "03130ec91356cd250b80f144022ee2f4d665ca36"; # 1357692
+ url = https://github.com/NixOS/nixpkgs;
+ rev = "c44a593aa43bba6a0708f6f36065a514a5110613";
};
dir.secrets = {
host = config.krebs.hosts.wu;
diff --git a/tv/1systems/rmdir.nix b/tv/1systems/rmdir.nix
index f77268b53..e24ef64fc 100644
--- a/tv/1systems/rmdir.nix
+++ b/tv/1systems/rmdir.nix
@@ -24,7 +24,7 @@ in
krebs.build.source = {
git.nixpkgs = {
url = https://github.com/NixOS/nixpkgs;
- rev = "68bd8e4a9dc247726ae89cc8739574261718e328";
+ rev = "c44a593aa43bba6a0708f6f36065a514a5110613";
};
dir.secrets = {
host = config.krebs.hosts.wu;
diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix
index 65389b662..b12e7df93 100644
--- a/tv/1systems/wu.nix
+++ b/tv/1systems/wu.nix
@@ -11,7 +11,8 @@ with lib;
krebs.build.source = {
git.nixpkgs = {
url = https://github.com/NixOS/nixpkgs;
- rev = "e916273209560b302ab231606babf5ce1c481f08";
+ rev = "c44a593aa43bba6a0708f6f36065a514a5110613";
+ target-path = "/var/src/nixpkgs";
};
dir.secrets = {
host = config.krebs.hosts.wu;
@@ -20,6 +21,7 @@ with lib;
dir.stockholm = {
host = config.krebs.hosts.wu;
path = "/home/tv/stockholm";
+ target-path = "/var/src/stockholm";
};
};
diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix
index 82f5abf73..e2cc2c06a 100644
--- a/tv/1systems/xu.nix
+++ b/tv/1systems/xu.nix
@@ -11,7 +11,7 @@ with lib;
krebs.build.source = {
git.nixpkgs = {
url = https://github.com/NixOS/nixpkgs;
- rev = "e57024f821c94caf5684964474073649b8b6356b";
+ rev = "c44a593aa43bba6a0708f6f36065a514a5110613";
};
dir.secrets = {
host = config.krebs.hosts.wu;
@@ -110,7 +110,6 @@ with lib;
#minicom
#mtools
#ncmpc
- #neovim
#nethogs
#nix-prefetch-scripts #cvs bug
#openssl