Jörg Thalheim fd9c7b0d9a Merge pull request #26312 from risicle/magic-wormhole-fix ... python.pkgs.magic-wormhole: fix build mostly through adding new dependencies		2017-06-02 22:47:10 +01:00
..
applications	Merge pull request #26317 from Mounium/pymol	2017-06-02 21:58:27 +01:00
build-support	symlinkJoin: eliminate lndir spam	2017-05-27 16:19:34 -04:00
common-updater	common-updater-script: fix error handling	2017-05-19 17:14:43 +03:00
data	geolite-legacy: 2016-07-08 -> 2017-05-26	2017-05-26 13:09:45 +02:00
desktops	webkitgtk: 2.14.11 -> 2.16.3	2017-05-26 16:20:54 +03:00
development	Merge pull request #26312 from risicle/magic-wormhole-fix	2017-06-02 22:47:10 +01:00
games	Merge pull request #26330 from Drakonis/master	2017-06-02 21:46:23 +01:00
misc	user-local config.nix path fixed in docs	2017-05-27 13:38:15 +03:00
os-specific	bcc: 0.2.0 -> 0.3.0 (#26315)	2017-06-02 22:23:19 +01:00
servers	uwsgi: fix php plugin build	2017-06-02 19:56:22 +03:00
shells	zsh-syntax-highlighting: 0.4.1 -> 0.5.0	2017-05-23 12:18:05 +02:00
stdenv	Merge branch 'staging' (early part)	2017-05-30 16:08:21 +02:00
test
tools	youtube-dl: 2017.05.23 -> 2017.05.29 (#26329)	2017-06-02 21:40:17 +01:00
top-level	Merge pull request #26317 from Mounium/pymol	2017-06-02 21:58:27 +01:00