Vladimír Čunát 96cec2a7bd Merge 'staging' into multiple-outputs ... Conflicts: pkgs/applications/audio/flac/default.nix pkgs/build-support/gcc-wrapper/builder.sh pkgs/development/libraries/apr-util/default.nix pkgs/development/libraries/apr/default.nix pkgs/development/libraries/atk/default.nix pkgs/development/libraries/freetype/default.nix pkgs/development/libraries/gdk-pixbuf/default.nix pkgs/development/libraries/glib/default.nix pkgs/development/libraries/glibc/2.17/builder.sh pkgs/development/libraries/glibc/2.17/locales.nix pkgs/development/libraries/libjpeg/default.nix pkgs/development/libraries/libogg/default.nix pkgs/development/libraries/libsamplerate/default.nix pkgs/development/libraries/libtiff/default.nix pkgs/development/libraries/libvorbis/default.nix pkgs/development/libraries/mesa/default.nix pkgs/development/libraries/pango/default.nix pkgs/development/web/nodejs/default.nix pkgs/os-specific/linux/pam/default.nix pkgs/os-specific/linux/systemd/default.nix pkgs/stdenv/generic/setup.sh pkgs/stdenv/linux/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/release-small.nix		2014-08-23 16:04:53 +02:00
..
264.nix	Darwin: Add mig', lipo', etc. to `stdenvNative'.	2012-04-23 15:47:31 +00:00
762-13887.patch	cmake: Fix CTest custom commands	2013-08-21 10:24:53 +02:00
default.nix	Merge 'staging' into multiple-outputs	2014-08-23 16:04:53 +02:00
search-path-264.patch	Add cmake-2.6.4	2012-02-23 11:27:43 +00:00
search-path.patch	Re-Revert "Merge pull request #567 from MarcWeber/submit/cmake-improvement"	2013-06-27 15:14:32 +02:00
setup-hook.sh	cmake: Fix setup hook on bash < 4.0	2014-08-09 23:14:01 +02:00