diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-10-17 20:00:39 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-10-17 20:00:39 +0000 |
| commit | a3159ef4986b0ca0601ec4b3ebffb60b1366c162 (patch) | |
| tree | 7341ea384a4106bda1161904953cf2f58351cffe /pkgs/development/python-modules/termplotlib | |
| parent | 0f92179807f4cf7343e7076bb35f1764c0fba6e6 (diff) | |
| parent | 88b8068d660967da18e5a097147e6794bb1d0cb8 (diff) | |
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
pkgs/development/python-modules/libusb1/default.nix
Diffstat (limited to 'pkgs/development/python-modules/termplotlib')
0 files changed, 0 insertions, 0 deletions