git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #91066 from Flakebi/salt

salt: 3000.3 -> 3001

commit2ca9cbcff6cba34650183ad36ed4405b45373675 authorMartin Weinelt <mweinelt@users.noreply.github.com> dateMon 6 Jul 2020, 17:36 (6 years ago) parent9fec65500e3f02
2 files changed+11−11
pkgs/tools/admin/salt/default.nix+4−3 pkgs/tools/admin/salt/fix-libcrypto-loading.patch+7−8
pkgs/tools/admin/salt/default.nix+4−3
@@ -25,18 +25,19 @@ let
2525in
2626py.pkgs.buildPythonApplication rec {
2727 pname = "salt";
28− version = "3000.3";
28+ version = "3001";
2929
3030 src = py.pkgs.fetchPypi {
3131 inherit pname version;
32− sha256 = "19yfjhidx93rl9s03lvrfz7kp0xxigyv4d3zb9792zb9bsc4kjpw";
32+ sha256 = "0m7immip3r8yffiv7qlcqibszvhlg48qpgcm16skvrn85hdhv9jw";
3333 };
3434
3535 propagatedBuildInputs = with py.pkgs; [
36+ distro
3637 jinja2
3738 markupsafe
3839 msgpack
39− pycrypto
40+ pycryptodomex
4041 pyyaml
4142 pyzmq
4243 requests
pkgs/tools/admin/salt/fix-libcrypto-loading.patch+7−8
@@ -2,13 +2,12 @@ diff --git a/salt/utils/rsax931.py b/salt/utils/rsax931.py
22index f827cc6db8..b728595186 100644
33--- a/salt/utils/rsax931.py
44+++ b/salt/utils/rsax931.py
5−@@ -47,6 +47,9 @@ def _load_libcrypto():
6− lib = lib[0] if len(lib) > 0 else None
7− if lib:
8− return cdll.LoadLibrary(lib)
9−+ else:
10−+ return cdll.LoadLibrary('@libcrypto@')
11−+
12− raise OSError('Cannot locate OpenSSL libcrypto')
5+@@ -74,7 +74,7 @@
6+ """
7+ Attempt to load libcrypto.
8+ """
9+- return cdll.LoadLibrary(_find_libcrypto())
10++ return cdll.LoadLibrary('@libcrypto@')
1311
1412
13+ def _init_libcrypto():