JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #189523 from Flakebi/salt

Browse Source 
salt: 3004.2 -> 3005
This commit is contained in:
Mario Rodas 2022-09-03 18:17:20 -05:00 committed by GitHub
commit 217c70db3d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,11 +9,11 @@
python3.pkgs.buildPythonApplication rec {
pname = "salt";
version = "3004.2";
version = "3005";
src = python3.pkgs.fetchPypi {
inherit pname version;
hash = "sha256-L6ZE9iANTja1WEbLNytuZ7bKD77AaX8djXPncbZl7XA=";
hash = "sha256-HSAMRbiARheOpW+1p1cm3GIMxeUUEQdqBN+A/1L3nNQ=";
};
propagatedBuildInputs = with python3.pkgs; [
@ -30,10 +30,6 @@ python3.pkgs.buildPythonApplication rec {
patches = [
./fix-libcrypto-loading.patch
(fetchpatch {
url = "https://github.com/saltstack/salt/commit/6ec8b90e402ff3fa8f27c7da70ece898592416bc.patch";
hash = "sha256-OQCJeG12cp2EZ0BErp6yqsqhv023923rVFDHAFUfF6c=";
})
];
postPatch = ''
@ -46,14 +42,6 @@ python3.pkgs.buildPythonApplication rec {
# `extraInputs` like on any other platform
echo -n > "requirements/darwin.txt"
# Bug in 3004.1: https://github.com/saltstack/salt/pull/61839
substituteInPlace "salt/utils/entrypoints.py" \
--replace 'if sys.version_info >= (3, 10):' 'if False:'
# Bug in 3004.1: https://github.com/saltstack/salt/issues/61865
substituteInPlace "salt/transport/tcp.py" \
--replace 'payload = self.pack_publish(package)' 'package = self.pack_publish(package)'
# 3004.1: requirement of pyzmq was restricted to <22.0.0; looks like that req was incorrect
# https://github.com/saltstack/salt/commit/070597e525bb7d56ffadede1aede325dfb1b73a4
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=259279