diff options
author | Aneesh Agrawal <aneeshusa@gmail.com> | 2018-05-22 21:18:37 -0700 |
---|---|---|
committer | Aneesh Agrawal <aneeshusa@gmail.com> | 2018-06-13 23:39:32 -0700 |
commit | f6f03202be07b57d0026cf88860cbb111425f3f2 (patch) | |
tree | a98af4b840a7b095175d59be59b5cc1c97298af1 /pkgs/tools/admin/salt/default.nix | |
parent | 3e3a9e661d7ef83f9dfc26d948a12f8ee1334f6d (diff) | |
download | nixlib-f6f03202be07b57d0026cf88860cbb111425f3f2.tar nixlib-f6f03202be07b57d0026cf88860cbb111425f3f2.tar.gz nixlib-f6f03202be07b57d0026cf88860cbb111425f3f2.tar.bz2 nixlib-f6f03202be07b57d0026cf88860cbb111425f3f2.tar.lz nixlib-f6f03202be07b57d0026cf88860cbb111425f3f2.tar.xz nixlib-f6f03202be07b57d0026cf88860cbb111425f3f2.tar.zst nixlib-f6f03202be07b57d0026cf88860cbb111425f3f2.zip |
salt: be Python version agnostic
As of Salt 2017.7 (Salt Nitrogen), Salt supports Python 3. Release notes: https://docs.saltstack.com/en/develop/topics/releases/2017.7.0.html#python-3
Diffstat (limited to 'pkgs/tools/admin/salt/default.nix')
-rw-r--r-- | pkgs/tools/admin/salt/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index eaae8f40bfab..ef43ba2ba517 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -1,5 +1,5 @@ { - stdenv, python2Packages, openssl, + stdenv, pythonPackages, openssl, # Many Salt modules require various Python modules to be installed, # passing them in this array enables Salt to find them. @@ -8,7 +8,7 @@ let # Use tornado-4.x until https://github.com/saltstack/salt/issues/45790 is resolved - tornado = python2Packages.tornado.overridePythonAttrs (oldAttrs: rec { + tornado = pythonPackages.tornado.overridePythonAttrs (oldAttrs: rec { version = "4.5.3"; name = "${oldAttrs.pname}-${version}"; src = oldAttrs.src.override { @@ -17,17 +17,16 @@ let }; }); in -python2Packages.buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { pname = "salt"; version = "2018.3.0"; - src = python2Packages.fetchPypi { + src = pythonPackages.fetchPypi { inherit pname version; sha256 = "0cbbnmaynnpfknmppzlz04mqw4d3d2ay1dqrli11b5pnzli5v950"; }; - propagatedBuildInputs = with python2Packages; [ - futures + propagatedBuildInputs = with pythonPackages; [ jinja2 markupsafe msgpack-python @@ -36,6 +35,8 @@ python2Packages.buildPythonApplication rec { pyzmq requests tornado + ] ++ stdenv.lib.optional (!pythonPackages.isPy3k) [ + futures ] ++ extraInputs; patches = [ ./fix-libcrypto-loading.patch ]; |