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/development/tools/parsing/re2c/default.nix

@@ -1,14 +1,20 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "re2c-${version}";
-  version = "0.14.3";
+  version = "0.16";
 
-  src = fetchurl {
-    url    = "mirror://sourceforge/re2c/re2c/${version}/${name}.tar.gz";
-    sha256 = "113yj5h38isfsjigqvb2j3ammfmxckgwyxmm0h4fyflzb7ghcs0w";
+  sourceRoot = "${name}-src/re2c";
+
+  src = fetchFromGitHub {
+    owner = "skvadrik";
+    repo = "re2c";
+    rev = version;
+    sha256 = "0cijgmbyx34nwl2jmsswggkgvzy364871rkbxz8biq9x8xrhhjw5";
   };
 
+  nativeBuildInputs = [ autoreconfHook ];
+
   meta = {
     description = "Tool for writing very fast and very flexible scanners";
     homepage    = "http://re2c.org";