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

gns3Packages.server{Stable,Preview}: Unlock the multidict version

This commit is contained in:
Michael Weiss 2018-01-21 21:15:22 +01:00
parent 58e78238e7
commit fbe17703ab
1 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgs/applications/networking/gns3/server.nix
View File

@ -4,29 +4,6 @@
let let
pythonPackages = python3Packages; pythonPackages = python3Packages;
# TODO: Not sure if all these overwrites are really required...
# Upstream seems to have some reasons (bugs, incompatibilities) though.
multidict_3_1_3 =
(stdenv.lib.overrideDerivation pythonPackages.multidict (oldAttrs:
rec {
pname = "multidict";
version = "3.1.3";
name = "${pname}-${version}";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "04kdxh19m41c6vbshwk8jfbidsfsqn7mn0abvx09nyg78sh80pw7";
};
doInstallCheck = false;
}));
yarl = (stdenv.lib.overrideDerivation pythonPackages.yarl
(oldAttrs:
{ propagatedBuildInputs = [ multidict_3_1_3 pythonPackages.idna ]; }));
aiohttp = (stdenv.lib.overrideDerivation pythonPackages.aiohttp
(oldAttrs:
rec {
propagatedBuildInputs = [ yarl multidict_3_1_3 ]
++ (with pythonPackages; [ async-timeout chardet ]);
}));
aiohttp-cors = (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors aiohttp-cors = (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors
(oldAttrs: (oldAttrs:
rec { rec {
@ -37,7 +14,6 @@ let
inherit pname version; inherit pname version;
sha256 = "11b51mhr7wjfiikvj3nc5s8c7miin2zdhl3yrzcga4mbpkj892in"; sha256 = "11b51mhr7wjfiikvj3nc5s8c7miin2zdhl3yrzcga4mbpkj892in";
}; };
propagatedBuildInputs = [ aiohttp ];
})); }));
in pythonPackages.buildPythonPackage rec { in pythonPackages.buildPythonPackage rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
@ -50,16 +26,13 @@ in pythonPackages.buildPythonPackage rec {
sha256 = sha256Hash; sha256 = sha256Hash;
}; };
propagatedBuildInputs = [ yarl aiohttp aiohttp-cors multidict_3_1_3 ] propagatedBuildInputs = [ aiohttp-cors ]
++ (with pythonPackages; [ ++ (with pythonPackages; [
yarl aiohttp multidict
jinja2 psutil zipstream raven jsonschema typing jinja2 psutil zipstream raven jsonschema typing
prompt_toolkit prompt_toolkit
]); ]);
postPatch = ''
sed -i 's/yarl>=0.11,<0.12/yarl/g' requirements.txt
'';
# Requires network access # Requires network access
doCheck = false; doCheck = false;