From 7b26a5843e3719b2268c8c1664102c7994f82926 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 20 Dec 2018 21:40:21 +0100 Subject: gns3-server: Fix the build 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. --- pkgs/applications/networking/gns3/server.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'pkgs/applications/networking/gns3/server.nix') diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 7717862f6a0ac..f3927d8cdd290 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -1,9 +1,9 @@ { stable, branch, version, sha256Hash }: -{ stdenv, python3Packages, fetchFromGitHub, fetchurl }: +{ stdenv, python36Packages, fetchFromGitHub, fetchurl }: let - pythonPackages = python3Packages; + pythonPackages = python36Packages; async-timeout = (stdenv.lib.overrideDerivation pythonPackages.async-timeout (oldAttrs: rec { @@ -24,8 +24,7 @@ let sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964"; }; propagatedBuildInputs = [ async-timeout ] - ++ (with pythonPackages; [ attrs chardet multidict yarl ]) - ++ stdenv.lib.optional (pythonPackages.pythonOlder "3.7") pythonPackages.idna-ssl; + ++ (with pythonPackages; [ attrs chardet multidict yarl idna-ssl ]); })); aiohttp-cors = (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors (oldAttrs: @@ -57,7 +56,7 @@ in pythonPackages.buildPythonPackage rec { ++ (with pythonPackages; [ yarl aiohttp multidict jinja2 psutil zipstream raven jsonschema typing - prompt_toolkit + (pythonPackages.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {}) ]); # Requires network access -- cgit 1.4.1