diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2018-01-21 21:15:22 +0100 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2018-01-21 21:17:14 +0100 |
commit | fbe17703ab437cd294d1d97bb3bc5395cea74b64 (patch) | |
tree | 4d0069cee03d6b43ceae71ad98d7a2121917e7da /pkgs | |
parent | 58e78238e7cfd74441a3f2666f0407cb4247e421 (diff) | |
download | nixpkgs-fbe17703ab437cd294d1d97bb3bc5395cea74b64.tar nixpkgs-fbe17703ab437cd294d1d97bb3bc5395cea74b64.tar.gz nixpkgs-fbe17703ab437cd294d1d97bb3bc5395cea74b64.tar.bz2 nixpkgs-fbe17703ab437cd294d1d97bb3bc5395cea74b64.tar.lz nixpkgs-fbe17703ab437cd294d1d97bb3bc5395cea74b64.tar.xz nixpkgs-fbe17703ab437cd294d1d97bb3bc5395cea74b64.tar.zst nixpkgs-fbe17703ab437cd294d1d97bb3bc5395cea74b64.zip |
gns3Packages.server{Stable,Preview}: Unlock the multidict version
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/applications/networking/gns3/server.nix | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 1bc8e4c15d1..3fd7317ef6c 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -4,29 +4,6 @@ let 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 (oldAttrs: rec { @@ -37,7 +14,6 @@ let inherit pname version; sha256 = "11b51mhr7wjfiikvj3nc5s8c7miin2zdhl3yrzcga4mbpkj892in"; }; - propagatedBuildInputs = [ aiohttp ]; })); in pythonPackages.buildPythonPackage rec { name = "${pname}-${version}"; @@ -50,16 +26,13 @@ in pythonPackages.buildPythonPackage rec { sha256 = sha256Hash; }; - propagatedBuildInputs = [ yarl aiohttp aiohttp-cors multidict_3_1_3 ] + propagatedBuildInputs = [ aiohttp-cors ] ++ (with pythonPackages; [ + yarl aiohttp multidict jinja2 psutil zipstream raven jsonschema typing prompt_toolkit ]); - postPatch = '' - sed -i 's/yarl>=0.11,<0.12/yarl/g' requirements.txt - ''; - # Requires network access doCheck = false; |