Vladimír Čunát 0a58b512cb Merge master into stdenv-updates ...

Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix

2014-01-18 14:46:20 +01:00

..

apache-ant

apacheAntGcj: Remove

2014-01-09 13:06:51 +01:00

bam

* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless

2012-01-18 20:16:00 +00:00

buildbot

unmaintain several packages

2013-08-16 23:45:01 +02:00

buildbot-slave

Add myself as maintainer for several packages

2013-05-20 20:28:15 +02:00

cmake

cmake: Fix CTest custom commands

2013-08-21 10:24:53 +02:00

colormake

More description fixes

2013-10-06 12:01:38 +02:00

gnumake

gnumake: add version 4.0

2013-12-09 16:14:41 +01:00

gradle

gradle: update to 1.8

2013-09-29 21:40:17 +02:00

jam

svn merge ^/nixpkgs/trunk

2012-02-25 19:57:34 +00:00

leiningen

Replace lib/java -> share/java

2014-01-09 13:01:38 +01:00

mk

nixos.org/tarballs -> tarballs.nixos.org

2013-06-25 14:12:16 +02:00

ninja

Whitespace fixes in package expressions I maintain

2014-01-02 17:58:08 +01:00

rebar

Fix some issues in my packages reported by nixpkgs-lint.

2013-09-26 20:03:57 +00: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

Re-add HTTP/HTTPS support back to Subversion by adding serf. Tested.

2013-12-30 23:33:22 +04:00

simple-build-tool

Fixed sbt options

2013-12-08 20:03:17 +01:00