Tom Smeets 9ab69a3416 android-studio-preview: init at 3.0.0.5 canary 6 ... Added the `androidStudioPackages` attribute containing both the `stable` and `preview` channels. Changed the attribute `andorid-studio` to point to `androidStudioPackages.stable` Added the attribute `andorid-studio-preview` pointing to `androidStudioPackages.preview` I have tested this package using the new koltin support, no issues found yet.		2017-07-13 11:38:05 +02:00
..
applications	android-studio-preview: init at 3.0.0.5 canary 6	2017-07-13 11:38:05 +02:00
build-support	Merge: more compatibility for git* fetchers	2017-07-09 10:31:24 +02:00
common-updater	common-updater-script: fix error handling	2017-05-19 17:14:43 +03:00
data	Merge pull request #27328 from NickHu/terminus	2017-07-12 20:15:05 +01:00
desktops	Merge pull request #27297 from jtojnar/fix/ghex	2017-07-11 18:43:10 +01:00
development	Merge pull request #27350 from veprbl/slurm	2017-07-13 09:32:51 +01:00
games	lib: introduce imap0, imap1 (#25543)	2017-07-04 23:29:23 +01:00
misc	vim-plugins: Add nim.vim	2017-07-10 12:29:03 -05:00
os-specific	linux-copperhead: 4.12.d -> 4.12.e	2017-07-11 08:22:56 -04:00
servers	slurm: 15-08-5-1 -> 17.02.6, slurm-llnl -> slurm	2017-07-13 03:13:05 -04:00
shells	nix-zsh-completions: add missing version to derivation name	2017-07-10 07:03:07 +02:00
stdenv	Merge branch 'staging' into master	2017-07-08 22:22:17 +02:00
test
tools	munge: 0.5.11 -> 0.5.12, fix for Linux	2017-07-12 22:11:09 -04:00
top-level	android-studio-preview: init at 3.0.0.5 canary 6	2017-07-13 11:38:05 +02:00