JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #33144 from catern/master

Browse Source 
supervise: 1.0.0 -> 1.1.0 and supervise_api fixes
This commit is contained in:
Peter Hoeg 2018-01-11 11:51:28 +08:00 committed by GitHub
commit c80dc05ed6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/python-modules/supervise_api/default.nix
View File

@ -2,6 +2,8 @@
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, supervise , supervise
, isPy3k
, whichcraft
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -15,7 +17,11 @@ buildPythonPackage rec {
sha256 = "e6982633a924cb5192d2291d25b366ff311876a31b0f5961471b39d87397ef5b"; sha256 = "e6982633a924cb5192d2291d25b366ff311876a31b0f5961471b39d87397ef5b";
}; };
propagatedBuildInputs = [ supervise ]; propagatedBuildInputs = [
supervise
] ++ lib.optionals ( !isPy3k ) [
whichcraft
];
# no tests # no tests
doCheck = false; doCheck = false;

17
pkgs/tools/system/supervise/default.nix
View File

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