about summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorxeji <36407913+xeji@users.noreply.github.com>2018-09-15 12:38:45 +0200
committerGitHub <noreply@github.com>2018-09-15 12:38:45 +0200
commitb78348d1a4b967288b06caf35eb4e26f0f65fa1e (patch)
tree804e6645cb046f3985d7de5cba85983642b68faf /pkgs/tools
parent27f2e700f434b48bd901a5dde5258d26df4215ee (diff)
parent2438ceb5b486c071a94bde7542847de33634abb3 (diff)
Merge pull request #46687 from mbode/salt_darwin
salt: fix darwin build by specifying dependency on tornado 4
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/admin/salt/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix
index 80df9148220c1..6cf997cd738cd 100644
--- a/pkgs/tools/admin/salt/default.nix
+++ b/pkgs/tools/admin/salt/default.nix
@@ -23,7 +23,7 @@ pythonPackages.buildPythonApplication rec {
     pyyaml
     pyzmq
     requests
-    tornado
+    tornado_4
   ] ++ stdenv.lib.optional (!pythonPackages.isPy3k) [
     futures
   ] ++ extraInputs;