Peter Simons c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates. ... Conflicts: pkgs/development/interpreters/perl/5.16/default.nix pkgs/tools/networking/curl/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/release-python.nix pkgs/top-level/release-small.nix pkgs/top-level/release.nix		2013-12-04 18:33:52 +01: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
nixos	postgresql: Fix shutdown	2013-12-03 12:04:20 -05:00
pkgs	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-12-04 18:33:52 +01:00
.gitignore
.version
COPYING
default.nix