Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/desktops/e18/enlightenment.nix		2014-08-04 16:51:47 +02:00
..
aterm
classpath	unmaintain several packages	2013-08-16 23:45:01 +02:00
cup
dbus-java
geoipjava	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
gwt-dragdrop	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
gwt-widgets	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
hsqldb	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
httpunit	httpunit: update from 1.6 to 1.7	2013-12-16 01:36:16 +02:00
hydra-ant-logger	Replace lib/java -> share/java	2014-01-09 13:01:38 +01:00
jakarta-bcel	nixos.org/tarballs -> tarballs.nixos.org	2013-06-25 14:12:16 +02:00
jakarta-commons/file-upload
jakarta-regexp	nixos.org/tarballs -> tarballs.nixos.org	2013-06-25 14:12:16 +02:00
javasvn
jdom
jetty-gwt	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
jetty-util	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
jflex	jflex: update from 1.4.1 to 1.4.3	2013-12-14 04:40:53 +02:00
jjtraveler
junit	junit: Update to 4.11	2014-01-25 03:04:46 +01:00
junixsocket	junixsocket: Fix build on Darwin	2014-07-15 11:17:51 +02:00
jzmq	Yes.	2013-09-02 18:50:49 +02:00
libmatthew-java	Change location of libmatthew-java to fedora's mirror. Original one is unreachable	2014-07-31 17:58:03 +02:00
lucene
mockobjects
rhino	Fix some "meta.licenses" attributes	2014-01-25 03:04:46 +01:00
saxon	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless	2012-01-18 20:16:00 +00:00
shared-objects
smack	svn merge ^/nixpkgs/trunk	2012-01-27 11:48:58 +00:00
swt	Fixed download path	2014-08-01 22:41:33 +02:00