Merge branch 'master' into staging

Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix

pkgs/applications/science/math/perseus/default.nix

@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, unzip, gcc48 }:
+{ stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation {
   name = "perseus-4-beta";
   version = "4-beta";
-  buildInputs = [unzip gcc48];
+  buildInputs = [ unzip ];
 
   hardeningDisable = [ "stackprotector" ];
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   sourceRoot = ".";
 
   buildPhase = ''
-    g++ Pers.cpp -O3 -o perseus
+    g++ Pers.cpp -O3 -fpermissive -o perseus
   '';
 
   installPhase = ''