Erlang bump from 17.3 to 17.4 as 17.3 has a serious ssl bug
Add pycosat.
ghc-head: upgrade to 2014-12-10
mkvtoolnix: fix to find boost lib
dvdauthor: fix building against glibc 2.20

and 2 other patches from redhat
Merge pull request #5321 from teh/master

Add pycosat.
added tmsu, a tool for tagging your files
Add nix-serve
Add the Wyrd Front-End for Remind
gitlab: fix i686-linux build and module

It turns out that installing therubytracer, with dependency on old v8, even
when using source libv8 version is problematic.
(see
http://stackoverflow.com/questions/21666379/problems-installing-gitlab-on-odroid-v8-lib-not-available).

But wait, rails does not even need therubytracer, just any kind of javascript
server side execution framework like nodejs. Well just use that, as also
suggested from different internet sources (look link above), it works just
fine.
nixos/gitlab: imporove tests
nix: Update to 1.8
nix-repl: Update
profile-sync-daemon: refactor module
Merge pull request #5323 from offlinehacker/gitlab_i686_fix

gitlab: fix i686-linux build and module
broadcom_sta: fix build with kernel 3.18 (close #5315)

I couldn't find any source that looked reliable, but I guess it's better
than nothing: it's fairly simple patch that fixes the build.
http://nixos.org -> https://nixos.org

(cherry picked from commit 78bb17dd22e4da4e3810fbc78185d73bb25ea73e)
Signed-off-by: Domen Kožar <domen@dev.si>
typo

(cherry picked from commit ad4e371acf5104ecf6a309ca8f974c7147ba1843)
Signed-off-by: Domen Kožar <domen@dev.si>
Merge pull request #5324 from prikhi/add-wyrd

Add the Wyrd Front-End for Remind
Fix networkmanager resumeCommands

Small typo prevented the post resume script to restart network manager