Peter Simons 6be8ad3392 Merge branch 'origin/master' into stdenv-updates. ... There was a minor conflict in 'stumpwm'. The package needs texinfo version 4.x. At least is used to, I'm not sure whether it still does.		2013-10-18 18:57:24 +02:00
doc	Unify the Nixpkgs and NixOS version numbers	2013-10-10 13:28:22 +02:00
lib	mkEnableOption: Add a period at the end of the description	2013-10-17 14:29:51 +02:00
maintainers/scripts	Fix references to pkgs/lib	2013-10-10 13:28:22 +02:00
nixos	Test whether PAM resource limits work	2013-10-17 15:37:08 +02:00
pkgs	Merge branch 'origin/master' into stdenv-updates.	2013-10-18 18:57:24 +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