Vladimír Čunát 9443129b08 Merge master into stdenv-updates ... Conflicts: pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates) pkgs/misc/emulators/zsnes/default.nix (more complex, build tested) pkgs/top-level/all-packages.nix (auto-solved)		2014-01-04 18:34:53 +01:00
doc	Clarify a step from the quick start section.	2013-12-30 13:45:46 +01:00
lib	add lowPrioSet and hiPrioSet functions to enable changing of priorities of attrsets with packages such as kde.	2013-12-26 04:22:29 +02:00
maintainers/scripts	Fix references to pkgs/lib	2013-10-10 13:28:22 +02:00
nixos	networkmanager: register PPTP service	2014-01-02 11:02:29 -06:00
pkgs	Merge master into stdenv-updates	2014-01-04 18:34:53 +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
default.nix