diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2022-02-06 18:36:59 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2022-02-06 18:36:59 -0800 |
| commit | 46fd0afcb3474714eb73ab9ae576cfa1530afbcb (patch) | |
| tree | 7fb24420f49f00020e159b73262d915bf5700403 /pkgs/development/python-modules/termplotlib/gnuplot-subprocess.patch | |
| parent | 0cdc7232cb743e30e32862cd827650e2387bcf87 (diff) | |
| parent | 215002fb9f1fdf96fdb73506225044eb6d5da7ca (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
pkgs/development/python-modules/pysdl2/default.nix
pkgs/top-level/aliases.nix
Diffstat (limited to 'pkgs/development/python-modules/termplotlib/gnuplot-subprocess.patch')
0 files changed, 0 insertions, 0 deletions