From 13ca8e47f045bb54444aec6bc99205d62351d066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 29 Apr 2022 22:12:57 +0200 Subject: [PATCH 1/2] python3.pkgs.flask-compress: 1.11 -> 1.12 --- pkgs/development/python-modules/flask-compress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-compress/default.nix b/pkgs/development/python-modules/flask-compress/default.nix index 26e5feca03e..2825e41a081 100644 --- a/pkgs/development/python-modules/flask-compress/default.nix +++ b/pkgs/development/python-modules/flask-compress/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "1.11"; + version = "1.12"; pname = "Flask-Compress"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9WnzLERtayXKjjR9UAOgUxgR73MmeABbADb8HJ6xwhw="; + sha256 = "sha256-4hWUmfOdYYpNVroEhOe1i1eVa5osbTUQ8JX1uxS3r8U="; }; nativeBuildInputs = [ From b9a93b91db0cb2a9ad3728bbdcf3e02797844b4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 29 Apr 2022 22:14:03 +0200 Subject: [PATCH 2/2] gdbgui: 0.14.0.2 -> 0.15.0.1 --- .../development/tools/misc/gdbgui/default.nix | 57 ++----------------- 1 file changed, 6 insertions(+), 51 deletions(-) diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix index a82ff178c9e..e953fa0ba40 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/pkgs/development/tools/misc/gdbgui/default.nix @@ -2,80 +2,35 @@ , buildPythonApplication , fetchPypi , gdb -, flask -, six -, bidict -, python-engineio -, python-socketio , flask-socketio , flask-compress , pygdbmi , pygments -, gevent -, gevent-websocket -, eventlet , }: -let - # gdbgui only works with the latest previous major version of flask-socketio, - # which depends itself on the latest previous major versions of dependencies. - python-engineio' = python-engineio.overridePythonAttrs (old: rec { - version = "3.14.2"; - src = fetchPypi { - inherit (old) pname; - inherit version; - sha256 = "119halljynqsgswlhlh750qv56js1p7j52sc0nbwxh8450zmbd7a"; - }; - propagatedBuildInputs = [ six ]; - doCheck = false; - }); - python-socketio' = python-socketio.overridePythonAttrs (old: rec { - version = "4.6.1"; - src = fetchPypi { - inherit (old) pname; - inherit version; - sha256 = "047syhrrxh327p0fnab0d1zy25zijnj3gs1qg3kjpsy1jaj5l7yd"; - }; - propagatedBuildInputs = [ bidict python-engineio' ]; - doCheck = false; - }); - flask-socketio' = flask-socketio.overridePythonAttrs (old: rec { - version = "4.3.2"; - src = fetchPypi { - inherit (old) pname; - inherit version; - sha256 = "0s2xs9kv9cbwy8bcxszhdwlcb9ldv0fj33lwilf5vypj0wsin01p"; - }; - propagatedBuildInputs = [ flask python-socketio' ]; - doCheck = false; - }); -in buildPythonApplication rec { pname = "gdbgui"; - version = "0.14.0.2"; + + version = "0.15.0.1"; + buildInputs = [ gdb ]; propagatedBuildInputs = [ - flask - flask-socketio' + flask-socketio flask-compress pygdbmi pygments - gevent - gevent-websocket - eventlet ]; src = fetchPypi { inherit pname version; - sha256 = "1v6wwsncgnhlg5c7gsmzcp52hfblfnz5kf5pk4d0zybflsxak02d"; + sha256 = "sha256-bwrleLn3GBx4Mie2kujtaUo+XCALM+hRLySIZERlBg0="; }; postPatch = '' echo ${version} > gdbgui/VERSION.txt # remove upper version bound - sed -ie 's!, <.*"!"!' setup.py - sed -i 's/greenlet==/greenlet>=/' setup.py + sed -ie 's!,.*<.*!!' requirements.in ''; postInstall = ''