From 01bf384409618a6ece3d507c7222106657328c03 Mon Sep 17 00:00:00 2001
From: Spencer Baugh <sbaugh@catern.com>
Date: Thu, 28 Dec 2017 17:56:24 +0000
Subject: [PATCH 1/2] supervise: 1.0.0 -> 1.1.0

---
 pkgs/tools/system/supervise/default.nix | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/system/supervise/default.nix b/pkgs/tools/system/supervise/default.nix
index 838663c3072..b6e0700e47f 100644
--- a/pkgs/tools/system/supervise/default.nix
+++ b/pkgs/tools/system/supervise/default.nix
@@ -1,22 +1,15 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, fetchzip }:
 
 stdenv.mkDerivation rec {
 
   name = "supervise-${version}";
-  version = "1.0.0";
+  version = "1.1.0";
 
-  src = fetchFromGitHub {
-    owner = "catern";
-    repo = "supervise";
-    rev = "v${version}";
-    sha256 = "1cjdxgns3gh2ir4kcmjdmc480w8sm49inws0ihhjmnisjy4100lg";
+  src = fetchzip {
+    url = "https://github.com/catern/supervise/releases/download/v${version}/supervise-${version}.tar.gz";
+    sha256 = "0i20znchvydk8ww31ka4b0wjkaizz38racwgvqj32idwhqgar5x2";
   };
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp supervise unlinkwait -t $out/bin
-  '';
-
   meta = with stdenv.lib; {
     homepage = https://github.com/catern/supervise;
     description = "A minimal unprivileged process supervisor making use of modern Linux features";

From b2b00358e80ea6a0a9f24211411717e1bddd3bd7 Mon Sep 17 00:00:00 2001
From: Spencer Baugh <sbaugh@catern.com>
Date: Thu, 28 Dec 2017 17:56:52 +0000
Subject: [PATCH 2/2] pythonPackages.supervise_api: fix deps on Python 2

---
 pkgs/development/python-modules/supervise_api/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/supervise_api/default.nix b/pkgs/development/python-modules/supervise_api/default.nix
index 85f0106db65..99c6dfaf939 100644
--- a/pkgs/development/python-modules/supervise_api/default.nix
+++ b/pkgs/development/python-modules/supervise_api/default.nix
@@ -2,6 +2,8 @@
 , buildPythonPackage
 , fetchPypi
 , supervise
+, isPy3k
+, whichcraft
 }:
 
 buildPythonPackage rec {
@@ -15,7 +17,11 @@ buildPythonPackage rec {
     sha256 = "e6982633a924cb5192d2291d25b366ff311876a31b0f5961471b39d87397ef5b";
   };
 
-  propagatedBuildInputs = [ supervise ];
+  propagatedBuildInputs = [
+    supervise
+  ] ++ lib.optionals ( !isPy3k ) [
+    whichcraft
+  ];
 
   # no tests
   doCheck = false;