about summary refs log tree commit diff
diff options
context:
space:
mode:
authordanbst <abcz2.uprola@gmail.com>2016-09-08 08:47:04 +0000
committerBjørn Forsman <bjorn.forsman@gmail.com>2016-09-09 18:29:12 +0200
commita01d4ee3f409970f01e8f8c357319dd77132a925 (patch)
tree63110bd2974bfbf9d0df018b9da63b1985e87a3e
parent8511ddc89a7a5e1ca3de43e4f7d089d163625056 (diff)
downloadnixlib-a01d4ee3f409970f01e8f8c357319dd77132a925.tar
nixlib-a01d4ee3f409970f01e8f8c357319dd77132a925.tar.gz
nixlib-a01d4ee3f409970f01e8f8c357319dd77132a925.tar.bz2
nixlib-a01d4ee3f409970f01e8f8c357319dd77132a925.tar.lz
nixlib-a01d4ee3f409970f01e8f8c357319dd77132a925.tar.xz
nixlib-a01d4ee3f409970f01e8f8c357319dd77132a925.tar.zst
nixlib-a01d4ee3f409970f01e8f8c357319dd77132a925.zip
tomcat: add danbst as maintainer
-rw-r--r--lib/maintainers.nix1
-rw-r--r--nixos/modules/services/web-servers/tomcat.nix4
-rw-r--r--pkgs/servers/http/tomcat/default.nix8
3 files changed, 10 insertions, 3 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 006a5d36b67e..0e5740a6c325 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -99,6 +99,7 @@
   cwoac = "Oliver Matthews <oliver@codersoffortune.net>";
   DamienCassou = "Damien Cassou <damien@cassou.me>";
   dasuxullebt = "Christoph-Simon Senjak <christoph.senjak@googlemail.com>";
+  danbst = "Danylo Hlynskyi <abcz2.uprola@gmail.com>";
   davidak = "David Kleuker <post@davidak.de>";
   davidrusu = "David Rusu <davidrusu.me@gmail.com>";
   dbohdan = "Danyil Bohdan <danyil.bohdan@gmail.com>";
diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix
index acaa66c0d39f..cbd7f7fee99b 100644
--- a/nixos/modules/services/web-servers/tomcat.nix
+++ b/nixos/modules/services/web-servers/tomcat.nix
@@ -10,6 +10,10 @@ in
 
 {
 
+  meta = {
+    maintainers = with maintainers; [ danbst ];
+  };
+
   ###### interface
 
   options = {
diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 58272776b3d8..35ac3623e312 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, lib, fetchurl }:
 
 let
 
@@ -21,9 +21,11 @@ let
       '';
     
     meta = {
-      homepage = http://tomcat.apache.org/;
+      homepage = https://tomcat.apache.org/;
       description = "An implementation of the Java Servlet and JavaServer Pages technologies";
-      platforms = with stdenv.lib.platforms; all;
+      platforms = with lib.platforms; all;
+      maintainers = with lib.maintainers; [ danbst ];
+      license = [ lib.licenses.asl20 ];
     };
   });