5 commits

Author	SHA1	Message	Date
Yury G. Kudryashov	84c0185038	svn merge ^/nixpkgs/trunk, one simple conflict in jruby ... svn path=/nixpkgs/branches/stdenv-updates/; revision=31721	2012-01-19 21:31:51 +00:00
Peter Simons	3eca1b395f	jruby: upgraded to latest version, fixed java dependency ... svn path=/nixpkgs/trunk/; revision=31648	2012-01-18 20:32:20 +00: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
Eelco Dolstra	6609710409	* Get rid of many instances of "args: with args;", and other coding ... guidelines violations. * Updated libsamplerate to 0.1.7. svn path=/nixpkgs/trunk/; revision=22782	2010-07-28 11:55:54 +00:00
Marc Weber	3fa07803c6	adding jruby-1.1.6 cause the one shipping with netbeans can't get uid. ... svn path=/nixpkgs/trunk/; revision=16060	2009-06-26 16:52:58 +00:00