commit 49270e5792249e3df7bb1437430b3ee8df147024 · pyrox.dev/nixpkgs

+7 -8

pkgs/applications/networking/gns3/default.nix

··· 1 - { callPackage, libsForQt5 }: 1 + { callPackage 2 + , libsForQt5 3 + }: 2 4 3 5 let 4 - stableVersion = "2.2.29"; 6 + stableVersion = "2.2.31"; 5 7 previewVersion = stableVersion; 6 8 addVersion = args: 7 9 let version = if args.stable then stableVersion else previewVersion; ··· 18 20 }); 19 21 }; 20 22 commonOverrides = [ 21 - (mkOverride "psutil" "5.8.0" 22 - "sha256-DJzLmat2Al8vC77PNB1GVunBNR24zIoDzNYuMYq0tcY=") 23 - (mkOverride "jsonschema" "3.2.0" 24 - "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68") 23 + (mkOverride "jsonschema" "3.2.0" "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68") 25 24 ]; 26 25 }; 27 26 mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; 28 27 mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; 29 - guiSrcHash = "04yqh0kq5pkmadcxf090ilh9sqqxajcg65nf7ai1iikxi3x7z3r8"; 30 - serverSrcHash = "0p6q421rldmyqi0padssgrssf4d9mb5ifiqjm5y8vfhwfl5a2cqk"; 28 + guiSrcHash = "sha256-o9j/avuapiUKIDO6aO/uWFF/5gu+xdfhL7ZSDSaQ858="; 29 + serverSrcHash = "sha256-8r8nWNqbHUDtJ6x+/SxHxaw1isSuWF/5as3YXLB6LFw="; 31 30 in { 32 31 guiStable = mkGui { 33 32 stable = true;

+29 -7

pkgs/applications/networking/gns3/gui.nix

··· 1 - { stable, branch, version, sha256Hash, mkOverride, commonOverrides }: 1 + { stable 2 + , branch 3 + , version 4 + , sha256Hash 5 + , mkOverride 6 + , commonOverrides 7 + }: 2 8 3 - { lib, python3, fetchFromGitHub, wrapQtAppsHook }: 9 + { lib 10 + , python3 11 + , fetchFromGitHub 12 + , wrapQtAppsHook 13 + }: 4 14 5 15 let 6 16 defaultOverrides = commonOverrides ++ [ ··· 34 44 sha256 = sha256Hash; 35 45 }; 36 46 37 - nativeBuildInputs = [ wrapQtAppsHook ]; 47 + nativeBuildInputs = [ 48 + wrapQtAppsHook 49 + ]; 50 + 38 51 propagatedBuildInputs = with python.pkgs; [ 39 - sentry-sdk psutil jsonschema # tox for check 40 - # Runtime dependencies 41 - sip_4 (pyqt5.override { withWebSockets = true; }) distro setuptools 52 + distro 53 + jsonschema 54 + psutil 55 + sentry-sdk 56 + setuptools 57 + sip_4 (pyqt5.override { withWebSockets = true; }) 42 58 ]; 43 59 44 60 doCheck = false; # Failing 61 + 45 62 dontWrapQtApps = true; 63 + 46 64 postFixup = '' 47 65 wrapQtApp "$out/bin/gns3" 48 66 ''; 67 + 49 68 postPatch = '' 50 69 substituteInPlace requirements.txt \ 51 - --replace "sentry-sdk==1.3.1" "sentry-sdk>=1.3.1" \ 70 + --replace "sentry-sdk==" "sentry-sdk>=" \ 71 + --replace "psutil==" "psutil>=" \ 72 + --replace "distro==" "distro>=" \ 73 + --replace "setuptools==" "setuptools>=" 52 74 ''; 53 75 54 76 meta = with lib; {

+36 -22

pkgs/applications/networking/gns3/server.nix

··· 1 - { stable, branch, version, sha256Hash, mkOverride, commonOverrides }: 1 + { stable 2 + , branch 3 + , version 4 + , sha256Hash 5 + , mkOverride 6 + , commonOverrides 7 + }: 2 8 3 - { lib, python3, fetchFromGitHub, packageOverrides ? self: super: {} 4 - }: 9 + { lib 10 + , python3 11 + , fetchFromGitHub 12 + , packageOverrides ? self: super: {} 13 + }: 5 14 6 15 let 7 16 defaultOverrides = commonOverrides ++ [ 8 17 (self: super: { 9 - aiofiles = super.aiofiles.overridePythonAttrs (oldAttrs: rec { 10 - pname = "aiofiles"; 11 - version = "0.7.0"; 12 - src = fetchFromGitHub { 13 - owner = "Tinche"; 14 - repo = pname; 15 - rev = "v${version}"; 16 - sha256 = "sha256-njQ7eRYJO+dUrwO5pZwKHXn9nVSGYcEhwhs3x5BMc28="; 17 - }; 18 - doCheck = false; 19 - }); 20 - 21 18 jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec { 22 19 version = "3.2.0"; 23 20 ··· 51 48 52 49 postPatch = '' 53 50 substituteInPlace requirements.txt \ 54 - --replace "aiohttp==3.7.4" "aiohttp>=3.7.4" \ 55 - --replace "Jinja2==3.0.1" "Jinja2>=3.0.1" \ 56 - --replace "sentry-sdk==1.3.1" "sentry-sdk>=1.3.1" \ 57 - --replace "async-timeout==3.0.1" "async-timeout>=3.0.1" \ 51 + --replace "aiohttp==" "aiohttp>=" \ 52 + --replace "aiofiles==" "aiofiles>=" \ 53 + --replace "Jinja2==" "Jinja2>=" \ 54 + --replace "sentry-sdk==" "sentry-sdk>=" \ 55 + --replace "async-timeout==" "async-timeout>=" \ 56 + --replace "psutil==" "psutil>=" \ 57 + --replace "distro==" "distro>=" \ 58 + --replace "py-cpuinfo==" "py-cpuinfo>=" \ 59 + --replace "setuptools==" "setuptools>=" 58 60 ''; 59 61 60 62 propagatedBuildInputs = with python.pkgs; [ 61 - aiohttp-cors yarl aiohttp multidict setuptools 62 - jinja2 psutil zipstream sentry-sdk jsonschema distro async_generator aiofiles 63 - prompt-toolkit py-cpuinfo 63 + aiofiles 64 + aiohttp 65 + aiohttp-cors 66 + async_generator 67 + distro 68 + jinja2 69 + jsonschema 70 + multidict 71 + prompt-toolkit 72 + psutil 73 + py-cpuinfo 74 + sentry-sdk 75 + setuptools 76 + yarl 77 + zipstream 64 78 ]; 65 79 66 80 # Requires network access

+12 -10

pkgs/development/python-modules/sentry-sdk/default.nix

··· 28 28 , pytest-forked 29 29 , pytest-localserver 30 30 , pytestCheckHook 31 + , pythonOlder 31 32 , rq 32 33 , sanic 33 34 , sanic-testing ··· 40 41 41 42 buildPythonPackage rec { 42 43 pname = "sentry-sdk"; 43 - version = "1.5.8"; 44 + version = "1.5.10"; 44 45 format = "setuptools"; 46 + 47 + disabled = pythonOlder "3.7"; 45 48 46 49 src = fetchFromGitHub { 47 50 owner = "getsentry"; 48 51 repo = "sentry-python"; 49 52 rev = version; 50 - sha256 = "sha256-28MkwQog+Abk1PSDPWbah650YATiGCBWaTbFO52KgzY="; 53 + hash = "sha256-f5V2fMvPpyz+pU08Owzxq9xI48ZeZpH5SmUXtshqMm0="; 51 54 }; 52 55 53 56 propagatedBuildInputs = [ ··· 56 59 ]; 57 60 58 61 checkInputs = [ 62 + aiohttp 59 63 asttokens 60 64 blinker 61 65 botocore 62 66 bottle 67 + celery 63 68 chalice 64 69 django 65 70 executing ··· 67 72 falcon 68 73 flask_login 69 74 gevent 75 + httpx 70 76 jsonschema 71 77 pure-eval 78 + pyramid 79 + pyspark 72 80 pytest-django 73 81 pytest-forked 74 82 pytest-localserver 75 83 pytestCheckHook 76 84 rq 85 + sanic 86 + sanic-testing 77 87 sqlalchemy 78 88 tornado 79 89 trytond 80 90 werkzeug 81 - ] ++ lib.optionals isPy3k [ 82 - aiohttp 83 - celery 84 - httpx 85 - pyramid 86 - pyspark 87 - sanic 88 - sanic-testing 89 91 ]; 90 92 91 93 doCheck = !stdenv.isDarwin;

+29 -21

pkgs/development/python-modules/wandb/default.nix

··· 1 - { azure-core 1 + { lib 2 + , stdenv 3 + , azure-core 2 4 , bokeh 3 5 , buildPythonPackage 4 6 , click ··· 9 11 , GitPython 10 12 , jsonref 11 13 , jsonschema 12 - , lib 13 14 , matplotlib 14 15 , nbformat 15 16 , pandas ··· 22 23 , pytest-xdist 23 24 , pytestCheckHook 24 25 , python-dateutil 26 + , pythonOlder 25 27 , pyyaml 26 28 , requests 27 29 , scikit-learn ··· 29 31 , setproctitle 30 32 , setuptools 31 33 , shortuuid 32 - , stdenv 33 34 , tqdm 34 35 }: 35 36 36 37 buildPythonPackage rec { 37 38 pname = "wandb"; 38 39 version = "0.12.15"; 40 + format = "setuptools"; 41 + 42 + disabled = pythonOlder "3.6"; 39 43 40 44 src = fetchFromGitHub { 41 45 owner = pname; ··· 62 66 shortuuid 63 67 ]; 64 68 69 + checkInputs = [ 70 + azure-core 71 + bokeh 72 + flask 73 + jsonref 74 + jsonschema 75 + matplotlib 76 + nbformat 77 + pandas 78 + pydantic 79 + pytest-mock 80 + pytest-xdist 81 + pytestCheckHook 82 + scikit-learn 83 + tqdm 84 + ]; 85 + 65 86 # wandb expects git to be in PATH. See https://gist.github.com/samuela/57aeee710e41ab2bf361b7ed8fbbeabf 66 87 # for the error message, and an example usage here: https://github.com/wandb/client/blob/d5f655b7ca7e3eac2f3a67a84bc5c2a664a31baf/wandb/sdk/internal/meta.py#L128. 67 88 # See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 as to ··· 112 133 113 134 # Disable test that fails on darwin due to issue with python3Packages.psutil: 114 135 # https://github.com/giampaolo/psutil/issues/1219 115 - disabledTests = lib.optional stdenv.isDarwin "test_tpu_system_stats"; 136 + disabledTests = lib.optional stdenv.isDarwin [ 137 + "test_tpu_system_stats" 138 + ]; 116 139 117 - checkInputs = [ 118 - azure-core 119 - bokeh 120 - flask 121 - jsonref 122 - jsonschema 123 - matplotlib 124 - nbformat 125 - pandas 126 - pydantic 127 - pytest-mock 128 - pytest-xdist 129 - pytestCheckHook 130 - scikit-learn 131 - tqdm 140 + pythonImportsCheck = [ 141 + "wandb" 132 142 ]; 133 - 134 - pythonImportsCheck = [ "wandb" ]; 135 143 136 144 meta = with lib; { 137 145 description = "A CLI and library for interacting with the Weights and Biases API";