From fca3859da85d73c59f374a64eac6a0e0da1f2761 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Mon, 24 Jan 2011 15:27:07 +0000 Subject: [PATCH] Update urweb to latest released version. svn path=/nixpkgs/trunk/; revision=25680 --- pkgs/development/compilers/urweb/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 8f2a33fa5ae..5b5d9682c49 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, file, libmhash, mlton, mysql, postgresql, sqlite }: +{ stdenv, fetchurl, file, openssl, mlton, mysql, postgresql, sqlite }: stdenv.mkDerivation rec { pname = "urweb"; - version = "20101102"; + version = "20110123"; name = "${pname}-${version}"; src = fetchurl { url = "http://www.impredicative.com/ur/${name}.tgz"; - sha256 = "1x661z6hg8gb7v1n580kdij9mr6vv3psm28zr4mmipj2kqh66gfi"; + sha256 = "00k3ghv115fn8xm99dbc6jygl0g3j6fwc84mgcg76nnim3rvgb8r"; }; - buildInputs = [ stdenv.gcc file libmhash mlton mysql postgresql sqlite ]; + buildInputs = [ stdenv.gcc file openssl mlton mysql postgresql sqlite ]; patches = [ ./remove-header-include-directory-prefix.patch ]; @@ -21,9 +21,11 @@ stdenv.mkDerivation rec { preConfigure = '' - export GCCARGS="-I${mysql}/include/mysql -I${postgresql}/include -I${sqlite}/include -L${libmhash}/lib -L${mysql}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib" + export GCCARGS="-I${mysql}/include/mysql -I${postgresql}/include -I${sqlite}/include -L${mysql}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib" ''; + configureFlags = "--with-openssl=${openssl}"; + dontDisableStatic = true; meta = {