Martin Weinelt d434f1486e python3Packages.ovito: revert change that conflicts with master ... The package was dropped in favor of the ovito package living at the top-level attribute.		2021-02-14 00:40:01 +01:00
..
applications	Merge master into staging-next	2021-02-13 18:15:59 +00:00
build-support
common-updater
data	Merge master into staging-next	2021-02-13 00:36:11 +00:00
desktops	Merge pull request #110017 from rhoriguchi/fuzzy-app-search	2021-02-13 15:23:35 +01:00
development	python3Packages.ovito: revert change that conflicts with master	2021-02-14 00:40:01 +01:00
games	Merge master into staging-next	2021-02-13 00:36:11 +00:00
misc	Merge master into staging-next	2021-02-13 06:16:33 +00:00
os-specific	Merge master into staging-next	2021-02-13 00:36:11 +00:00
pkgs-lib
servers	Merge master into staging-next	2021-02-13 18:15:59 +00:00
shells	zsh-system-clipboard: init at 0.7.0	2021-02-11 20:01:06 +03:00
stdenv	Merge master into staging-next	2021-02-11 18:16:48 +00:00
test
tools	Merge master into staging-next	2021-02-13 18:15:59 +00:00
top-level	Merge master into staging-next	2021-02-13 18:15:59 +00:00