nixpkgs/pkgs/os-specific
Michael Raskin 19530856ed Merge remote-tracking branch 'upstream/master' into x-updates
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/misc/ghostscript/default.nix
	pkgs/top-level/all-packages.nix
2013-06-13 17:12:43 +04: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 remote-tracking branch 'upstream/master' into x-updates 2013-06-13 17:12:43 +04:00
windows pthread-win32: don't propagate `mingw_headers' 2013-03-29 21:46:38 +01:00