Merge pull request #33144 from catern/master

supervise: 1.0.0 -> 1.1.0 and supervise_api fixes

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;

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";