diff options
author | Sander van der Burg <s.vanderburg@tudelft.nl> | 2009-11-11 15:52:26 +0000 |
---|---|---|
committer | Sander van der Burg <s.vanderburg@tudelft.nl> | 2009-11-11 15:52:26 +0000 |
commit | ac64ef22752f401b5aafcf8044ee28ce66efbd42 (patch) | |
tree | b73318873b70fd991c0ec17b6ca02fdeadc3d5b3 /pkgs/servers | |
parent | b325a343612e641fd29b43c2e00dac22f6bdfe69 (diff) | |
download | nixlib-ac64ef22752f401b5aafcf8044ee28ce66efbd42.tar nixlib-ac64ef22752f401b5aafcf8044ee28ce66efbd42.tar.gz nixlib-ac64ef22752f401b5aafcf8044ee28ce66efbd42.tar.bz2 nixlib-ac64ef22752f401b5aafcf8044ee28ce66efbd42.tar.lz nixlib-ac64ef22752f401b5aafcf8044ee28ce66efbd42.tar.xz nixlib-ac64ef22752f401b5aafcf8044ee28ce66efbd42.tar.zst nixlib-ac64ef22752f401b5aafcf8044ee28ce66efbd42.zip |
Upgraded JBoss to 5.1.0
svn path=/nixpkgs/trunk/; revision=18329
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/http/jboss/builder.sh | 15 | ||||
-rw-r--r-- | pkgs/servers/http/jboss/default.nix | 29 |
2 files changed, 18 insertions, 26 deletions
diff --git a/pkgs/servers/http/jboss/builder.sh b/pkgs/servers/http/jboss/builder.sh deleted file mode 100644 index 335620009197..000000000000 --- a/pkgs/servers/http/jboss/builder.sh +++ /dev/null @@ -1,15 +0,0 @@ -buildInputs="$jdk5" -source $stdenv/setup - -export JDK_HOME=$jdk5 -export JAVA_HOME=$jdk5 - -tar xfvz $src -cd jboss-* -cd build -sh build.sh -ensureDir $out -cp -av output/jboss-*/* $out - -# Insert JAVA_HOME variable to make sure the latest JRE is used and not version 5 -sed -i -e "/GREP/aJAVA_HOME=$jdk" $out/bin/run.sh diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix index 279e4bfae71c..41eff4cf967f 100644 --- a/pkgs/servers/http/jboss/default.nix +++ b/pkgs/servers/http/jboss/default.nix @@ -1,20 +1,27 @@ -{ stdenv, fetchurl, jdk5, jdk }: +{ stdenv, fetchurl, unzip, jdk, lib }: stdenv.mkDerivation { - name = "jboss-4.2.2.GA"; - - builder = ./builder.sh; - src = - fetchurl { - url = http://garr.dl.sourceforge.net/sourceforge/jboss/jboss-4.2.2.GA-src.tar.gz; - md5 = "2a626cdccabe712628555676d67ad44a"; - }; - - inherit jdk5 jdk; + name = "jboss-5.1.0.GA"; + src = fetchurl { + url = mirror://sourceforge/jboss/jboss-5.1.0.GA-jdk6.zip; + sha256 = "0wy5666h554x1qq4w0rzg3krp4rqrijq0ql7dkx6qgl3vpj9xr5y"; + }; + buildInputs = [ unzip ]; + + buildPhase = '' + sed -i -e "/GREP/aJAVA_HOME=${jdk}" bin/run.sh + ''; + + installPhase = '' + ensureDir $out + cp -av * $out + ''; + meta = { homepage = "http://www.jboss.org/"; description = "JBoss, Open Source J2EE application server"; license = "GPL/LGPL"; + maintainers = [ lib.maintainers.sander ]; }; } |