Merge branch 'master' into staging

... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00
parent 21df05d1ad 8fbdb40ef0
commit 81039713fa
239 changed files with 14833 additions and 1959 deletions
@@ -5,11 +5,11 @@

 stdenv.mkDerivation rec {
  name = "mysql-${version}";
-  version = "5.5.48";
+  version = "5.5.49";

  src = fetchurl {
    url = "mirror://mysql/MySQL-5.5/${name}.tar.gz";
-    sha256 = "10fpzvf6hxvqgaq8paiz8fvhcbbs4qnzqw0svq40bvlyhx2qfgyc";
+    sha256 = "07wy1qbxf3fxgi04v6cqs4ymi9hgsgabk218bxiwlsx706ds976d";
  };

  patches = if stdenv.isCygwin then [