9 commits

Author	SHA1	Message	Date
Eelco Dolstra	7f410ef923	Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/misc/vim-plugins/default.nix	2014-07-22 11:00:00 +02:00
Eelco Dolstra	3c58261c67	Fix setting $JAVA_HOME	2014-07-16 18:34:14 +02:00
Eelco Dolstra	caa74a146d	openjdk-darwin: Update to 7u60b30	2014-07-15 11:51:07 +02:00
Charles Strahan	abc3a27dbc	fix openjdk url for Darwin	2014-06-25 15:01:13 -04:00
Eelco Dolstra	5150dbfdbe	openjdk-darwin: Behave the same as openjdk-linux	2014-01-28 12:10:27 +01:00
Shea Levy	c056a69fdd	darwin openjdk: set jre attribute. ... Fixes tarball Signed-off-by: Shea Levy <shea@shealevy.com>	2014-01-15 01:06:04 -05:00
Shea Levy	c592992b14	Fix tarball	2012-10-04 19:53:10 -04:00
Eelco Dolstra	c556a6ea46	* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless ... function, so obsolete it. svn path=/nixpkgs/branches/stdenv-updates/; revision=31644	2012-01-18 20:16:00 +00:00
Rob Vermaas	82447aa73e	added openjdk for darwin (binaries) for testing ... svn path=/nixpkgs/trunk/; revision=17596	2009-10-02 12:12:23 +00:00