Merge pull request #19011 from aneeshusa/move-salt-package

Move salt package

pkgs/tools/admin/salt/testing.nix

···
-{ stdenv, fetchurl, pythonPackages }:
-
-pythonPackages.buildPythonApplication rec {
-  name = "SaltTesting-${version}";
-  version = "2016.9.7";
-
-  disabled = pythonPackages.isPy3k;
-
-  src = fetchurl {
-    url = "mirror://pypi/S/SaltTesting/${name}.tar.gz";
-    sha256 = "0vcw1b1176qm9nkic3sbxh6vnv9kpd9kgyqz5fpsp5jnb2hsf1qx";
-  };
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/saltstack/salt-testing;
-    description = "Common testing tools used in the Salt Stack projects";
-    maintainers = with maintainers; [ aneeshusa ];
-    license = licenses.asl20;
-  };
-}

pkgs/top-level/all-packages.nix

···
 
   safe-rm = callPackage ../tools/system/safe-rm { };
 
+  salt = callPackage ../tools/admin/salt {};
+
   salut_a_toi = callPackage ../applications/networking/instant-messengers/salut-a-toi {};
 
   samplicator = callPackage ../tools/networking/samplicator { };

pkgs/top-level/python-packages.nix

···
     };
   };
 
-  salt = callPackage ../tools/admin/salt {};
-
-  salttesting = callPackage ../tools/admin/salt/testing.nix {};
-
   sandboxlib = buildPythonPackage rec {
     name = "sandboxlib-${version}";
     version = "0.31";