diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 5bb125c10077..7f6ff3be034f 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,9 @@ -{ callPackage, libsForQt5 }: +{ callPackage +, libsForQt5 +}: let - stableVersion = "2.2.29"; + stableVersion = "2.2.31"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -18,16 +20,13 @@ let }); }; commonOverrides = [ - (mkOverride "psutil" "5.8.0" - "sha256-DJzLmat2Al8vC77PNB1GVunBNR24zIoDzNYuMYq0tcY=") - (mkOverride "jsonschema" "3.2.0" - "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68") + (mkOverride "jsonschema" "3.2.0" "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68") ]; }; mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "04yqh0kq5pkmadcxf090ilh9sqqxajcg65nf7ai1iikxi3x7z3r8"; - serverSrcHash = "0p6q421rldmyqi0padssgrssf4d9mb5ifiqjm5y8vfhwfl5a2cqk"; + guiSrcHash = "sha256-o9j/avuapiUKIDO6aO/uWFF/5gu+xdfhL7ZSDSaQ858="; + serverSrcHash = "sha256-8r8nWNqbHUDtJ6x+/SxHxaw1isSuWF/5as3YXLB6LFw="; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 95ec995cbfd5..8d1ab4e590c5 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -1,6 +1,16 @@ -{ stable, branch, version, sha256Hash, mkOverride, commonOverrides }: +{ stable +, branch +, version +, sha256Hash +, mkOverride +, commonOverrides +}: -{ lib, python3, fetchFromGitHub, wrapQtAppsHook }: +{ lib +, python3 +, fetchFromGitHub +, wrapQtAppsHook +}: let defaultOverrides = commonOverrides ++ [ @@ -34,21 +44,33 @@ in python.pkgs.buildPythonPackage rec { sha256 = sha256Hash; }; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ + wrapQtAppsHook + ]; + propagatedBuildInputs = with python.pkgs; [ - sentry-sdk psutil jsonschema # tox for check - # Runtime dependencies - sip_4 (pyqt5.override { withWebSockets = true; }) distro setuptools + distro + jsonschema + psutil + sentry-sdk + setuptools + sip_4 (pyqt5.override { withWebSockets = true; }) ]; doCheck = false; # Failing + dontWrapQtApps = true; + postFixup = '' wrapQtApp "$out/bin/gns3" ''; + postPatch = '' substituteInPlace requirements.txt \ - --replace "sentry-sdk==1.3.1" "sentry-sdk>=1.3.1" \ + --replace "sentry-sdk==" "sentry-sdk>=" \ + --replace "psutil==" "psutil>=" \ + --replace "distro==" "distro>=" \ + --replace "setuptools==" "setuptools>=" ''; meta = with lib; { diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 818c01a89ab4..50a2453b0408 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -1,23 +1,20 @@ -{ stable, branch, version, sha256Hash, mkOverride, commonOverrides }: +{ stable +, branch +, version +, sha256Hash +, mkOverride +, commonOverrides +}: -{ lib, python3, fetchFromGitHub, packageOverrides ? self: super: {} - }: +{ lib +, python3 +, fetchFromGitHub +, packageOverrides ? self: super: {} +}: let defaultOverrides = commonOverrides ++ [ (self: super: { - aiofiles = super.aiofiles.overridePythonAttrs (oldAttrs: rec { - pname = "aiofiles"; - version = "0.7.0"; - src = fetchFromGitHub { - owner = "Tinche"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-njQ7eRYJO+dUrwO5pZwKHXn9nVSGYcEhwhs3x5BMc28="; - }; - doCheck = false; - }); - jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec { version = "3.2.0"; @@ -51,16 +48,33 @@ in python.pkgs.buildPythonApplication { postPatch = '' substituteInPlace requirements.txt \ - --replace "aiohttp==3.7.4" "aiohttp>=3.7.4" \ - --replace "Jinja2==3.0.1" "Jinja2>=3.0.1" \ - --replace "sentry-sdk==1.3.1" "sentry-sdk>=1.3.1" \ - --replace "async-timeout==3.0.1" "async-timeout>=3.0.1" \ + --replace "aiohttp==" "aiohttp>=" \ + --replace "aiofiles==" "aiofiles>=" \ + --replace "Jinja2==" "Jinja2>=" \ + --replace "sentry-sdk==" "sentry-sdk>=" \ + --replace "async-timeout==" "async-timeout>=" \ + --replace "psutil==" "psutil>=" \ + --replace "distro==" "distro>=" \ + --replace "py-cpuinfo==" "py-cpuinfo>=" \ + --replace "setuptools==" "setuptools>=" ''; propagatedBuildInputs = with python.pkgs; [ - aiohttp-cors yarl aiohttp multidict setuptools - jinja2 psutil zipstream sentry-sdk jsonschema distro async_generator aiofiles - prompt-toolkit py-cpuinfo + aiofiles + aiohttp + aiohttp-cors + async_generator + distro + jinja2 + jsonschema + multidict + prompt-toolkit + psutil + py-cpuinfo + sentry-sdk + setuptools + yarl + zipstream ]; # Requires network access diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 513e0a0acc4f..4cd80fbed809 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -28,6 +28,7 @@ , pytest-forked , pytest-localserver , pytestCheckHook +, pythonOlder , rq , sanic , sanic-testing @@ -40,14 +41,16 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.5.8"; + version = "1.5.10"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-python"; rev = version; - sha256 = "sha256-28MkwQog+Abk1PSDPWbah650YATiGCBWaTbFO52KgzY="; + hash = "sha256-f5V2fMvPpyz+pU08Owzxq9xI48ZeZpH5SmUXtshqMm0="; }; propagatedBuildInputs = [ @@ -56,10 +59,12 @@ buildPythonPackage rec { ]; checkInputs = [ + aiohttp asttokens blinker botocore bottle + celery chalice django executing @@ -67,25 +72,22 @@ buildPythonPackage rec { falcon flask_login gevent + httpx jsonschema pure-eval + pyramid + pyspark pytest-django pytest-forked pytest-localserver pytestCheckHook rq + sanic + sanic-testing sqlalchemy tornado trytond werkzeug - ] ++ lib.optionals isPy3k [ - aiohttp - celery - httpx - pyramid - pyspark - sanic - sanic-testing ]; doCheck = !stdenv.isDarwin; diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index 90a549c65955..f31708baef8b 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -1,4 +1,6 @@ -{ azure-core +{ lib +, stdenv +, azure-core , bokeh , buildPythonPackage , click @@ -9,7 +11,6 @@ , GitPython , jsonref , jsonschema -, lib , matplotlib , nbformat , pandas @@ -22,6 +23,7 @@ , pytest-xdist , pytestCheckHook , python-dateutil +, pythonOlder , pyyaml , requests , scikit-learn @@ -29,13 +31,15 @@ , setproctitle , setuptools , shortuuid -, stdenv , tqdm }: buildPythonPackage rec { pname = "wandb"; version = "0.12.15"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; @@ -62,6 +66,23 @@ buildPythonPackage rec { shortuuid ]; + checkInputs = [ + azure-core + bokeh + flask + jsonref + jsonschema + matplotlib + nbformat + pandas + pydantic + pytest-mock + pytest-xdist + pytestCheckHook + scikit-learn + tqdm + ]; + # wandb expects git to be in PATH. See https://gist.github.com/samuela/57aeee710e41ab2bf361b7ed8fbbeabf # for the error message, and an example usage here: https://github.com/wandb/client/blob/d5f655b7ca7e3eac2f3a67a84bc5c2a664a31baf/wandb/sdk/internal/meta.py#L128. # See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 as to @@ -112,26 +133,13 @@ buildPythonPackage rec { # Disable test that fails on darwin due to issue with python3Packages.psutil: # https://github.com/giampaolo/psutil/issues/1219 - disabledTests = lib.optional stdenv.isDarwin "test_tpu_system_stats"; - - checkInputs = [ - azure-core - bokeh - flask - jsonref - jsonschema - matplotlib - nbformat - pandas - pydantic - pytest-mock - pytest-xdist - pytestCheckHook - scikit-learn - tqdm + disabledTests = lib.optional stdenv.isDarwin [ + "test_tpu_system_stats" ]; - pythonImportsCheck = [ "wandb" ]; + pythonImportsCheck = [ + "wandb" + ]; meta = with lib; { description = "A CLI and library for interacting with the Weights and Biases API";