nixpkgs/pkgs/development/tools/build-managers
Yury G. Kudryashov 215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
..
apache-ant * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
bam * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
buildbot * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
cmake svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
gnumake GNU Make 3.82: Ignore test failures on Darwin. 2010-11-09 13:12:26 +00:00
gnumake-3.80 * Get rid of all references to nix.cs.uu.nl. 2008-11-14 16:57:19 +00:00
gradle * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
jam * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
leiningen leiningen: added package version 1.6.2 2012-01-19 20:34:59 +00:00
mk * Get rid of all references to nix.cs.uu.nl. 2008-11-14 16:57:19 +00:00
remake Adding 'remake': a patched and modernized version of GNU make utility that adds 2009-10-11 15:03:13 +00:00
scons pkgs/development/tools/build-managers/scons: cosmetic build improvements 2010-12-07 11:41:25 +00:00
simple-build-tool patch provided by David Brown adding simple-build-tool which builds Scala packages 2010-05-08 21:51:47 +00:00