From f1ae49c01b7ee68a987b42a6198c05595a2aeda1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Jan 2005 19:25:57 +0000 Subject: [PATCH] * Added MySQL 4.1.9. svn path=/nixpkgs/trunk/; revision=2082 --- pkgs/servers/sql/mysql/default.nix | 15 +++++++++++++++ pkgs/system/all-packages-generic.nix | 7 +++---- 2 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 pkgs/servers/sql/mysql/default.nix diff --git a/pkgs/servers/sql/mysql/default.nix b/pkgs/servers/sql/mysql/default.nix new file mode 100644 index 000000000000..40d9500d1fb7 --- /dev/null +++ b/pkgs/servers/sql/mysql/default.nix @@ -0,0 +1,15 @@ +{stdenv, fetchurl, ps, ncurses, zlib ? null, perl}: + +# Note: zlib is not required; MySQL can use an internal zlib. + +stdenv.mkDerivation { + name = "mysql-4.1.9"; +# builder = ./builder.sh; + + src = fetchurl { + url = http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.1/mysql-4.1.9.tar.gz; + md5 = "7bc44befe155d619c4e4705f68874278"; + }; + + buildInputs = [ps ncurses zlib perl]; +} diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index b71a304a1014..87171f1943dd 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -739,11 +739,10 @@ rec { ant = apacheAntBlackdown14; }; - /* - mysql = (import ../servers/sql/mysql) { - inherit fetchurl stdenv; + mysql = import ../servers/sql/mysql { + inherit fetchurl stdenv ncurses zlib perl; + ps = procps; /* !!! Linux only */ }; - */ jetty = (import ../servers/http/jetty) { inherit fetchurl stdenv;