ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-18 13:19:10 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #41976 from aneeshusa/make-salt-agnostic-to-python-version

Browse Source 
salt: be Python version agnostic
This commit is contained in:
Frederik Rietdijk 2018-06-14 09:13:23 +02:00 committed by GitHub
commit a4e59caa30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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,
# 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 ];