summary refs log tree commit diff
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-03-31 15:49:18 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-03-31 16:17:55 -0700
commitb74833bc20109bbba932fef7608bcaca111bad7f (patch)
treedc4a5d9b69ebb42985c172d598d35476521074fc
parent5f231e7f08af1c813cede9ef4691c77dce82e140 (diff)
downloadnixlib-b74833bc20109bbba932fef7608bcaca111bad7f.tar
nixlib-b74833bc20109bbba932fef7608bcaca111bad7f.tar.gz
nixlib-b74833bc20109bbba932fef7608bcaca111bad7f.tar.bz2
nixlib-b74833bc20109bbba932fef7608bcaca111bad7f.tar.lz
nixlib-b74833bc20109bbba932fef7608bcaca111bad7f.tar.xz
nixlib-b74833bc20109bbba932fef7608bcaca111bad7f.tar.zst
nixlib-b74833bc20109bbba932fef7608bcaca111bad7f.zip
mysql55: 5.4.40 -> 5.4.42
-rw-r--r--pkgs/servers/sql/mysql/5.5.x.nix22
1 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix
index 842d38e8dc5a..d25882b826ee 100644
--- a/pkgs/servers/sql/mysql/5.5.x.nix
+++ b/pkgs/servers/sql/mysql/5.5.x.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "mysql-${version}";
-  version = "5.5.40";
+  version = "5.5.42";
 
   src = fetchurl {
-    url = "http://cdn.mysql.com/archives/mysql-5.5/${name}.tar.gz";
-    sha256 = "0q29nzmmxm78b89qjfzgm93r0glaam3xw3zfx1k8ihii39v22dsd";
+    url = "http://mysql.mirrors.pair.com/Downloads/MySQL-5.5/${name}.tar.gz";
+    sha256 = "0jn7py2wsq78rwi7vfihxs6z3h5hr338b9g46fl3z2g4ddki4yw8";
   };
 
   preConfigure = stdenv.lib.optional stdenv.isDarwin ''
@@ -27,15 +27,19 @@ stdenv.mkDerivation rec {
     "-DWITH_EMBEDDED_SERVER=yes"
     "-DWITH_ZLIB=yes"
     "-DHAVE_IPV6=yes"
-    "-DINSTALL_DOCDIR=share/doc/mysql"
-    "-DINSTALL_DOCREADMEDIR=share/doc/mysql"
-    "-DINSTALL_INCLUDEDIR=include/mysql"
-    "-DINSTALL_INFODIR=share/doc/mysql"
+    "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
+    "-DMYSQL_DATADIR=/var/lib/mysql"
+    "-DINSTALL_SYSCONFDIR=etc/mysql"
+    "-DINSTALL_INFODIR=share/mysql/docs"
     "-DINSTALL_MANDIR=share/man"
-    "-DINSTALL_MYSQLSHAREDIR=share/mysql"
-    "-DINSTALL_MYSQLPLUGINDIR=lib/mysql/plugin"
+    "-DINSTALL_PLUGINDIR=lib/mysql/plugin"
     "-DINSTALL_SCRIPTDIR=bin"
+    "-DINSTALL_INCLUDEDIR=include/mysql"
+    "-DINSTALL_DOCREADMEDIR=share/mysql"
     "-DINSTALL_SUPPORTFILESDIR=share/mysql"
+    "-DINSTALL_MYSQLSHAREDIR=share/mysql"
+    "-DINSTALL_DOCDIR=share/mysql/docs"
+    "-DINSTALL_SHAREDIR=share/mysql"
   ];
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";