git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #50805 from r-ryantm/auto-update/axis2

axis2: 1.6.4 -> 1.7.9

commit5f01a2586ac97889fe45979af5a700bf6972f265 authorSander van der Burg <svanderburg@gmail.com> dateSun 11 Aug 2019, 12:15 (7 years ago) parentfba7d8e3633b32
2 files changed+11−4
pkgs/servers/http/tomcat/axis2/default.nix+2−2 pkgs/tools/package-management/disnix/DisnixWebService/default.nix+9−2
pkgs/servers/http/tomcat/axis2/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 name = "axis2-${version}";
5− version = "1.6.4";
5+ version = "1.7.9";
66
77 src = fetchurl {
88 url = "http://apache.proserve.nl/axis/axis2/java/core/${version}/${name}-bin.zip";
9− sha256 = "12ir706dn95567j6lkxdwrh28vnp6292h59qwjyqjm7ckglkmgyr";
9+ sha256 = "0dh0s9bfh95wmmw8nyf2yw95biq7d9zmrbg8k4vzcyz1if228lac";
1010 };
1111
1212 buildInputs = [ unzip apacheAnt jdk ];
pkgs/tools/package-management/disnix/DisnixWebService/default.nix+9−2
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java}:
1+{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java, fetchpatch }:
22
33stdenv.mkDerivation {
44 name = "DisnixWebService-0.8";
@@ -11,7 +11,14 @@ stdenv.mkDerivation {
1111 AXIS2_LIB = "${axis2}/lib";
1212 AXIS2_WEBAPP = "${axis2}/webapps/axis2";
1313 DBUS_JAVA_LIB = "${dbus_java}/share/java";
14− patchPhase = ''
14+ patches = [
15+ # Safe to remove once https://github.com/svanderburg/DisnixWebService/pull/1 is merged
16+ (fetchpatch {
17+ url = "https://github.com/mmahut/DisnixWebService/commit/cf07918b8c81b4ce01e0b489c1b5a3ef9c9a1cd6.patch";
18+ sha256 = "15zi1l69wzgwvvqx4492s7l444gfvc9vcm7ckgif4b6cvp837brn";
19+ })
20+ ];
21+ prePatch = ''
1522 sed -i -e "s|#JAVA_HOME=|JAVA_HOME=${jdk}|" \
1623 -e "s|#AXIS2_LIB=|AXIS2_LIB=${axis2}/lib|" \
1724 scripts/disnix-soap-client