Peter Simons 287e670462 Merge pull request #25390 from Hodapp87/rstudio_fix ... rstudio: Fix recompilation issue with custom package set		2017-05-02 16:43:41 +02:00
..
applications	Merge pull request #25390 from Hodapp87/rstudio_fix	2017-05-02 16:43:41 +02:00
build-support	nixBufferBuilders: Add haskellMonoRepo builder	2017-05-01 11:44:21 -04:00
common-updater
data
desktops	luajit: 2.1.0-beta2 -> 2.1.0-beta3	2017-05-02 14:00:45 +02:00
development	Merge pull request #25390 from Hodapp87/rstudio_fix	2017-05-02 16:43:41 +02:00
games	luajit: 2.1.0-beta2 -> 2.1.0-beta3	2017-05-02 14:00:45 +02:00
misc	Merge #24949: desmume: fix mesa+osmesa	2017-05-01 23:55:14 +02:00
os-specific	linux: Add cgroups patches for 4.9, 4.10, 4.11	2017-05-02 08:49:39 -04:00
servers	luajit: 2.1.0-beta2 -> 2.1.0-beta3	2017-05-02 14:00:45 +02:00
shells
stdenv	Merge pull request #25427 from aneeshusa/fix-meta-priority-types	2017-05-02 09:38:32 +02:00
test
tools	Merge pull request #25436 from romildo/upd.cmst	2017-05-02 15:00:04 +02:00
top-level	Merge pull request #25390 from Hodapp87/rstudio_fix	2017-05-02 16:43:41 +02:00