diff --git a/pkgs/tools/admin/salt/testing.nix b/pkgs/tools/admin/salt/testing.nix deleted file mode 100644 index ab5897fab6c..00000000000 --- a/pkgs/tools/admin/salt/testing.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ 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; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 53ad8e5f586..0be957b5db1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3482,6 +3482,8 @@ in 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 { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8740062cbe0..1b941ec875e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22882,10 +22882,6 @@ in modules // { }; }; - salt = callPackage ../tools/admin/salt {}; - - salttesting = callPackage ../tools/admin/salt/testing.nix {}; - sandboxlib = buildPythonPackage rec { name = "sandboxlib-${version}"; version = "0.31";