Arseniy Seroka 0c7a0f31f9 Merge pull request #4810 from vbgl/merlin ...

merlin: update from 1.7.1 to 2.0

2014-11-03 20:04:10 +03:00

..

applications

emacs24Macport: allow installing either 24.3 or 24.4

2014-11-03 10:51:29 -06:00

build-support

nix-prefetch-git: fix determinism with leaveDotGit

2014-11-02 13:15:33 +01:00

data

…

desktops

Merge pull request #4627 from abbradar/xfce-mixer

2014-10-31 15:08:42 +01:00

development

Merge pull request #4810 from vbgl/merlin

2014-11-03 20:04:10 +03:00

games

Update Stunt Rally

2014-11-03 16:54:39 +03:00

misc

Update Wine-unstable

2014-11-02 23:51:58 +03:00

os-specific

syslinux: update from 6.02 to 6.03

2014-11-03 12:58:07 +02:00

servers

Update Apache Jena

2014-11-02 23:51:59 +03:00

shells

zsh: update from 5.0.6 to 5.0.7

2014-10-09 09:43:33 +02:00

stdenv

Eliminate some optionals/optionalAttrs calls on the hot path

2014-10-05 01:59:24 +02:00

test

…

tools

Update monit

2014-11-03 16:54:38 +03:00

top-level

Merge pull request #4808 from henrytill/opam

2014-11-03 20:01:06 +03:00