nixpkgs-suyu/pkgs/development/tools/build-managers
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
..
apache-ant Drop unnecessary setting of java.home 2014-01-25 03:04:46 +01:00
bam * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
buildbot Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
buildbot-slave Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
cmake Merge 'staging' into multiple-outputs 2014-08-23 16:04:53 +02:00
colormake Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
gnumake Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
gradle Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
jam svn merge ^/nixpkgs/trunk 2012-02-25 19:57:34 +00:00
leiningen leiningen: Update to 2.4.2. 2014-06-19 12:04:33 +02:00
mk nixos.org/tarballs -> tarballs.nixos.org 2013-06-25 14:12:16 +02:00
ninja ninja: 1.4.0 -> 1.5.1 2014-08-20 01:13:33 -05:00
rebar rebar: Bump to 2.5.1. 2014-08-12 13:47:59 +02:00
remake remake: bump from version 3.81+dbg-0.2 to 3.82+dbg-0.6 2013-06-22 21:09:43 +02:00
scons Update Scons build manager 2014-08-03 22:29:41 +04:00
simple-build-tool simple-build-tool: update to version 0.13.5 2014-06-05 12:36:39 +02:00