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
..
all-packages.nix	Merge 'staging' into multiple-outputs	2014-08-23 16:04:53 +02:00
guile-2-test.nix
haskell-defaults.nix
haskell-packages.nix	haskell-timeparsers: build this package with a recent version of 'convertible'	2014-08-20 20:26:57 +02:00
make-tarball.nix
node-packages-generated.nix
node-packages.json
node-packages.nix
perl-packages.nix	Merge 'staging' into multiple-outputs	2014-08-23 16:04:53 +02:00
php-packages.nix
platforms.nix
python-packages-generated.nix
python-packages.json
python-packages.nix	Merge pull request #3612 from nathanielbaxter/dev/flexget_update	2014-08-16 15:05:23 +02:00
release-cross.nix
release-lib.nix
release-python.nix
release-small.nix
release.nix