Merge remote-tracking branch 'upstream/master' into x-updates

Conflicts:
	pkgs/misc/emulators/wine/default.nix
This commit is contained in:
Michael Raskin
2013-06-10 10:04:46 +04:00
36 changed files with 496 additions and 91 deletions

View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hlint";
version = "1.8.45";
sha256 = "14j77bjmdsxz5z0ka6mhnr2j29kpr5a39kbdq8ziga668wihdrz9";
version = "1.8.46";
sha256 = "0mq25xv0lmxfp9099pj7akmmw5pi0adq2w286wb4lpli82v8nfzf";
isLibrary = true;
isExecutable = true;
buildDepends = [