Upgrades of postgresql, jetty, and ant to the latest versions.
svn path=/nixpkgs/trunk/; revision=3122
This commit is contained in:
parent
977f5183dd
commit
e3a47a07ed
@ -1,12 +1,12 @@
|
|||||||
{stdenv, fetchurl}:
|
{stdenv, fetchurl}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "core-apache-ant-1.6.2";
|
name = "core-apache-ant-1.6.4";
|
||||||
realname = "apache-ant-1.6.2";
|
realname = "apache-ant-1.6.4";
|
||||||
|
|
||||||
builder = ./core-builder.sh;
|
builder = ./core-builder.sh;
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://catamaran.labs.cs.uu.nl/dist/tarballs/apache-ant-1.6.2-bin.tar.bz2;
|
url = http://apache.surfnet.nl/ant/binaries/apache-ant-1.6.4-bin.tar.bz2;
|
||||||
md5 = "a568c7271c3f168771c0313926d060fa";
|
md5 = "2dd6f927cfe3cbac0970816396b7ad4e";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -2,6 +2,6 @@ set -e
|
|||||||
|
|
||||||
. $stdenv/setup
|
. $stdenv/setup
|
||||||
|
|
||||||
tar zxf $src
|
unzip $src
|
||||||
mkdir $out
|
mkdir $out
|
||||||
mv jetty*/* $out
|
mv jetty*/* $out
|
||||||
|
@ -1,12 +1,13 @@
|
|||||||
{stdenv, fetchurl}:
|
{stdenv, fetchurl, unzip}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "jetty-4.2.22";
|
name = "jetty-5.1.3";
|
||||||
|
|
||||||
builder = ./bin-builder.sh;
|
builder = ./bin-builder.sh;
|
||||||
|
buildInputs = [unzip];
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://catamaran.labs.cs.uu.nl/dist/tarballs/jetty-4.2.22.tar.gz;
|
url = http://puzzle.dl.sourceforge.net/sourceforge/jetty/jetty-5.1.3.zip;
|
||||||
md5 = "e89c582d1846cd7d31e402abaf801e17";
|
md5 = "24d1d3163795a7e2390c9e711c919180";
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -6,12 +6,12 @@ assert readline != null;
|
|||||||
assert jdbcSupport -> ant != null;
|
assert jdbcSupport -> ant != null;
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "postgresql-7.4.5";
|
name = "postgresql-8.0.3";
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://catamaran.labs.cs.uu.nl/dist/tarballs/postgresql-7.4.5.tar.bz2;
|
url = ftp://ftp2.nl.postgresql.org/mirror/postgresql/source/v8.0.3/postgresql-8.0.3.tar.bz2;
|
||||||
md5 = "97e750c8e69c208b75b6efedc5a36efb";
|
md5 = "c0914a133ce6c1e0f1d8b93982d6e881";
|
||||||
};
|
};
|
||||||
|
|
||||||
inherit readline jdbcSupport;
|
inherit readline jdbcSupport;
|
||||||
|
@ -968,7 +968,7 @@ rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
jetty = (import ../servers/http/jetty) {
|
jetty = (import ../servers/http/jetty) {
|
||||||
inherit fetchurl stdenv;
|
inherit fetchurl stdenv unzip;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user