summary refs log tree commit diff
path: root/pkgs/tools/admin/salt
diff options
context:
space:
mode:
authorFlakebi <flakebi@t-online.de>2020-08-09 23:36:27 +0200
committerFlakebi <flakebi@t-online.de>2020-08-09 23:37:02 +0200
commita06d4357a14067db90f5953035b5a9e8a6a14a93 (patch)
tree1282780148ff53010d8984e26f8538fc42eb256f /pkgs/tools/admin/salt
parent593ec809b9f616f2f0dddc2765a96993c0cb8f0f (diff)
downloadnixpkgs-a06d4357a14067db90f5953035b5a9e8a6a14a93.tar
nixpkgs-a06d4357a14067db90f5953035b5a9e8a6a14a93.tar.gz
nixpkgs-a06d4357a14067db90f5953035b5a9e8a6a14a93.tar.bz2
nixpkgs-a06d4357a14067db90f5953035b5a9e8a6a14a93.tar.lz
nixpkgs-a06d4357a14067db90f5953035b5a9e8a6a14a93.tar.xz
nixpkgs-a06d4357a14067db90f5953035b5a9e8a6a14a93.tar.zst
nixpkgs-a06d4357a14067db90f5953035b5a9e8a6a14a93.zip
salt: 3001 -> 3001.1
Diffstat (limited to 'pkgs/tools/admin/salt')
-rw-r--r--pkgs/tools/admin/salt/default.nix28
1 files 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