Vladimír Čunát a2c316288c Merge master into stdenv-updates ... Conflicts: pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved) pkgs/top-level/all-packages.nix (trivial)		2014-01-12 12:29:24 +01:00
..
generic	stdenv: Prepend SHELL=... to makeFlags	2014-01-07 17:45:55 +01:00
linux	Merge master into stdenv-updates	2014-01-12 12:29:24 +01:00
mingw
native
nix
adapters.nix
common-path.nix
default.nix