diff options
Diffstat (limited to 'pkgs/servers/http/tomcat')
-rw-r--r-- | pkgs/servers/http/tomcat/axis2/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/tomcat/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/http/tomcat/axis2/default.nix b/pkgs/servers/http/tomcat/axis2/default.nix index 5da89200816..59a4ab6e5b4 100644 --- a/pkgs/servers/http/tomcat/axis2/default.nix +++ b/pkgs/servers/http/tomcat/axis2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, apacheAnt, jdk, unzip }: stdenv.mkDerivation rec { - name = "axis2-${version}"; + pname = "axis2"; version = "1.7.9"; 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}/${pname}-${version}-bin.zip"; sha256 = "0dh0s9bfh95wmmw8nyf2yw95biq7d9zmrbg8k4vzcyz1if228lac"; }; diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index fded6bdfafb..38b4974e155 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -3,11 +3,11 @@ let common = { versionMajor, versionMinor, sha256 }: stdenv.mkDerivation (rec { - name = "apache-tomcat-${version}"; + pname = "apache-tomcat"; version = "${versionMajor}.${versionMinor}"; src = fetchurl { - url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${version}/bin/${name}.tar.gz"; + url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${version}/bin/${pname}-${version}.tar.gz"; inherit sha256; }; |