Russell O'Connor 3feac4fd86 Merge branch 'master' of github.com:NixOS/nixpkgs

2015-02-05 15:21:54 -05:00

..

applications

Merge pull request #6158 from bdimcheff/upgrade-musicmanager

2015-02-05 18:42:22 +03:00

build-support

build-fhs-*: prefer local build

2015-02-05 20:39:01 +03:00

data

zeal: new package

2015-01-28 00:02:50 +01:00

desktops

e19: updates (close #6003)

2015-02-04 22:20:31 +01:00

development

Merge branch 'master' of github.com:NixOS/nixpkgs

2015-02-05 15:21:54 -05:00

games

Merge pull request #6177 from abbradar/fhs-userenv

2015-02-05 21:57:54 +03:00

misc

vim-plugins: add xkb-switch

2015-02-04 00:17:08 +03:00

os-specific

pcmcia-utils: update to 017

2015-02-05 17:13:05 +03:00

servers

Merge pull request #5277 from abbradar/uwsgi

2015-02-05 17:10:37 +03:00

shells

Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'

2015-02-02 21:14:28 -05:00

stdenv

move libcxx[abi] into llvm tree

2015-02-03 14:58:10 -08:00

test

…

tools

i2pd: update url

2015-02-05 20:23:22 +01:00

top-level

Merge branch 'master' of github.com:NixOS/nixpkgs

2015-02-05 15:21:54 -05:00