Eelco Dolstra 929b7bdc4b Merge remote-tracking branch 'origin/master' into glibc-2.18 ... Conflicts: pkgs/development/libraries/glibc/2.17/locales.nix		2013-12-03 09:22:24 -05:00
doc	Only show/build a package on the platforms listed in meta.platforms	2013-11-05 00:06:10 +01:00
lib	Add alienfx. Only tested with M11x Made some corrections. Added meta-data Use more of the original makefile 2 space indent	2013-11-24 15:19:54 +01:00
maintainers/scripts	Fix references to pkgs/lib	2013-10-10 13:28:22 +02:00
nixos	Fix passing of kernel parameters	2013-12-02 11:56:58 -05:00
pkgs	Merge remote-tracking branch 'origin/master' into glibc-2.18	2013-12-03 09:22:24 -05: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