b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #85561 from Flakebi/salt

Browse source 
salt: 2019.2.0 -> 3000.2
This commit is contained in:
Benjamin Hipple 2020-05-03 19:52:30 -04:00 committed by GitHub
parent 405909f46e 435713eac2
commit f2b48ae616
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
pkgs/tools/admin/salt/default.nix
View file

@ -1,21 +1,38 @@
{ { lib
stdenv, pythonPackages, openssl, , python3
, 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.
extraInputs ? [] , extraInputs ? []
}: }:
let
pythonPackages.buildPythonApplication rec { py = python3.override {
pname = "salt"; packageOverrides = self: super: {
version = "2019.2.0"; # Can be unpinned once https://github.com/saltstack/salt/issues/56007 is resolved
msgpack = super.msgpack.overridePythonAttrs (
src = pythonPackages.fetchPypi { oldAttrs: rec {
inherit pname version; version = "0.6.2";
sha256 = "1kgn3lway0zwwysyzpphv05j4xgxk92dk4rv1vybr2527wmvp5an"; src = oldAttrs.src.override {
inherit version;
sha256 = "0c0q3vx0x137567msgs5dnizghnr059qi5kfqigxbz26jf2jyg7a";
};
}
);
};
}; };
propagatedBuildInputs = with pythonPackages; [ in
py.pkgs.buildPythonApplication rec {
pname = "salt";
version = "3000.2";
src = py.pkgs.fetchPypi {
inherit pname version;
sha256 = "1n90qqhsvbf4pc4pcbya3rjfkblbccf4np4mxpghjqaa16fl4cqf";
};
propagatedBuildInputs = with py.pkgs; [
jinja2 jinja2
markupsafe markupsafe
msgpack msgpack
@ -24,8 +41,6 @@ pythonPackages.buildPythonApplication rec {
pyzmq pyzmq
requests requests
tornado_4 tornado_4
] ++ stdenv.lib.optionals (!pythonPackages.isPy3k) [
futures
] ++ extraInputs; ] ++ extraInputs;
patches = [ ./fix-libcrypto-loading.patch ]; patches = [ ./fix-libcrypto-loading.patch ];
@ -40,7 +55,7 @@ pythonPackages.buildPythonApplication rec {
# as is it rather long. # as is it rather long.
doCheck = false; doCheck = false;
meta = with stdenv.lib; { meta = with lib; {
homepage = "https://saltstack.com/"; homepage = "https://saltstack.com/";
description = "Portable, distributed, remote execution and configuration management system"; description = "Portable, distributed, remote execution and configuration management system";
maintainers = with maintainers; [ aneeshusa ]; maintainers = with maintainers; [ aneeshusa ];