From f9acc95a09b09096fd3a69d6861a2c9fc9cebaf7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 9 Dec 2015 10:40:48 +0100
Subject: [PATCH] python rbtools: move expression to python-packages.nix

cc @domenkozar
---
 .../python-modules/rbtools/default.nix        | 17 ----------------
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/python-packages.nix            | 20 +++++++++++++++++++
 3 files changed, 21 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/development/python-modules/rbtools/default.nix

diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix
deleted file mode 100644
index b63750815513..000000000000
--- a/pkgs/development/python-modules/rbtools/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, fetchurl, pythonPackages, python }:
-
-pythonPackages.buildPythonPackage rec {
-  name = "rbtools-0.7.2";
-  namePrefix = "";
-
-  src = fetchurl {
-    url = "http://downloads.reviewboard.org/releases/RBTools/0.7/RBTools-0.7.2.tar.gz";
-    sha256 = "1ng8l8cx81cz23ls7fq9wz4ijs0zbbaqh4kj0mj6plzcqcf8na4i";
-  };
-
-  propagatedBuildInputs = [ python.modules.sqlite3 pythonPackages.six ];
-
-  meta = {
-    maintainers = [ stdenv.lib.maintainers.iElectric ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a920636a3d6d..20f1faae1bb3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9059,7 +9059,7 @@ let
 
   pyxml = callPackage ../development/python-modules/pyxml { };
 
-  rbtools = callPackage ../development/python-modules/rbtools { };
+  rbtools = pythonPackages.rbtools;
 
   setuptools = pythonPackages.setuptools;
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d3f2b0769026..b9db41d6ed9f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15618,6 +15618,26 @@ in modules // {
     };
   };
 
+  rbtools = buildPythonPackage rec {
+    name = "rbtools-0.7.2";
+
+    src = pkgs.fetchurl {
+      url = "http://downloads.reviewboard.org/releases/RBTools/0.7/RBTools-0.7.2.tar.gz";
+      sha256 = "1ng8l8cx81cz23ls7fq9wz4ijs0zbbaqh4kj0mj6plzcqcf8na4i";
+    };
+
+    buildInputs = with self; [ nose ];
+    propagatedBuildInputs = with self; [ modules.sqlite3 six ];
+
+    checkPhase = "nosetests";
+
+    disabled = isPy3k;
+
+    meta = {
+      maintainers = with maintainers; [ iElectric ];
+    };
+  };
+
   rencode = buildPythonPackage rec {
     name = "rencode-${version}";
     version = "git20150810";