Frederik Rietdijk bfa787ab47 python.pkgs.pycangjie: use buildPythonPackage ... mainly so that is has `pythonModule`		2018-01-01 11:48:31 +01:00
..
applications	Merge pull request #33204 from NixOS/python-unstable	2017-12-31 14:19:55 +01:00
build-support	Merge branch 'master' into staging	2017-12-31 09:53:49 +01:00
common-updater	update-source-version: Name part of name can contain dashes	2017-12-26 20:02:01 +02:00
data	Merge pull request #26805 from obsidiansystems/cross-elegant	2017-12-30 22:58:02 -05:00
desktops	Merge pull request #31094 from yegortimoshenko/ibus/update	2017-12-31 21:23:05 +03:00
development	python.pkgs.pycangjie: use buildPythonPackage	2018-01-01 11:48:31 +01:00
games	Merge remote-tracking branch 'upstream/master' into HEAD	2017-12-30 17:04:54 +01:00
misc	wine: update stable and unstable	2017-12-30 14:58:50 +01:00
os-specific	Merge branch 'master' into staging	2017-12-31 09:53:49 +01:00
servers	Merge pull request #26805 from obsidiansystems/cross-elegant	2017-12-30 22:58:02 -05:00
shells	Merge pull request #26805 from obsidiansystems/cross-elegant	2017-12-30 22:58:02 -05:00
stdenv	Merge pull request #26805 from obsidiansystems/cross-elegant	2017-12-30 22:58:02 -05:00
test
tools	Merge pull request #31094 from yegortimoshenko/ibus/update	2017-12-31 21:23:05 +03:00
top-level	python.pkgs.regex: move expression	2018-01-01 11:46:35 +01:00