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.

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

salt: 2019.2.0 -> 3000.2 #85561

Merged
merged 1 commit into from
May 3, 2020
Merged
Changes from all commits
Commits
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
39 changes: 27 additions & 12 deletions pkgs/tools/admin/salt/default.nix
Original file line number Diff line number Diff line change
@@ -1,21 +1,38 @@
{
stdenv, pythonPackages, openssl,

{ lib
, python3
, openssl
# Many Salt modules require various Python modules to be installed,
# passing them in this array enables Salt to find them.
extraInputs ? []
, extraInputs ? []
}:
let

py = python3.override {
packageOverrides = self: super: {
# Can be unpinned once https://github.com/saltstack/salt/issues/56007 is resolved
msgpack = super.msgpack.overridePythonAttrs (
oldAttrs: rec {
version = "0.6.2";
src = oldAttrs.src.override {
inherit version;
sha256 = "0c0q3vx0x137567msgs5dnizghnr059qi5kfqigxbz26jf2jyg7a";
};
}
);
};
};

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

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

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

patches = [ ./fix-libcrypto-loading.patch ];
Expand All @@ -40,7 +55,7 @@ pythonPackages.buildPythonApplication rec {
# as is it rather long.
doCheck = false;

meta = with stdenv.lib; {
meta = with lib; {
homepage = "https://saltstack.com/";
description = "Portable, distributed, remote execution and configuration management system";
maintainers = with maintainers; [ aneeshusa ];
Expand Down