From 70fe7ed01e62b114e981ee3deed79e602b6c0349 Mon Sep 17 00:00:00 2001
From: Klaas van Schelven <klaas@vanschelven.com>
Date: Sun, 10 Sep 2017 15:20:41 +0200
Subject: [PATCH 1/2] python-simple-hipchat: 0.1.0 => 0.4.0

0.1.0 does not work on Python 3 but versions >= 0.2 do.
---
 pkgs/top-level/python-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index abd2de9ae40..d781b003a2c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17824,11 +17824,11 @@ in {
 
   python_simple_hipchat = buildPythonPackage rec {
     name = "python-simple-hipchat-${version}";
-    version = "0.1";
+    version = "0.4.0";
 
     src = pkgs.fetchurl {
-      url = "mirror://pypi/p/python-simple-hipchat/python-simple-hipchat-${version}.zip";
-      sha256 = "404e5ff7187abb09c2227f22063d06baf0fd525725e9c9ad280176bed1c94a3f";
+      url = "mirror://pypi/p/python-simple-hipchat/python-simple-hipchat-${version}.tar.gz";
+      sha256 = "0zy6prrj85jjc4xmxgfg8h94j81k6zhfxfffcbvq9b10jis1rgav";
     };
 
     buildInputs = [ pkgs.unzip ];

From cfb64bdbbd8217180ecfeb7ed8ad7600643fd103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 10 Sep 2017 14:31:30 +0100
Subject: [PATCH 2/2] python.pkgs.python_simple_hipchat: move out of
 python-packages

---
 .../python-simple-hipchat/default.nix         | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 15 +++----------
 2 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/development/python-modules/python-simple-hipchat/default.nix

diff --git a/pkgs/development/python-modules/python-simple-hipchat/default.nix b/pkgs/development/python-modules/python-simple-hipchat/default.nix
new file mode 100644
index 00000000000..1e3f627ab0b
--- /dev/null
+++ b/pkgs/development/python-modules/python-simple-hipchat/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchPypi
+, unzip }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "python-simple-hipchat";
+  version = "0.4.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0zy6prrj85jjc4xmxgfg8h94j81k6zhfxfffcbvq9b10jis1rgav";
+  };
+
+  buildInputs = [ unzip ];
+
+  meta = with stdenv.lib; {
+    description = "Easy peasy wrapper for HipChat's v1 API";
+    homepage = https://github.com/kurttheviking/simple-hipchat-py;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d781b003a2c..d6908dee25f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17822,17 +17822,8 @@ in {
     '';
   });
 
-  python_simple_hipchat = buildPythonPackage rec {
-    name = "python-simple-hipchat-${version}";
-    version = "0.4.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/python-simple-hipchat/python-simple-hipchat-${version}.tar.gz";
-      sha256 = "0zy6prrj85jjc4xmxgfg8h94j81k6zhfxfffcbvq9b10jis1rgav";
-    };
-
-    buildInputs = [ pkgs.unzip ];
-  };
+  python-simple-hipchat = callPackage ../development/python-modules/python-simple-hipchat {}
+  python_simple_hipchat = python-simple-hipchat;
 
   python_keyczar = buildPythonPackage rec {
     name = "python-keyczar-0.71c";
@@ -24530,7 +24521,7 @@ EOF
     buildInputs = with self; [ nose mock ];
     propagatedBuildInputs = with self; [
       jinja2 pyyaml redis requests pagerduty
-      python_simple_hipchat pushbullet
+      python-simple-hipchat pushbullet
     ];
 
     patchPhase = "> requirements.txt";