nixpkgs/pkgs/os-specific
Vladimír Čunát 26af997d41 Merge branch 'master' into stdenv-updates
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
2013-03-02 10:41:53 +01:00
..
darwin/native-x11-and-opengl Move "darwin-native-x11-and-opengl" package into the "os-specific" hierarchy. 2013-01-30 14:53:04 +01:00
gnu More renames 2012-12-28 19:42:10 +01:00
linux Merge branch 'master' into stdenv-updates 2013-03-02 10:41:53 +01:00
windows Rename buildNativeInputs -> nativeBuildInputs 2012-12-28 19:20:09 +01:00