summary refs log tree commit diff
path: root/pkgs/tools/admin/salt
diff options
context:
space:
mode:
authorAneesh Agrawal <aneeshusa@gmail.com>2016-10-17 11:28:04 -0400
committerFrederik Rietdijk <fridh@fridh.nl>2016-10-18 23:14:36 +0200
commit1d9a98cae068d19444752ecfc934d85e11642319 (patch)
tree6c094834de3a53453f7188ed8ee1d49bf2a16295 /pkgs/tools/admin/salt
parent365762fcb54efff885f55583a3d6017349d7cd40 (diff)
downloadnixpkgs-1d9a98cae068d19444752ecfc934d85e11642319.tar
nixpkgs-1d9a98cae068d19444752ecfc934d85e11642319.tar.gz
nixpkgs-1d9a98cae068d19444752ecfc934d85e11642319.tar.bz2
nixpkgs-1d9a98cae068d19444752ecfc934d85e11642319.tar.lz
nixpkgs-1d9a98cae068d19444752ecfc934d85e11642319.tar.xz
nixpkgs-1d9a98cae068d19444752ecfc934d85e11642319.tar.zst
nixpkgs-1d9a98cae068d19444752ecfc934d85e11642319.zip
salt: use Python 2
Diffstat (limited to 'pkgs/tools/admin/salt')
-rw-r--r--pkgs/tools/admin/salt/default.nix8
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix
index 0e927dfe1c7..3386ed86a2a 100644
--- a/pkgs/tools/admin/salt/default.nix
+++ b/pkgs/tools/admin/salt/default.nix
@@ -1,23 +1,21 @@
 {
-  stdenv, fetchurl, pythonPackages, openssl,
+  stdenv, fetchurl, python2Packages, openssl,
 
   # Many Salt modules require various Python modules to be installed,
   # passing them in this array enables Salt to find them.
   extraInputs ? []
 }:
 
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
   name = "salt-${version}";
   version = "2016.3.3";
 
-  disabled = pythonPackages.isPy3k;
-
   src = fetchurl {
     url = "mirror://pypi/s/salt/${name}.tar.gz";
     sha256 = "1djjglnh6203y8dirziz5w6zh2lgszxp8ivi86nb7fgijj2h61jr";
   };
 
-  propagatedBuildInputs = with pythonPackages; [
+  propagatedBuildInputs = with python2Packages; [
     futures
     jinja2
     markupsafe