nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 15:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

circus: fix incompatible dependency of python-circus (#73199)

Browse Source 
* circus: fix incompatible dependency of python-circus

* circus: move out of python packages set

* circus: remove directly used python packages arguments
This commit is contained in:
tekeri 2019-11-11 22:09:58 +09:00 committed by Frederik Rietdijk
parent d68d23bb26
commit cd41194654
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/python-modules/circus/default.nix → pkgs/tools/networking/circus/default.nix
View File

@ -1,7 +1,10 @@
{ stdenv, buildPythonPackage, fetchPypi { stdenv, python3Packages }:
, iowait, psutil, pyzmq, tornado, mock }:
buildPythonPackage rec { let
inherit (python3Packages) buildPythonApplication fetchPypi iowait psutil pyzmq tornado_4 mock;
in
buildPythonApplication rec {
pname = "circus"; pname = "circus";
version = "0.15.0"; version = "0.15.0";
@ -13,15 +16,14 @@ buildPythonPackage rec {
postPatch = '' postPatch = ''
# relax version restrictions to fix build # relax version restrictions to fix build
substituteInPlace setup.py \ substituteInPlace setup.py \
--replace "pyzmq>=13.1.0,<17.0" "pyzmq>13.1.0" \ --replace "pyzmq>=13.1.0,<17.0" "pyzmq>13.1.0"
--replace "tornado>=3.0,<5.0" "tornado>=3.0"
''; '';
checkInputs = [ mock ]; checkInputs = [ mock ];
doCheck = false; # weird error doCheck = false; # weird error
propagatedBuildInputs = [ iowait psutil pyzmq tornado ]; propagatedBuildInputs = [ iowait psutil pyzmq tornado_4 ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A process and socket manager"; description = "A process and socket manager";

2
pkgs/top-level/all-packages.nix
View File

@ -2311,6 +2311,8 @@ in
buildGoModule = buildGo112Module; buildGoModule = buildGo112Module;
}; };
circus = callPackage ../tools/networking/circus { };
# Cleanup before 20.03: # Cleanup before 20.03:
citrix_receiver = throw "citrix_receiver has been discontinued by Citrix (https://docs.citrix.com/en-us/citrix-workspace-app.html). Please use citrix_workspace."; citrix_receiver = throw "citrix_receiver has been discontinued by Citrix (https://docs.citrix.com/en-us/citrix-workspace-app.html). Please use citrix_workspace.";
citrix_receiver_13_10_0 = citrix_receiver; citrix_receiver_13_10_0 = citrix_receiver;

2
pkgs/top-level/python-packages.nix
View File

@ -1643,8 +1643,6 @@ in {
cmarkgfm = callPackage ../development/python-modules/cmarkgfm { }; cmarkgfm = callPackage ../development/python-modules/cmarkgfm { };
circus = callPackage ../development/python-modules/circus {};
colorcet = callPackage ../development/python-modules/colorcet { }; colorcet = callPackage ../development/python-modules/colorcet { };
coloredlogs = callPackage ../development/python-modules/coloredlogs { }; coloredlogs = callPackage ../development/python-modules/coloredlogs { };