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

gns3Packages.{server,gui}Stable: 2.1.21 -> 2.2.0

Browse Source 
gns3Packages.{server,gui}Preview: 2.2.0rc5 -> 2.2.0

The new dependency on setuptools is required for pkg_resources:

ImportError: No module named pkg_resources
This commit is contained in:
Michael Weiss
2019-10-04 12:28:57 +02:00
parent 099c740aa5
commit b52fb3b078
3 changed files with 12 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/gns3/server.nix
+4 -32
View File
@@ -3,35 +3,7 @@
{ stdenv, python3, fetchFromGitHub }:
let
python = if stable then python3.override {
packageOverrides = self: super: {
async-timeout = super.async-timeout.overridePythonAttrs (oldAttrs: rec {
version = "2.0.1";
src = oldAttrs.src.override {
inherit version;
sha256 = "1l3kg062m02mph6rf9rdv8r5c5n356clxa6b6mrn0i77vk9g9kq0";
};
});
aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec {
version = "2.3.10";
src = oldAttrs.src.override {
inherit version;
sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964";
};
propagatedBuildInputs = with self; [ async-timeout attrs chardet multidict yarl idna-ssl ];
doCheck = false;
});
aiohttp-cors = super.aiohttp-cors.overridePythonAttrs (oldAttrs: rec {
version = "0.6.0";
src = oldAttrs.src.override {
inherit version;
sha256 = "1r0mb4dw0dc1lpi54dk5vxqs06nyhvagp76lyrvk7rd94z5mjkd4";
};
propagatedBuildInputs = with self; [ aiohttp ]
++ stdenv.lib.optional (pythonOlder "3.5") typing;
});
};
} else python3;
python = python3;
in python.pkgs.buildPythonPackage {
pname = "gns3-server";
@@ -50,10 +22,10 @@ in python.pkgs.buildPythonPackage {
'';
propagatedBuildInputs = with python.pkgs; [
aiohttp-cors yarl aiohttp multidict
jinja2 psutil zipstream raven jsonschema
aiohttp-cors yarl aiohttp multidict setuptools
jinja2 psutil zipstream raven jsonschema distro async_generator aiofiles
(python.pkgs.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {})
] ++ stdenv.lib.optional (!stable) [ distro async_generator aiofiles ];
];
# Requires network access
doCheck = false;