Peter Simons 91f2c362de Merge remote-tracking branch 'origin/master' into stdenv-updates. ... Conflicts: pkgs/top-level/all-packages.nix		2013-10-26 18:28:05 +02:00
doc	Unify the Nixpkgs and NixOS version numbers	2013-10-10 13:28:22 +02:00
lib	Small cleanup	2013-10-24 14:49:59 +02:00
maintainers/scripts	Fix references to pkgs/lib	2013-10-10 13:28:22 +02:00
nixos	firebird.nix: Fix a misplaced } that causes "users" to be outside "config"	2013-10-25 15:52:52 +02:00
pkgs	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-10-26 18:28:05 +02:00
.gitignore	Merge .gitignore files	2013-10-10 13:28:22 +02:00
.version	Unify the Nixpkgs and NixOS version numbers	2013-10-10 13:28:22 +02:00
COPYING
default.nix