Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[19.09] salt: 2019.2.0 -> 2019.2.4 #86651

Merged
merged 1 commit into from
May 3, 2020
Merged

[19.09] salt: 2019.2.0 -> 2019.2.4 #86651

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 25 additions & 8 deletions pkgs/tools/admin/salt/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,40 @@
{
stdenv, pythonPackages, openssl,
stdenv, python2, 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 {
let

py = python2.override {
packageOverrides = self: super: {
pyyaml = super.pyyaml.overridePythonAttrs (
oldAttrs: rec {
version = "3.13";
src = oldAttrs.src.override {
inherit version;
sha256 = "1gx603g484z46cb74j9rzr6sjlh2vndxayicvlyhxdz98lhhkwry";
};
postPatch = "rm ext/_yaml.c";
doCheck = false;
}
);
};
};

in
py.pkgs.buildPythonApplication rec {
pname = "salt";
version = "2019.2.0";
version = "2019.2.4";

src = pythonPackages.fetchPypi {
src = py.pkgs.fetchPypi {
inherit pname version;
sha256 = "1kgn3lway0zwwysyzpphv05j4xgxk92dk4rv1vybr2527wmvp5an";
sha256 = "0ir8gmir4jl21v252vxwgjaskj15wlkhp715jn7h1jb1vfairsxg";
};

propagatedBuildInputs = with pythonPackages; [
propagatedBuildInputs = with py.pkgs; [
jinja2
markupsafe
msgpack
Expand All @@ -24,8 +43,6 @@ pythonPackages.buildPythonApplication rec {
pyzmq
requests
tornado_4
] ++ stdenv.lib.optional (!pythonPackages.isPy3k) [
futures
] ++ extraInputs;

patches = [ ./fix-libcrypto-loading.patch ];
Expand Down