jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18906 from aneeshusa/update-salt-to-2016.3.3

Browse Source 
Update salt to 2016.3.3
This commit is contained in:
Frederik Rietdijk 2016-09-24 09:10:56 +02:00 committed by GitHub
commit adfcc2d953
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/admin/salt/default.nix
View File

@ -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;

8
pkgs/tools/admin/salt/testing.nix
View File

@ -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; {