Silly nixpkgs mirror, totally harmless :3

Vladimír Čunát 668310a2b5 Merge stdenv-updates into master ... This is a re-merge, in fact. Now the first parent is master as of right before the "first merge" (ac6761c9). A few commits pushed in-between into master now look like coming from stdenv-updates, but otherwise this seems to fix the situation. Cf. 320209a618 (commitcomment-5125991)		2014-01-21 12:58:55 +01:00
doc	manual: Document Java support	2014-01-13 13:15:59 +01:00
lib	lib/maintainers.nix: add missing entry for 'sprock'	2014-01-20 18:18:35 +01:00
maintainers/scripts	Fix references to pkgs/lib	2013-10-10 13:28:22 +02:00
nixos	Whitespace to force a build	2014-01-19 15:07:35 -05:00
pkgs	Stick titanium CLI to version 3.2.0, otherwise the latest beta version gets installed	2014-01-21 12:10:53 +01:00
.gitignore	Merge .gitignore files	2013-10-10 13:28:22 +02:00
.version	Next release will be 14.02 Baboon	2013-11-01 09:16:36 +01:00
COPYING	* Applying an MIT-style license to Nixpkgs.	2006-04-25 16:50:34 +00:00
default.nix	* For convenience, provide a top-level Nix expression that simply	2007-04-26 14:32:57 +00:00