diff options
| author | lassulus <lass@aidsballs.de> | 2016-02-01 15:17:16 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-02-01 15:17:16 +0100 |
| commit | 72dc2dd7fa54c77e08052efed21f68758fa533a2 (patch) | |
| tree | f2c4e93c670764134913408a6d43c2ff6c6ac15e /tv/1systems | |
| parent | 186d5cc95a7430136da3107734409511c64d7080 (diff) | |
| parent | 1a5a3c0cf2aba173772765c24a0865bb2da6b691 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/1systems')
| -rw-r--r-- | tv/1systems/cd.nix | 5 | ||||
| -rw-r--r-- | tv/1systems/wu.nix | 2 | ||||
| -rw-r--r-- | tv/1systems/xu.nix | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix index 8c2a9ae43..b69d7655a 100644 --- a/tv/1systems/cd.nix +++ b/tv/1systems/cd.nix @@ -6,6 +6,11 @@ with lib; krebs.build.host = config.krebs.hosts.cd; krebs.build.target = "root@cd.internet"; + krebs.build.source.upstream-nixpkgs = { + url = https://github.com/NixOS/nixpkgs; + rev = "b7ff030"; + }; + imports = [ ../2configs/hw/CAC-Developer-2.nix ../2configs/fs/CAC-CentOS-7-64bit.nix diff --git a/tv/1systems/wu.nix b/tv/1systems/wu.nix index 54ceb7783..3bdf8d37a 100644 --- a/tv/1systems/wu.nix +++ b/tv/1systems/wu.nix @@ -18,7 +18,7 @@ with lib; # stockholm gnumake hashPassword - lentil + haskellPackages.lentil parallel (pkgs.writeScriptBin "im" '' #! ${pkgs.bash}/bin/bash diff --git a/tv/1systems/xu.nix b/tv/1systems/xu.nix index 1f3e010a4..e6894b55e 100644 --- a/tv/1systems/xu.nix +++ b/tv/1systems/xu.nix @@ -21,7 +21,7 @@ with lib; # stockholm gnumake hashPassword - lentil + haskellPackages.lentil parallel (pkgs.writeScriptBin "im" '' #! ${pkgs.bash}/bin/bash |