From 83902b4696bc97c25e591a3cea2eccdf03e94cd2 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Tue, 27 Sep 2016 13:31:19 -0400
Subject: [PATCH 1/2] salt: move to all-packages.nix

---
 pkgs/top-level/all-packages.nix    | 2 ++
 pkgs/top-level/python-packages.nix | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 53ad8e5f5865..0be957b5db14 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 8740062cbe03..380f0421d321 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22882,8 +22882,6 @@ in modules // {
     };
   };
 
-  salt = callPackage ../tools/admin/salt {};
-
   salttesting = callPackage ../tools/admin/salt/testing.nix {};
 
   sandboxlib = buildPythonPackage rec {

From 7b7d8ddbca19caab0dbdb05ad6e0af86ade5fa7f Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Tue, 27 Sep 2016 13:32:25 -0400
Subject: [PATCH 2/2] salttesting: remove unused package

It was added as a dependency of Salt, which no longer depends on it.
---
 pkgs/tools/admin/salt/testing.nix  | 20 --------------------
 pkgs/top-level/python-packages.nix |  2 --
 2 files changed, 22 deletions(-)
 delete mode 100644 pkgs/tools/admin/salt/testing.nix

diff --git a/pkgs/tools/admin/salt/testing.nix b/pkgs/tools/admin/salt/testing.nix
deleted file mode 100644
index ab5897fab6ca..000000000000
--- 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/python-packages.nix b/pkgs/top-level/python-packages.nix
index 380f0421d321..1b941ec875ee 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22882,8 +22882,6 @@ in modules // {
     };
   };
 
-  salttesting = callPackage ../tools/admin/salt/testing.nix {};
-
   sandboxlib = buildPythonPackage rec {
     name = "sandboxlib-${version}";
     version = "0.31";