Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 576ef43e288b
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5452d8d4d9d8
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 25, 2021

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    d745d12 View commit details
  2. gdbgui: 0.13.2.1 -> 0.14.0.2

    jollheef committed Jan 25, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    38b140b View commit details
  3. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    5452d8d View commit details
Showing with 45 additions and 8 deletions.
  1. +2 −4 pkgs/development/python-modules/pygdbmi/default.nix
  2. +43 −4 pkgs/development/tools/misc/gdbgui/default.nix
6 changes: 2 additions & 4 deletions pkgs/development/python-modules/pygdbmi/default.nix
Original file line number Diff line number Diff line change
@@ -7,15 +7,13 @@

buildPythonPackage rec {
pname = "pygdbmi";
version = "0.9.0.2";
version = "0.10.0.0";

src = fetchFromGitHub {
#inherit pname version;
#inherit pname version;
owner = "cs01";
repo = "pygdbmi";
rev = version;
sha256 = "01isx7912dbalmc3xsafk1a1n6bzzfrjn2363djcq0v57rqii53d";
sha256 = "0a6b3zyxwdcb671c6lrwxm8fhvsbjh0m8hf1r18m9dha86laimjr";
};

checkInputs = [ gdb ];
47 changes: 43 additions & 4 deletions pkgs/development/tools/misc/gdbgui/default.nix
Original file line number Diff line number Diff line change
@@ -3,6 +3,10 @@
, fetchPypi
, gdb
, flask
, six
, bidict
, python-engineio
, python-socketio
, flask-socketio
, flask-compress
, pygdbmi
@@ -12,14 +16,48 @@
, 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.13.2.1";
version = "0.14.0.2";

buildInputs = [ gdb ];
propagatedBuildInputs = [
flask
flask-socketio
flask-socketio'
flask-compress
pygdbmi
pygments
@@ -30,13 +68,14 @@ buildPythonApplication rec {

src = fetchPypi {
inherit pname version;
sha256 = "0zn5wi47m8pn4amx574ryyhqvhynipxzyxbx0878ap6g36vh6l1h";
sha256 = "1v6wwsncgnhlg5c7gsmzcp52hfblfnz5kf5pk4d0zybflsxak02d";
};

postPatch = ''
echo ${version} > gdbgui/VERSION.txt
# remove upper version bound
sed -ie 's!, <.*"!"!' setup.py
sed -i 's/greenlet==/greenlet>=/' setup.py
'';

postInstall = ''
@@ -52,6 +91,6 @@ buildPythonApplication rec {
homepage = "https://www.gdbgui.com/";
license = licenses.gpl3;
platforms = platforms.unix;
maintainers = with maintainers; [ yrashk ];
maintainers = with maintainers; [ yrashk dump_stack ];
};
}