Bas van Dijk 6fa969839a Merge branch 'master' of https://github.com/NixOS/nixpkgs into update ...

Conflicts:
	pkgs/development/libraries/haskell/text-binary/default.nix
	pkgs/top-level/haskell-defaults.nix
	pkgs/top-level/haskell-packages.nix

2014-12-05 07:54:48 +01:00

..

applications

haskell-git-annex: Add maintainer, was removed by mistake.

2014-12-04 21:49:15 +01:00

build-support

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

2014-12-05 07:54:48 +01:00

data

tzdata: Update to 2014j

2014-11-25 00:42:22 +01:00

desktops

KDE4: fix kdepim build

2014-12-04 10:22:27 +02:00

development

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

2014-12-05 07:54:48 +01:00

games

tibia: update to 10.64

2014-12-04 13:44:30 +00:00

misc

xlockmore: update from 5.44 to 5.45

2014-12-03 17:32:58 +01:00

os-specific

x86info: ignore warnings

2014-12-03 22:22:30 +01:00

servers

mpd: update from 0.19.4 to 0.19.5

2014-12-03 16:56:44 +00:00

shells

…

stdenv

Merge branch 'master' into staging

2014-11-14 14:28:23 +01:00

test

…

tools

logstalgia: fix build with new glm version

2014-12-04 14:31:28 +01:00

top-level

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

2014-12-05 07:54:48 +01:00