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

..

acl2

…

angelscript

Update Angelscript

2014-08-03 22:29:41 +04:00

clisp

…

clojure

Clojure: bump to 1.6.0.

2014-06-10 11:46:05 +02:00

dart

…

elixir

elixir: Bump to 1.13.3.

2014-06-06 11:57:54 +02:00

erlang

erlang: Fix name attribute

2014-07-30 12:39:35 +02:00

falcon

…

groovy

…

guile

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

io

…

j

…

jruby

…

kona

…

love

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

lua-4

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

lua-5

Revert "use wrapper to set LUA_PATH variable"

2014-07-29 18:42:20 +02:00

luajit

luajit: support Darwin builds

2014-05-10 13:50:49 +03:00

lush

…

maude

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

octave

Updating octave to 3.8.1

2014-07-31 10:11:18 +02:00

perl

Merge remote-tracking branch 'origin/master' into staging

2014-07-01 11:25:41 +02:00

php

php-5.3: fix build with freetype-2.5 (by Gentoo patch)

2014-07-03 18:20:46 +02:00

picolisp

…

pure

…

pypy/2.3

pypy: correctly bump the version

2014-06-19 18:16:43 +02:00

pyrex

…

python

python.isPyXY markers

2014-07-10 16:40:35 +02:00

racket

Update racket to 6.0.1

2014-06-02 19:42:15 +02:00

rakudo

Add Rakudo Star (closes #2054)

2014-06-10 18:12:33 -05:00

rascal

…

regina

…

renpy

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

ruby

…

scheme48

…

scsh

…

spidermonkey

Merge #1187 into p/stdenv

2014-05-29 22:16:07 +02:00

supercollider

Revert "Remove obsolete jackaudio version 1."

2014-07-31 12:52:29 +02:00

tcl

…

xulrunner

firefox: Build without xulrunner

2014-07-23 17:28:36 +02:00