Merge pull request #14412 from aneeshusa/add-saltstack

salt: init at 2015.8.8
This commit is contained in:
Arseniy Seroka 2016-04-03 15:20:46 +03:00
commit a0442016db
4 changed files with 90 additions and 0 deletions

View File

@ -0,0 +1,51 @@
{
stdenv, fetchurl, pythonPackages, 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 {
name = "salt-${version}";
version = "2015.8.8";
disabled = pythonPackages.isPy3k;
src = fetchurl {
url = "https://pypi.python.org/packages/source/s/salt/${name}.tar.gz";
sha256 = "1xcfcs50pyammb60myph4f8bi2r6iwkxwsnnhrjwvkv2ymxwxv5j";
};
propagatedBuildInputs = with pythonPackages; [
futures
jinja2
markupsafe
msgpack
pycrypto
pyyaml
pyzmq
requests
salttesting
tornado
] ++ extraInputs;
patches = [ ./fix-libcrypto-loading.patch ];
postPatch = ''
substituteInPlace "salt/utils/rsax931.py" \
--subst-var-by "libcrypto" "${openssl}/lib/libcrypto.so"
'';
# The tests fail due to socket path length limits at the very least;
# possibly there are more issues but I didn't leave the test suite running
# as is it rather long.
doCheck = false;
meta = with stdenv.lib; {
homepage = https://saltstack.com/;
description = "Portable, distributed, remote execution and configuration management system";
maintainers = with maintainers; [ aneeshusa ];
license = licenses.asl20;
};
}

View File

@ -0,0 +1,11 @@
diff --git a/salt/utils/rsax931.py b/salt/utils/rsax931.py
index 9eb1f4a..d764f7a 100644
--- a/salt/utils/rsax931.py
+++ b/salt/utils/rsax931.py
@@ -36,7 +36,7 @@ def _load_libcrypto():
'libcrypto.so*'))
lib = lib[0] if len(lib) > 0 else None
if lib:
- return cdll.LoadLibrary(lib)
+ return cdll.LoadLibrary('@libcrypto@')
raise OSError('Cannot locate OpenSSL libcrypto')

View File

@ -0,0 +1,24 @@
{ stdenv, fetchurl, pythonPackages }:
pythonPackages.buildPythonApplication rec {
name = "SaltTesting-${version}";
version = "2015.7.10";
disabled = pythonPackages.isPy3k;
propagatedBuildInputs = with pythonPackages; [
six
];
src = fetchurl {
url = "https://pypi.python.org/packages/source/S/SaltTesting/${name}.tar.gz";
sha256 = "0p0y8kb77pis18rcig1kf9dnns4bnfa3mr91q40lq4mw63l1b34h";
};
meta = with stdenv.lib; {
homepage = https://github.com/saltstack/salt-testing;
description = "Common testing tools used in the Salt Stack projects";
maintainers = with maintainers; [ aneeshusa ];
license = licenses.asl20;
};
}

View File

@ -20299,6 +20299,10 @@ in modules // {
};
};
salt = callPackage ../tools/admin/salt {};
salttesting = callPackage ../tools/admin/salt/testing.nix {};
sandboxlib = buildPythonPackage rec {
name = "sandboxlib-${version}";
version = "0.31";