summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorRobert Schütz <rschuetz17@gmail.com>2018-04-15 08:08:14 +0200
committerGitHub <noreply@github.com>2018-04-15 08:08:14 +0200
commitd72710880c915ad9cb08eae2709433bbf6614b39 (patch)
treea3b5c760fbe789c4e877abf373497152368c7901 /pkgs
parent35f75cff4f80373f0ecfe720e5aa3f1e476b6842 (diff)
parente797e0091356c25282fba4d19690666d4b6f6d0b (diff)
downloadnixlib-d72710880c915ad9cb08eae2709433bbf6614b39.tar
nixlib-d72710880c915ad9cb08eae2709433bbf6614b39.tar.gz
nixlib-d72710880c915ad9cb08eae2709433bbf6614b39.tar.bz2
nixlib-d72710880c915ad9cb08eae2709433bbf6614b39.tar.lz
nixlib-d72710880c915ad9cb08eae2709433bbf6614b39.tar.xz
nixlib-d72710880c915ad9cb08eae2709433bbf6614b39.tar.zst
nixlib-d72710880c915ad9cb08eae2709433bbf6614b39.zip
Merge pull request #35891 from aneeshusa/fix-salt-msgpack-dependency
 salt: 2017.7.2 -> 2017.7.4, fix msgpack dependency
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/admin/salt/default.nix7
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix
index b50564602256..4077c4fb9ecb 100644
--- a/pkgs/tools/admin/salt/default.nix
+++ b/pkgs/tools/admin/salt/default.nix
@@ -8,19 +8,18 @@
 
 python2Packages.buildPythonApplication rec {
   pname = "salt";
-  version = "2017.7.2";
-  name = "${pname}-${version}";
+  version = "2017.7.4";
 
   src = python2Packages.fetchPypi {
     inherit pname version;
-    sha256 = "0h18zwp1w90rgxpmqgrmn9wp31h03f0vak8lpnnbh0dzbbgcffzz";
+    sha256 = "15xfvclk3ns8vk17j7bfy4alq7ab5x3y3jnpqzp5583bfyak0mqx";
   };
 
   propagatedBuildInputs = with python2Packages; [
     futures
     jinja2
     markupsafe
-    msgpack
+    msgpack-python
     pycrypto
     pyyaml
     pyzmq