diff options
| author | Anthony Roussel <anthony@roussel.dev> | 2023-11-29 07:53:17 +0100 |
|---|---|---|
| committer | Anthony Roussel <anthony@roussel.dev> | 2023-11-29 07:53:17 +0100 |
| commit | d525015c8e8649fa0cddf9249c99a27b041b6b66 (patch) | |
| tree | 9194eb58dd16e57b3d33996663d76b2c8d99c800 /pkgs/servers/http | |
| parent | e24c29c9cc13f0df11ba3d924aa99750800bcde6 (diff) | |
| download | nixlib-d525015c8e8649fa0cddf9249c99a27b041b6b66.tar nixlib-d525015c8e8649fa0cddf9249c99a27b041b6b66.tar.gz nixlib-d525015c8e8649fa0cddf9249c99a27b041b6b66.tar.bz2 nixlib-d525015c8e8649fa0cddf9249c99a27b041b6b66.tar.lz nixlib-d525015c8e8649fa0cddf9249c99a27b041b6b66.tar.xz nixlib-d525015c8e8649fa0cddf9249c99a27b041b6b66.tar.zst nixlib-d525015c8e8649fa0cddf9249c99a27b041b6b66.zip | |
tomcat: refactor
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/tomcat/default.nix | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index e6e8bf440318..996e0d03f77a 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -1,13 +1,12 @@ { stdenv, lib, fetchurl, nixosTests, testers, jre }: let - - common = { versionMajor, versionMinor, hash }: stdenv.mkDerivation (finalAttrs: { + common = { version, hash }: stdenv.mkDerivation (finalAttrs: { pname = "apache-tomcat"; - version = "${versionMajor}.${versionMinor}"; + inherit version; src = fetchurl { - url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${finalAttrs.version}/bin/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; + url = "mirror://apache/tomcat/tomcat-${lib.versions.major version}/v${version}/bin/apache-tomcat-${version}.tar.gz"; inherit hash; }; @@ -40,14 +39,12 @@ let in { tomcat9 = common { - versionMajor = "9"; - versionMinor = "0.83"; - hash = "hash-dgktroncHzrm3RFATWSFJ2GkAfGM03PJO1/37yzk+Qo="; + version = "9.0.83"; + hash = "sha256-dgktroncHzrm3RFATWSFJ2GkAfGM03PJO1/37yzk+Qo="; }; tomcat10 = common { - versionMajor = "10"; - versionMinor = "1.16"; - hash = "hash-QysLmKN3RQ8TuaR7gup9947QvPLuS3WRgrTH/cH+WEE="; + version = "10.1.16"; + hash = "sha256-QysLmKN3RQ8TuaR7gup9947QvPLuS3WRgrTH/cH+WEE="; }; } |