3 Commits

Author	SHA1	Message	Date
Vladimír Čunát	dbae4f109f	Merge branch 'master' into staging ... Conflicts (relatively simple): pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix	2015-01-31 19:34:57 +01:00
Ricardo M. Correia	9526284cfe	rustc: Update from 0.12 -> 1.0.0-alpha	2015-01-20 22:19:16 +01:00
Ricardo M. Correia	550124c126	rustc: Rename 0.12.nix -> 1.0.0-alpha.nix	2015-01-20 22:19:16 +01:00