diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-12-09 01:35:50 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-12-09 01:43:58 +0000 |
| commit | c9a581b05fa3eca0b02982398b5c2f3559f882ad (patch) | |
| tree | d0939a074304b8ccabb154f6c5a60f34f234a547 /pkgs/development/python-modules/termplotlib/gnuplot-subprocess.patch | |
| parent | 259565656c0107a3f112d41c120ab9ef4e79b5d3 (diff) | |
| parent | 9da11d94ee46af4956c7cc4ac526a99b0305132d (diff) | |
Merge remote-tracking branch 'nixpkgs/master' into staging-next
CONFLICT (rename/add): Rename pkgs/development/python-modules/jsonwatch/default.nix->pkgs/tools/misc/jsonwatch/default.nix in nixpkgs/master. Added pkgs/tools/misc/jsonwatch/default.nix in HEAD
Diffstat (limited to 'pkgs/development/python-modules/termplotlib/gnuplot-subprocess.patch')
0 files changed, 0 insertions, 0 deletions