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

Merge pull request #270847 from anthonyroussel/updates/tomcat_10_1_16

Browse Source 
tomcat10: 10.1.15 -> 10.1.16
This commit is contained in:
Mario Rodas 2023-11-30 22:38:23 -05:00 committed by GitHub
commit 15b5295311
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/web-servers/tomcat.nix
View File

@ -8,7 +8,7 @@ in
{ {
meta = { meta = {
maintainers = with lib.maintainers; [ danbst ]; maintainers = with lib.maintainers; [ danbst anthonyroussel ];
}; };
###### interface ###### interface

1
nixos/tests/tomcat.nix
View File

@ -1,5 +1,6 @@
import ./make-test-python.nix ({ pkgs, ... }: { import ./make-test-python.nix ({ pkgs, ... }: {
name = "tomcat"; name = "tomcat";
meta.maintainers = [ lib.maintainers.anthonyroussel ];
nodes.machine = { pkgs, ... }: { nodes.machine = { pkgs, ... }: {
services.tomcat = { services.tomcat = {

21
pkgs/servers/http/tomcat/default.nix
View File

@ -1,14 +1,13 @@
{ stdenv, lib, fetchurl, nixosTests, testers, jre }: { stdenv, lib, fetchurl, nixosTests, testers, jre }:
let let
common = { version, hash }: stdenv.mkDerivation (finalAttrs: {
common = { versionMajor, versionMinor, sha256 }: stdenv.mkDerivation (finalAttrs: {
pname = "apache-tomcat"; pname = "apache-tomcat";
version = "${versionMajor}.${versionMinor}"; inherit version;
src = fetchurl { 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 sha256; inherit hash;
}; };
outputs = [ "out" "webapps" ]; outputs = [ "out" "webapps" ];
@ -31,7 +30,7 @@ let
meta = with lib; { meta = with lib; {
homepage = "https://tomcat.apache.org/"; homepage = "https://tomcat.apache.org/";
description = "An implementation of the Java Servlet and JavaServer Pages technologies"; description = "An implementation of the Java Servlet and JavaServer Pages technologies";
platforms = platforms.all; platforms = jre.meta.platforms;
maintainers = with maintainers; [ anthonyroussel ]; maintainers = with maintainers; [ anthonyroussel ];
license = [ licenses.asl20 ]; license = [ licenses.asl20 ];
sourceProvenance = with sourceTypes; [ binaryBytecode ]; sourceProvenance = with sourceTypes; [ binaryBytecode ];
@ -40,14 +39,12 @@ let
in { in {
tomcat9 = common { tomcat9 = common {
versionMajor = "9"; version = "9.0.83";
versionMinor = "0.82"; hash = "sha256-dgktroncHzrm3RFATWSFJ2GkAfGM03PJO1/37yzk+Qo=";
sha256 = "sha256-xvRGXDUkYaHFYacUPg81Xf0xyTbdsc1XP/PmqMR8bQc=";
}; };
tomcat10 = common { tomcat10 = common {
versionMajor = "10"; version = "10.1.16";
versionMinor = "1.15"; hash = "sha256-QysLmKN3RQ8TuaR7gup9947QvPLuS3WRgrTH/cH+WEE=";
sha256 = "sha256-cqQW3Dc3sC/1zoidMIGDBNw4G5bnxYvhmHz7U7K6Djg=";
}; };
} }