1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs synced 2024-10-22 18:45:53 -04:00
nixpkgs/pkgs/development/interpreters
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
..
acl2 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
angelscript * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
clisp
clojure * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
erlang
falcon
groovy * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
guile svn merge ^/nixpkgs/trunk 2012-02-06 23:03:12 +00:00
io
j * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
jruby svn merge ^/nixpkgs/trunk, one simple conflict in jruby 2012-01-19 21:31:51 +00:00
kaffe
kona * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
love
lua-4
lua-5 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
maude * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
octave
perl * Fix building Perl on FreeBSD. Its configure script was looking for 2012-01-20 16:42:16 +00:00
php
php-xdebug * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
picolisp * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
plt-scheme
pure pure 0.49 (compiles again with latest llvm) 2011-12-05 09:38:59 +00:00
pyrex
python * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
r-lang
racket Racket version 5.2.1 2012-02-02 22:41:21 +00:00
regina
ruby Add autotest-rails gem 2012-02-04 15:04:04 +00:00
scsh
spidermonkey * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00
sys-perl
tcl
toolbus