public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #50805 from r-ryantm/auto-update/axis2

Browse Source 
axis2: 1.6.4 -> 1.7.9
This commit is contained in:
Sander van der Burg 2019-08-11 12:15:33 +02:00 committed by GitHub
commit 5f01a2586a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/http/tomcat/axis2/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "axis2-${version}"; name = "axis2-${version}";
version = "1.6.4"; version = "1.7.9";
src = fetchurl { src = fetchurl {
url = "http://apache.proserve.nl/axis/axis2/java/core/${version}/${name}-bin.zip"; url = "http://apache.proserve.nl/axis/axis2/java/core/${version}/${name}-bin.zip";
sha256 = "12ir706dn95567j6lkxdwrh28vnp6292h59qwjyqjm7ckglkmgyr"; sha256 = "0dh0s9bfh95wmmw8nyf2yw95biq7d9zmrbg8k4vzcyz1if228lac";
}; };
buildInputs = [ unzip apacheAnt jdk ]; buildInputs = [ unzip apacheAnt jdk ];

11
pkgs/tools/package-management/disnix/DisnixWebService/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java}: {stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java, fetchpatch }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "DisnixWebService-0.8"; name = "DisnixWebService-0.8";
@ -11,7 +11,14 @@ stdenv.mkDerivation {
AXIS2_LIB = "${axis2}/lib"; AXIS2_LIB = "${axis2}/lib";
AXIS2_WEBAPP = "${axis2}/webapps/axis2"; AXIS2_WEBAPP = "${axis2}/webapps/axis2";
DBUS_JAVA_LIB = "${dbus_java}/share/java"; DBUS_JAVA_LIB = "${dbus_java}/share/java";
patchPhase = '' patches = [
# Safe to remove once https://github.com/svanderburg/DisnixWebService/pull/1 is merged
(fetchpatch {
url = "https://github.com/mmahut/DisnixWebService/commit/cf07918b8c81b4ce01e0b489c1b5a3ef9c9a1cd6.patch";
sha256 = "15zi1l69wzgwvvqx4492s7l444gfvc9vcm7ckgif4b6cvp837brn";
})
];
prePatch = ''
sed -i -e "s|#JAVA_HOME=|JAVA_HOME=${jdk}|" \ sed -i -e "s|#JAVA_HOME=|JAVA_HOME=${jdk}|" \
-e "s|#AXIS2_LIB=|AXIS2_LIB=${axis2}/lib|" \ -e "s|#AXIS2_LIB=|AXIS2_LIB=${axis2}/lib|" \
scripts/disnix-soap-client scripts/disnix-soap-client