diff options
| author | tv <tv@shackspace.de> | 2015-08-28 21:59:19 +0200 |
|---|---|---|
| committer | tv <tv@shackspace.de> | 2015-08-28 21:59:19 +0200 |
| commit | f63b27240ec7b7de1834ddc36a325556498c4e6c (patch) | |
| tree | e4cc782872da100b02e60f83b665e2977c5da568 /makefu/1systems | |
| parent | e5ecd75ac266a77c31790e52c2ea000574be9e22 (diff) | |
| parent | 4f968b3cc45db1e6373fa2add55b5afe1608266a (diff) | |
Merge remote-tracking branch 'pnp/master'
Diffstat (limited to 'makefu/1systems')
| -rw-r--r-- | makefu/1systems/pnp.nix | 2 | ||||
| -rw-r--r-- | makefu/1systems/pornocauster.nix | 7 | ||||
| -rw-r--r-- | makefu/1systems/repunit.nix | 3 | ||||
| -rw-r--r-- | makefu/1systems/tsp.nix | 8 |
4 files changed, 9 insertions, 11 deletions
diff --git a/makefu/1systems/pnp.nix b/makefu/1systems/pnp.nix index 1147c20fe..963d07744 100644 --- a/makefu/1systems/pnp.nix +++ b/makefu/1systems/pnp.nix @@ -24,7 +24,7 @@ krebs.build.deps = { nixpkgs = { url = https://github.com/NixOS/nixpkgs; - rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870"; + rev = "13576925552b1d0751498fdda22e91a055a1ff6c"; }; }; diff --git a/makefu/1systems/pornocauster.nix b/makefu/1systems/pornocauster.nix index 40aa5bb1f..415c1af30 100644 --- a/makefu/1systems/pornocauster.nix +++ b/makefu/1systems/pornocauster.nix @@ -37,10 +37,9 @@ krebs.build.deps = { nixpkgs = { - #url = https://github.com/NixOS/nixpkgs; - # rev=$(curl https://nixos.org/channels/nixos-unstable/git-revision -L) - url = https://github.com/makefu/nixpkgs; - rev = "f5fe787f778b872c6b2221598501c9310cb83915"; + url = https://github.com/NixOS/nixpkgs; + #url = https://github.com/makefu/nixpkgs; + rev = "13576925552b1d0751498fdda22e91a055a1ff6c"; }; }; } diff --git a/makefu/1systems/repunit.nix b/makefu/1systems/repunit.nix index 7596a3d54..503fe8f65 100644 --- a/makefu/1systems/repunit.nix +++ b/makefu/1systems/repunit.nix @@ -18,7 +18,8 @@ krebs.build.deps = { nixpkgs = { url = https://github.com/NixOS/nixpkgs; - rev = "4c01e6d91993b6de128795f4fbdd25f6227fb870"; + #url = https://github.com/makefu/nixpkgs; + rev = "13576925552b1d0751498fdda22e91a055a1ff6c"; }; secrets = { url = "/home/makefu/secrets/${config.krebs.build.host.name}"; diff --git a/makefu/1systems/tsp.nix b/makefu/1systems/tsp.nix index 887778c8f..67db22460 100644 --- a/makefu/1systems/tsp.nix +++ b/makefu/1systems/tsp.nix @@ -31,11 +31,9 @@ krebs.build.deps = { nixpkgs = { - #url = https://github.com/NixOS/nixpkgs; - # rev=$(curl https://nixos.org/channels/nixos-unstable/git-revision -L) - url = https://github.com/makefu/nixpkgs; - #rev = "8b8b65da24f13f9317504e8bcba476f9161613fe"; - rev = "f5fe787f778b872c6b2221598501c9310cb83915"; + url = https://github.com/NixOS/nixpkgs; + #url = https://github.com/makefu/nixpkgs; + rev = "13576925552b1d0751498fdda22e91a055a1ff6c"; }; }; } |