diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-10-22 09:33:07 -0700 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-10-22 09:33:07 -0700 |
| commit | fc25d940101161034ac357c48a5912b413fa75cc (patch) | |
| tree | 8d704fee8fa5137952e12e19d74e683ce1fea729 /pkgs/development/python-modules/termplotlib/gnuplot-subprocess.patch | |
| parent | 54a42ab84624e64ad5a1f34daa9559d148970f95 (diff) | |
| parent | 1cab3e231b41f38f2d2cbf5617eb7b88e433428a (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
pkgs/development/python-modules/jupyter-client/default.nix
pkgs/development/python-modules/jupyterlab-git/default.nix
Diffstat (limited to 'pkgs/development/python-modules/termplotlib/gnuplot-subprocess.patch')
0 files changed, 0 insertions, 0 deletions
