salt: (3006.7 -> 3007.0)
This commit is contained in:
parent
28c6e9a4c3
commit
05258c548f
1 changed files with 3 additions and 9 deletions
|
@ -1,7 +1,6 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, python3
|
, python3
|
||||||
, fetchpatch
|
|
||||||
, fetchPypi
|
, fetchPypi
|
||||||
, openssl
|
, openssl
|
||||||
# Many Salt modules require various Python modules to be installed,
|
# Many Salt modules require various Python modules to be installed,
|
||||||
|
@ -11,21 +10,15 @@
|
||||||
|
|
||||||
python3.pkgs.buildPythonApplication rec {
|
python3.pkgs.buildPythonApplication rec {
|
||||||
pname = "salt";
|
pname = "salt";
|
||||||
version = "3006.7";
|
version = "3007.0";
|
||||||
format = "setuptools";
|
format = "setuptools";
|
||||||
|
|
||||||
src = fetchPypi {
|
src = fetchPypi {
|
||||||
inherit pname version;
|
inherit pname version;
|
||||||
hash = "sha256-7ZLSG4TrnUefk7qJRoRTQIEX4NwQEGFCFJmejQwhCv0=";
|
hash = "sha256-Qb+E5x/GVb+KS1LrRA0GIa6WEJaghtIOEy4VEuLt3/g=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# https://github.com/saltstack/salt/pull/63795
|
|
||||||
(fetchpatch {
|
|
||||||
name = "remove-duplicate-scripts.patch";
|
|
||||||
url = "https://github.com/saltstack/salt/commit/6b9463836e70e40409dbf653f01aa94ef869dfe7.patch";
|
|
||||||
hash = "sha256-VcVdKC8EH4qoWHtq6eEPl8OviR4eA2k/S2lWNQbubJw=";
|
|
||||||
})
|
|
||||||
./fix-libcrypto-loading.patch
|
./fix-libcrypto-loading.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -57,6 +50,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
pyyaml
|
pyyaml
|
||||||
pyzmq
|
pyzmq
|
||||||
requests
|
requests
|
||||||
|
tornado
|
||||||
] ++ extraInputs;
|
] ++ extraInputs;
|
||||||
|
|
||||||
# Don't use fixed dependencies on Darwin
|
# Don't use fixed dependencies on Darwin
|
||||||
|
|
Loading…
Reference in a new issue