Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-07-25 12:47:13 +00:00
parent 1f04b4a566 e725c927d4
commit f222d98746
261 changed files with 7674 additions and 1000924 deletions
--- a/pkgs/servers/sql/mysql/5.5.x.nix
+++ b/pkgs/servers/sql/mysql/5.5.x.nix
@@ -5,11 +5,11 @@

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

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

  patches = if stdenv.isCygwin then [