diff options
| author | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2018-07-08 16:34:10 +0200 |
|---|---|---|
| committer | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2018-07-08 16:35:01 +0200 |
| commit | 4bbaf453b4c94f126470c543c71867e6357b2996 (patch) | |
| tree | f1721d48b281e389d9d890ea71e805f2cc4bbd64 | |
| parent | 24429d66a3fa40ca98b50cad0c9153e80f56c4a2 (diff) | |
| download | nixpkgs-4bbaf453b4c94f126470c543c71867e6357b2996.tar nixpkgs-4bbaf453b4c94f126470c543c71867e6357b2996.tar.gz nixpkgs-4bbaf453b4c94f126470c543c71867e6357b2996.tar.bz2 nixpkgs-4bbaf453b4c94f126470c543c71867e6357b2996.tar.lz nixpkgs-4bbaf453b4c94f126470c543c71867e6357b2996.tar.xz nixpkgs-4bbaf453b4c94f126470c543c71867e6357b2996.tar.zst nixpkgs-4bbaf453b4c94f126470c543c71867e6357b2996.zip | |
salt: 2018.3.0 -> 2018.3.2
| -rw-r--r-- | pkgs/tools/admin/salt/default.nix | 17 |
1 files 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 |