diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-05-27 20:08:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-27 20:08:07 +0200 |
commit | 3b5fd4dada65e9eaf92de6a507fc08f0ce49cd7c (patch) | |
tree | cca4f2dca7d4f745d4890849d311f7d7c89ea3eb /pkgs | |
parent | 6bde47d651643c18fa5295504daacfa6f7d84ec4 (diff) | |
parent | e264c341242583afc18236cae1f050a7a8e152eb (diff) | |
download | nixpkgs-3b5fd4dada65e9eaf92de6a507fc08f0ce49cd7c.tar nixpkgs-3b5fd4dada65e9eaf92de6a507fc08f0ce49cd7c.tar.gz nixpkgs-3b5fd4dada65e9eaf92de6a507fc08f0ce49cd7c.tar.bz2 nixpkgs-3b5fd4dada65e9eaf92de6a507fc08f0ce49cd7c.tar.lz nixpkgs-3b5fd4dada65e9eaf92de6a507fc08f0ce49cd7c.tar.xz nixpkgs-3b5fd4dada65e9eaf92de6a507fc08f0ce49cd7c.tar.zst nixpkgs-3b5fd4dada65e9eaf92de6a507fc08f0ce49cd7c.zip |
Merge pull request #41085 from zimbatm/supervisor-3.3.4
python2Packages.supervisor: 3.1.4 -> 3.3.4
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/python-modules/supervisor/default.nix | 27 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 22 |
2 files changed, 28 insertions, 21 deletions
diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix new file mode 100644 index 00000000000..2d2a03d37ae --- /dev/null +++ b/pkgs/development/python-modules/supervisor/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, isPy3k, fetchPypi +, mock +, meld3 +}: +buildPythonPackage rec { + pname = "supervisor"; + version = "3.3.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wp62z9xprvz2krg02xnbwcnq6pxfq3byd8cxx8c2d8xznih28i1"; + }; + + 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; + + meta = { + 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 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d558b1b28eb..cfa9537e530 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13423,27 +13423,7 @@ in { }; }; - supervisor = buildPythonPackage rec { - name = "supervisor-3.1.4"; - - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/supervisor/${name}.tar.gz"; - sha256 = "0kk0sv7780m4dzmrcb2m284krz907jh8jp7khz5a79qryy4m1xw2"; - }; - - buildInputs = with self; [ mock ]; - propagatedBuildInputs = with self; [ meld3 ]; - - # failing tests when building under chroot as root user doesn't exist - doCheck = false; - - meta = { - description = "A system for controlling process state under UNIX"; - homepage = http://supervisord.org/; - }; - }; + supervisor = callPackage ../development/python-modules/supervisor {}; subprocess32 = callPackage ../development/python-modules/subprocess32 { }; |