aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/tools/admin/salt/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/tools/admin/salt/default.nix')
-rw-r--r--nixpkgs/pkgs/tools/admin/salt/default.nix33
1 files changed, 8 insertions, 25 deletions
diff --git a/nixpkgs/pkgs/tools/admin/salt/default.nix b/nixpkgs/pkgs/tools/admin/salt/default.nix
index f3c375a9966..83b69b12fea 100644
--- a/nixpkgs/pkgs/tools/admin/salt/default.nix
+++ b/nixpkgs/pkgs/tools/admin/salt/default.nix
@@ -5,42 +5,25 @@
# passing them in this array enables Salt to find them.
, extraInputs ? []
}:
-let
-
- py = python3.override {
- packageOverrides = self: super: {
- # Can be unpinned once https://github.com/saltstack/salt/issues/56007 is resolved
- msgpack = super.msgpack.overridePythonAttrs (
- oldAttrs: rec {
- version = "0.6.2";
- src = oldAttrs.src.override {
- inherit version;
- sha256 = "0c0q3vx0x137567msgs5dnizghnr059qi5kfqigxbz26jf2jyg7a";
- };
- }
- );
- };
- };
-
-in
-py.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
pname = "salt";
- version = "3000.3";
+ version = "3001.1";
- src = py.pkgs.fetchPypi {
+ src = python3.pkgs.fetchPypi {
inherit pname version;
- sha256 = "19yfjhidx93rl9s03lvrfz7kp0xxigyv4d3zb9792zb9bsc4kjpw";
+ sha256 = "1g2sdcibir0zhldmngv1iyzlhh2adq9dqjc73grap3df5zcv9sz9";
};
- propagatedBuildInputs = with py.pkgs; [
+ propagatedBuildInputs = with python3.pkgs; [
+ distro
jinja2
markupsafe
msgpack
- pycrypto
+ pycryptodomex
pyyaml
pyzmq
requests
- tornado_4
+ tornado
] ++ extraInputs;
patches = [ ./fix-libcrypto-loading.patch ];