Merge master into staging-next
This commit is contained in:
@@ -3361,6 +3361,8 @@ in {
|
||||
|
||||
jupyterlab = callPackage ../development/python-modules/jupyterlab {};
|
||||
|
||||
jupyterlab-git = callPackage ../development/python-modules/jupyterlab-git {};
|
||||
|
||||
jupyter-sphinx = callPackage ../development/python-modules/jupyter-sphinx { };
|
||||
|
||||
jupytext = callPackage ../development/python-modules/jupytext { };
|
||||
@@ -5360,6 +5362,8 @@ in {
|
||||
|
||||
pip = callPackage ../development/python-modules/pip { };
|
||||
|
||||
pipx = callPackage ../development/python-modules/pipx { };
|
||||
|
||||
pip-tools = callPackage ../development/python-modules/pip-tools {
|
||||
git = pkgs.gitMinimal;
|
||||
glibcLocales = pkgs.glibcLocales;
|
||||
@@ -7481,7 +7485,7 @@ in {
|
||||
|
||||
packet-python = callPackage ../development/python-modules/packet-python { };
|
||||
|
||||
pwntools = callPackage ../development/python-modules/pwntools { };
|
||||
pwntools = callPackage ../development/python-modules/pwntools { debugger = pkgs.gdb; };
|
||||
|
||||
ROPGadget = callPackage ../development/python-modules/ROPGadget { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user