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

gns3-server: Fix the build

Browse Source 
This solution isn't optimal but it seems like typing has problems with
Python 3.7 and prompt_toolkit 1.0.15 is still required.
This commit is contained in:
Michael Weiss 2018-12-20 21:40:21 +01:00
parent 0410537561
commit 7b26a5843e
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,9 @@
{ stable, branch, version, sha256Hash }: { stable, branch, version, sha256Hash }:
{ stdenv, python3Packages, fetchFromGitHub, fetchurl }: { stdenv, python36Packages, fetchFromGitHub, fetchurl }:
let let
pythonPackages = python3Packages; pythonPackages = python36Packages;
async-timeout = (stdenv.lib.overrideDerivation pythonPackages.async-timeout async-timeout = (stdenv.lib.overrideDerivation pythonPackages.async-timeout
(oldAttrs: (oldAttrs:
rec { rec {
@ -24,8 +24,7 @@ let
sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964"; sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964";
}; };
propagatedBuildInputs = [ async-timeout ] propagatedBuildInputs = [ async-timeout ]
++ (with pythonPackages; [ attrs chardet multidict yarl ]) ++ (with pythonPackages; [ attrs chardet multidict yarl idna-ssl ]);
++ stdenv.lib.optional (pythonPackages.pythonOlder "3.7") pythonPackages.idna-ssl;
})); }));
aiohttp-cors = (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors aiohttp-cors = (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors
(oldAttrs: (oldAttrs:
@ -57,7 +56,7 @@ in pythonPackages.buildPythonPackage rec {
++ (with pythonPackages; [ ++ (with pythonPackages; [
yarl aiohttp multidict yarl aiohttp multidict
jinja2 psutil zipstream raven jsonschema typing jinja2 psutil zipstream raven jsonschema typing
prompt_toolkit (pythonPackages.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {})
]); ]);
# Requires network access # Requires network access