diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-26 00:45:11 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-26 00:45:11 +0000 |
commit | 2661d9378f9b25c894e40a43b7db603aa88e1b4a (patch) | |
tree | dc459c57338b4c1cb690b6a2177d7fb8f87e5dd0 /pkgs/development/tools | |
parent | a127deeb889b111138f5152e54681577706ab741 (diff) | |
parent | 68953d0486ab5f536c9145b5355cbcaa7e3047dc (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools')
-rw-r--r-- | pkgs/development/tools/database/sqldeveloper/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/tools/misc/gdbgui/default.nix | 47 | ||||
-rw-r--r-- | pkgs/development/tools/misc/gede/default.nix | 8 | ||||
-rw-r--r-- | pkgs/development/tools/parsing/javacc/default.nix | 32 |
4 files changed, 81 insertions, 10 deletions
diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 6017d704fc17..c42197e13cf1 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, makeDesktopItem, makeWrapper, requireFile, unzip, jdk }: let - version = "20.2.0.175.1842"; + version = "20.4.0.379.2205"; desktopItem = makeDesktopItem { name = "sqldeveloper"; @@ -46,7 +46,7 @@ in nix-prefetch-url --type sha256 file:///path/to/${name} ''; - sha256 = "1fcaq7ffn1q35f7rvp3ybs2191lvfc0jgjx7y4wn1nqglgj7zy7n"; + sha256 = "1h53gl41ydr7kim6q9ckg3xyhb0rhmwj7jnis0xz6vms52b3h59k"; }; buildInputs = [ makeWrapper unzip ]; diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix index 92338bb0323a..a82ff178c9eb 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/pkgs/development/tools/misc/gdbgui/default.nix @@ -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 ]; }; } diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index 39954b458b4d..486557d9219a 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "gede"; - version = "2.16.2"; + version = "2.17.1"; src = fetchurl { - url = "http://gede.acidron.com/uploads/source/${pname}-${version}.tar.xz"; - sha256 = "18a8n9yvhgkbc97p2995j7b5ncfdzy1fy13ahdafqmcpkl4r1hrj"; + url = "http://gede.dexar.se/uploads/source/${pname}-${version}.tar.xz"; + sha256 = "0hbsy2ymzgl8xd9mnh43gxdfncy7g6czxfvfyh7zp3ij8yiwf8x3"; }; nativeBuildInputs = [ qmake makeWrapper python ]; @@ -25,7 +25,7 @@ mkDerivation rec { meta = with lib; { description = "Graphical frontend (GUI) to GDB"; - homepage = "http://gede.acidron.com"; + homepage = "http://gede.dexar.se"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ juliendehos ]; diff --git a/pkgs/development/tools/parsing/javacc/default.nix b/pkgs/development/tools/parsing/javacc/default.nix new file mode 100644 index 000000000000..d074e3dda93e --- /dev/null +++ b/pkgs/development/tools/parsing/javacc/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchFromGitHub, ant, jdk }: + +stdenv.mkDerivation rec { + pname = "javacc"; + version = "7.0.10"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "120jva4sw1kylkwgqf869zxddss01mcn1nmimx9vmd4xaadz7cf2"; + }; + + nativeBuildInputs = [ ant jdk ]; + + buildPhase = '' + ant jar + ''; + + installPhase = '' + mkdir -p $out/target + mv scripts $out/bin + mv target/javacc.jar $out/target/ + ''; + + meta = with lib; { + homepage = "https://javacc.github.io/javacc"; + description = "A parser generator for building parsers from grammars"; + license = licenses.bsd2; + maintainers = [ teams.deshaw.members ]; + }; +} |