dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

salt: be Python version agnostic

Browse Source 
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
This commit is contained in:
Aneesh Agrawal 2018-05-22 21:18:37 -07:00
parent 3e3a9e661d
commit f6f03202be
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/tools/admin/salt/default.nix
View File

@ -1,5 +1,5 @@
{ {
stdenv, python2Packages, openssl, stdenv, pythonPackages, openssl,
# Many Salt modules require various Python modules to be installed, # Many Salt modules require various Python modules to be installed,
# passing them in this array enables Salt to find them. # passing them in this array enables Salt to find them.
@ -8,7 +8,7 @@
let let
# Use tornado-4.x until https://github.com/saltstack/salt/issues/45790 is resolved # 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"; version = "4.5.3";
name = "${oldAttrs.pname}-${version}"; name = "${oldAttrs.pname}-${version}";
src = oldAttrs.src.override { src = oldAttrs.src.override {
@ -17,17 +17,16 @@ let
}; };
}); });
in in
python2Packages.buildPythonApplication rec { pythonPackages.buildPythonApplication rec {
pname = "salt"; pname = "salt";
version = "2018.3.0"; version = "2018.3.0";
src = python2Packages.fetchPypi { src = pythonPackages.fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0cbbnmaynnpfknmppzlz04mqw4d3d2ay1dqrli11b5pnzli5v950"; sha256 = "0cbbnmaynnpfknmppzlz04mqw4d3d2ay1dqrli11b5pnzli5v950";
}; };
propagatedBuildInputs = with python2Packages; [ propagatedBuildInputs = with pythonPackages; [
futures
jinja2 jinja2
markupsafe markupsafe
msgpack-python msgpack-python
@ -36,6 +35,8 @@ python2Packages.buildPythonApplication rec {
pyzmq pyzmq
requests requests
tornado tornado
] ++ stdenv.lib.optional (!pythonPackages.isPy3k) [
futures
] ++ extraInputs; ] ++ extraInputs;
patches = [ ./fix-libcrypto-loading.patch ]; patches = [ ./fix-libcrypto-loading.patch ];