aboutsummaryrefslogtreecommitdiff
path: root/pkgs/tools/package-management
diff options
context:
space:
mode:
authorSander van der Burg <svanderburg@gmail.com>2019-09-09 23:26:03 +0200
committerSander van der Burg <svanderburg@gmail.com>2019-09-09 23:26:03 +0200
commite0af0be6e6a0db9419935b79aec274e9c2237c82 (patch)
tree1163c3b06ceb73561bd762f6971e90413721d438 /pkgs/tools/package-management
parent67879a7f0d9dc587be2ac9e033c21a8b3fa0e46f (diff)
DisnixWebService: 0.8 -> 0.9
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r--pkgs/tools/package-management/disnix/DisnixWebService/default.nix15
1 files changed, 4 insertions, 11 deletions
diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
index 3299ab8b63b..dd64241fd37 100644
--- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
+++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
@@ -1,23 +1,16 @@
-{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java, fetchpatch }:
+{stdenv, fetchurl, apacheAnt, jdk, axis2, dbus_java }:
stdenv.mkDerivation {
- name = "DisnixWebService-0.8";
+ name = "DisnixWebService-0.9";
src = fetchurl {
- url = https://github.com/svanderburg/DisnixWebService/files/1756703/DisnixWebService-0.8.tar.gz;
- sha256 = "05hmyz17rmqlph0i321kmhabnpw84kqz32lgc5cd4shxyzsal9hz";
+ url = https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.9/DisnixWebService-0.9.tar.gz;
+ sha256 = "1z7w44bf023c0aqchjfi4mla3qbhsh87mdzx7pqn0sy74cjfgqvl";
};
buildInputs = [ apacheAnt jdk ];
PREFIX = ''''${env.out}'';
AXIS2_LIB = "${axis2}/lib";
AXIS2_WEBAPP = "${axis2}/webapps/axis2";
DBUS_JAVA_LIB = "${dbus_java}/share/java";
- 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}|" \
-e "s|#AXIS2_LIB=|AXIS2_LIB=${axis2}/lib|" \