diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-12-31 07:26:03 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-12-31 07:26:03 +0100 |
| commit | 380c030740c26453a3d123848db35d0ce2921c36 (patch) | |
| tree | 3af5dfb5dcb3bc7dbd2e0699bbf2da53b0df74e3 /pkgs/development/python-modules/termplotlib/gnuplot-subprocess.patch | |
| parent | f787df200df9a54b9b9b3cd06f5f432e130d2a6f (diff) | |
| parent | 03f32c346f77c8fd55408932372c2fe4dbb80a7f (diff) | |
Merge branch 'master' into staging-next
; Conflicts:
; pkgs/development/python-modules/aiohttp-socks/default.nix
; pkgs/development/python-modules/emv/default.nix
; pkgs/development/python-modules/mocket/default.nix
; pkgs/development/python-modules/types-protobuf/default.nix
Diffstat (limited to 'pkgs/development/python-modules/termplotlib/gnuplot-subprocess.patch')
0 files changed, 0 insertions, 0 deletions