Vladimír Čunát a2c316288c Merge master into stdenv-updates ... Conflicts: pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved) pkgs/top-level/all-packages.nix (trivial)		2014-01-12 12:29:24 +01:00
doc	Clarify a step from the quick start section.	2013-12-30 13:45:46 +01:00
lib	connman: new packages ConnMan v1.20 and connman-ui	2014-01-11 20:22:53 +01:00
maintainers/scripts	Fix references to pkgs/lib	2013-10-10 13:28:22 +02:00
nixos	services.postgresql: Hint to use mkForce for authentication	2014-01-11 22:01:21 +00:00
pkgs	Merge master into stdenv-updates	2014-01-12 12:29:24 +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