nixpkgs

Author	SHA1	Message	Date
Eelco Dolstra	b3debdc046	Fix test evaluation	2013-10-16 12:47:11 +02:00
Eelco Dolstra	a5357e80cd	Tweak the version string It's now "<yy>.<mm>pre<commit-count>.<short-hash>" (e.g. "13.10pre5678.gfedcba") for the unstable branch, and "<yy>.<mm>.<commit-count>.<short-hash>" (e.g. "13.10.5678.gfedcba") for stable branches.	2013-10-10 13:28:22 +02:00
Eelco Dolstra	a7824368c2	Fix setting of .version-suffix	2013-10-10 13:28:22 +02:00
Eelco Dolstra	31203732b3	Update the release expressions and the channel generators	2013-10-10 13:28:22 +02:00
Eelco Dolstra	041da5a6f9	Unify the Nixpkgs and NixOS version numbers	2013-10-10 13:28:22 +02:00
Eelco Dolstra	5c1f8cbc70	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00