Joachim F 7928dbdcf9 Merge pull request #24138 from pjones/pjones/plex ... plex: 1.3.3.3148 -> 1.5.5.3634		2017-04-16 13:08:47 +01:00
..
applications	quaternion: get rid of superfluous icon-theme.cache	2017-04-16 19:48:52 +08:00
build-support	Merge pull request #24871 from elitak/cross-staging	2017-04-15 01:27:05 -04:00
common-updater	maintainers: Add script to patch version/sha256 in .nix files	2017-02-19 16:51:17 +02:00
data	comic-relief: change download URL	2017-04-15 12:04:37 +02:00
desktops	Merge: fixup a bad merge	2017-04-14 19:11:17 +02:00
development	wxGTK*: avoid the mesa attribute	2017-04-16 13:03:32 +02:00
games	steam: move libpciaccess as non-runtime dependencies	2017-04-11 01:51:46 +03:00
misc	vim-elixir: 2017-03-29 -> 2017-04-13	2017-04-13 18:46:37 +02:00
os-specific	treewide: remove unused buildEnv parameters	2017-04-16 10:29:49 +02:00
servers	Merge pull request #24138 from pjones/pjones/plex	2017-04-16 13:08:47 +01:00
shells	Merge pull request #24760 from matthewbauer/linux-only-pkgs	2017-04-09 14:18:10 +02:00
stdenv	stdenv: ARM bootstrap: Update bootstrap tarballs to latest hydra-built ones	2017-04-15 01:52:33 +03:00
test
tools	Merge pull request #24908 from adamruzicka/cjdns-v19.1	2017-04-16 12:10:59 +01:00
top-level	mesa: reduce usage of the attribute and explain why	2017-04-16 13:03:15 +02:00