Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size ... Let's get rid of those merge conflicts.		2016-02-03 16:57:19 +01:00
..
patches	Remove no longer (or never) referenced patches	2016-01-24 02:02:21 +01:00
bioc-packages.nix	r-modules: regenerate CRAN, BIOC and IRKernel	2015-11-25 11:39:28 +01:00
cran-packages.nix	r-modules: regenerate CRAN packages	2016-01-04 09:19:24 +01:00
default.nix	treewide: Mass replace 'xorg.libXft}/lib' to refer the 'out' output	2016-01-24 10:03:37 +02:00
generate-r-packages.R	r-modules: use HTTPS, allow passing args from generated set, use MRAN	2015-11-25 11:39:28 +01:00
generate-shell.nix	r-modules: use HTTPS, allow passing args from generated set, use MRAN	2015-11-25 11:39:28 +01:00
generic-builder.nix	R: fix Darwin build	2016-01-06 22:20:40 +01:00
irkernel-packages.nix	r-modules: regenerate CRAN, BIOC and IRKernel	2015-11-25 11:39:28 +01:00
test-evaluation.nix
wrapper.nix