Bjørn Forsman 9b16b5e381 conan: fix build after python3Packages updates ... conan needs jinja2<3 and six<=1.15.0. Adding six to packageOverrides results in this build error: $ nix-build -A conan ... Found duplicated packages in closure for dependency 'six': six 1.16.0 (/nix/store/zn4haxpv5j9ilccvw7vxxwbfb84vhl5i-python3.8-six-1.16.0/lib/python3.8/site-packages) six 1.15.0 (/nix/store/8nkfc88xal8g91hfjsxq93b6pfydq2d7-python3.8-six-1.15.0/lib/python3.8/site-packages) As the changes in six-1.16.0 look harmless, work around the above issue by allowing conan to use six-1.16.0.		2021-07-03 20:45:13 +02:00
..
applications	tdesktop: Drop the enchant2 and dee dependencies	2021-07-03 17:10:33 +02:00
build-support	dockerTools.pullImage: force disable skopeo's progress bar	2021-07-03 01:40:38 +00:00
common-updater
data	Merge pull request #127015 from r-ryantm/auto-update/terminus-font-ttf	2021-07-03 08:32:08 -05:00
desktops	gegl: drop the old 0.2 version, make gegl 0.4 default	2021-07-03 14:31:52 +02:00
development	conan: fix build after python3Packages updates	2021-07-03 20:45:13 +02:00
games	freeciv: 2.6.4 -> 2.6.5	2021-07-01 13:32:11 -07:00
misc	Merge pull request #128776 from eduardosm/seafile	2021-07-03 01:35:39 +01:00
os-specific	Merge pull request #129026 from jonringer/bump-zfs	2021-07-03 18:46:31 +01:00
pkgs-lib
servers	xwayland: support cross-compilation	2021-07-03 15:48:10 +02:00
shells	Merge pull request #128732 from happysalada/oil_optional_readline	2021-06-30 23:21:03 +02:00
stdenv
test
tools	Merge pull request #128720 from r-ryantm/auto-update/goreleaser	2021-07-03 08:11:34 -05:00
top-level	Merge pull request #129040 from fabaff/bump-diff-cover	2021-07-03 14:24:19 +01:00