Vladimír Čunát e740b565cf Merge master into stdenv-updates ... Conflicts (easy): pkgs/development/compilers/llvm/default.nix pkgs/development/compilers/openjdk/default.nix pkgs/development/libraries/icu/default.nix pkgs/development/libraries/libssh/default.nix pkgs/development/libraries/libxslt/default.nix pkgs/development/tools/parsing/bison/3.x.nix		2013-12-29 10:01:22 +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 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	windowManager.xmonad: Make it configurable and extensible.	2013-12-28 09:29:53 +01:00
pkgs	Merge master into stdenv-updates	2013-12-29 10:01:22 +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