ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues Projects Releases Wiki Activity

salt: 3000.3 -> 3001

Browse Source
This commit is contained in:
Flakebi 2020-06-18 21:38:54 +02:00
parent 6058a769fc
commit 00e3f026f3
No known key found for this signature in database
GPG Key ID: 38E7ED984D7DCD02
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/tools/admin/salt/default.nix
View File

@ -25,18 +25,19 @@ let
in
py.pkgs.buildPythonApplication rec {
pname = "salt";
version = "3000.3";
version = "3001";
src = py.pkgs.fetchPypi {
inherit pname version;
sha256 = "19yfjhidx93rl9s03lvrfz7kp0xxigyv4d3zb9792zb9bsc4kjpw";
sha256 = "0m7immip3r8yffiv7qlcqibszvhlg48qpgcm16skvrn85hdhv9jw";
};
propagatedBuildInputs = with py.pkgs; [
distro
jinja2
markupsafe
msgpack
pycrypto
pycryptodomex
pyyaml
pyzmq
requests

15
pkgs/tools/admin/salt/fix-libcrypto-loading.patch
View File

@ -2,13 +2,12 @@ diff --git a/salt/utils/rsax931.py b/salt/utils/rsax931.py
index f827cc6db8..b728595186 100644
--- a/salt/utils/rsax931.py
+++ b/salt/utils/rsax931.py
@@ -47,6 +47,9 @@ def _load_libcrypto():
lib = lib[0] if len(lib) > 0 else None
if lib:
return cdll.LoadLibrary(lib)
+ else:
+ return cdll.LoadLibrary('@libcrypto@')
+
raise OSError('Cannot locate OpenSSL libcrypto')
@@ -74,7 +74,7 @@
"""
Attempt to load libcrypto.
"""
- return cdll.LoadLibrary(_find_libcrypto())
+ return cdll.LoadLibrary('@libcrypto@')
def _init_libcrypto():