From a06d4357a14067db90f5953035b5a9e8a6a14a93 Mon Sep 17 00:00:00 2001 From: Flakebi Date: Sun, 9 Aug 2020 23:36:27 +0200 Subject: [PATCH] salt: 3001 -> 3001.1 --- pkgs/tools/admin/salt/default.nix | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index 3cfd805d482..35d65b5e657 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -5,34 +5,16 @@ # 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 = "3001"; + version = "3001.1"; - src = py.pkgs.fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "0m7immip3r8yffiv7qlcqibszvhlg48qpgcm16skvrn85hdhv9jw"; + sha256 = "1g2sdcibir0zhldmngv1iyzlhh2adq9dqjc73grap3df5zcv9sz9"; }; - propagatedBuildInputs = with py.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ distro jinja2 markupsafe