diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-09-24 09:10:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-24 09:10:56 +0200 |
| commit | adfcc2d9531e78bf6a9e3b56e2f4fc873cb3d87b (patch) | |
| tree | 96519c9da57606b4b6017103df555f296d22ab0b /pkgs | |
| parent | e3c14a385ee92debdfd377cd3d61b950c2c003d7 (diff) | |
| parent | 34b5d639c6cf443fc7cb3a472b29890cb863be2c (diff) | |
| download | nixlib-adfcc2d9531e78bf6a9e3b56e2f4fc873cb3d87b.tar nixlib-adfcc2d9531e78bf6a9e3b56e2f4fc873cb3d87b.tar.gz nixlib-adfcc2d9531e78bf6a9e3b56e2f4fc873cb3d87b.tar.bz2 nixlib-adfcc2d9531e78bf6a9e3b56e2f4fc873cb3d87b.tar.lz nixlib-adfcc2d9531e78bf6a9e3b56e2f4fc873cb3d87b.tar.xz nixlib-adfcc2d9531e78bf6a9e3b56e2f4fc873cb3d87b.tar.zst nixlib-adfcc2d9531e78bf6a9e3b56e2f4fc873cb3d87b.zip | |
Merge pull request #18906 from aneeshusa/update-salt-to-2016.3.3
Update salt to 2016.3.3
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/admin/salt/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/admin/salt/testing.nix | 8 |
2 files changed, 4 insertions, 9 deletions
diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index 8ea3e648c311..0e927dfe1c7a 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -8,13 +8,13 @@ pythonPackages.buildPythonApplication rec { name = "salt-${version}"; - version = "2015.8.8"; + version = "2016.3.3"; disabled = pythonPackages.isPy3k; src = fetchurl { url = "mirror://pypi/s/salt/${name}.tar.gz"; - sha256 = "1xcfcs50pyammb60myph4f8bi2r6iwkxwsnnhrjwvkv2ymxwxv5j"; + sha256 = "1djjglnh6203y8dirziz5w6zh2lgszxp8ivi86nb7fgijj2h61jr"; }; propagatedBuildInputs = with pythonPackages; [ @@ -26,7 +26,6 @@ pythonPackages.buildPythonApplication rec { pyyaml pyzmq requests - salttesting tornado ] ++ extraInputs; diff --git a/pkgs/tools/admin/salt/testing.nix b/pkgs/tools/admin/salt/testing.nix index 14105dc2f98c..ab5897fab6ca 100644 --- a/pkgs/tools/admin/salt/testing.nix +++ b/pkgs/tools/admin/salt/testing.nix @@ -2,17 +2,13 @@ pythonPackages.buildPythonApplication rec { name = "SaltTesting-${version}"; - version = "2015.7.10"; + version = "2016.9.7"; disabled = pythonPackages.isPy3k; - propagatedBuildInputs = with pythonPackages; [ - six - ]; - src = fetchurl { url = "mirror://pypi/S/SaltTesting/${name}.tar.gz"; - sha256 = "0p0y8kb77pis18rcig1kf9dnns4bnfa3mr91q40lq4mw63l1b34h"; + sha256 = "0vcw1b1176qm9nkic3sbxh6vnv9kpd9kgyqz5fpsp5jnb2hsf1qx"; }; meta = with stdenv.lib; { |