From 4bbaf453b4c94f126470c543c71867e6357b2996 Mon Sep 17 00:00:00 2001
From: Robert Schütz <robert.schuetz@stud.uni-heidelberg.de>
Date: Sun, 8 Jul 2018 16:34:10 +0200
Subject: salt: 2018.3.0 -> 2018.3.2

---
 pkgs/tools/admin/salt/default.nix | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix
index ef43ba2ba51..80df9148220 100644
--- a/pkgs/tools/admin/salt/default.nix
+++ b/pkgs/tools/admin/salt/default.nix
@@ -6,30 +6,19 @@
   extraInputs ? []
 }:
 
-let
-  # Use tornado-4.x until https://github.com/saltstack/salt/issues/45790 is resolved
-  tornado = pythonPackages.tornado.overridePythonAttrs (oldAttrs: rec {
-    version = "4.5.3";
-    name = "${oldAttrs.pname}-${version}";
-    src = oldAttrs.src.override {
-      inherit version;
-      sha256 = "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d";
-    };
-  });
-in
 pythonPackages.buildPythonApplication rec {
   pname = "salt";
-  version = "2018.3.0";
+  version = "2018.3.2";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "0cbbnmaynnpfknmppzlz04mqw4d3d2ay1dqrli11b5pnzli5v950";
+    sha256 = "d86eeea2e5387f4a64bbf0a11d103bfc8aac1122e19d39cc0945d33efdc797bd";
   };
 
   propagatedBuildInputs = with pythonPackages; [
     jinja2
     markupsafe
-    msgpack-python
+    msgpack
     pycrypto
     pyyaml
     pyzmq
-- 
cgit 1.4.1