Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a702db71a1c2
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 44bb716e231f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 29, 2019

  1. pythonPackages.supervisor: 3.3.5 -> 4.0.4

    Jonathan Ringer committed Sep 29, 2019
    Copy the full SHA
    f08d4f7 View commit details

  2. Merge pull request #70019 from jonringer/bump-supervisor 

    pythonPackages.supervisor: 3.3.5 -> 4.0.4
    @Mic92
    Mic92 authored Sep 29, 2019
    Copy the full SHA
    44bb716 View commit details
Showing with 8 additions and 9 deletions.
  1. +8 −9 pkgs/development/python-modules/supervisor/default.nix
17 changes: 8 additions & 9 deletions pkgs/development/python-modules/supervisor/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
{ lib, buildPythonPackage, isPy3k, fetchPypi
, mock
, meld3
, setuptools
}:

buildPythonPackage rec {
pname = "supervisor";
version = "3.3.5";
version = "4.0.4";

src = fetchPypi {
inherit pname version;
sha256 = "1w3ahridzbc6rxfpbyx8lij6pjlcgf2ymzyg53llkjqxalp6sk8v";
sha256 = "02pindhq84hb9a7ykyaqw8i2iqb21h69lpmclyqh7fm1446rji4n";
};

checkInputs = [ mock ];

propagatedBuildInputs = [ meld3 ];

# Supervisor requires Python 2.4 or later but does not work on any version of Python 3. You are using version 3.6.5 (default, Mar 28 2018, 10:24:30)
disabled = isPy3k;
propagatedBuildInputs = [ meld3 setuptools ];

meta = {
meta = with lib; {
description = "A system for controlling process state under UNIX";
homepage = http://supervisord.org/;
license = lib.licenses.free; # http://www.repoze.org/LICENSE.txt
maintainers = with lib.maintainers; [ zimbatm ];
license = licenses.free; # http://www.repoze.org/LICENSE.txt
maintainers = with maintainers; [ zimbatm ];
};
}