From d7605f18a97b30416a202a6905df237f37fc7eeb Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 24 Nov 2023 11:48:43 -0300 Subject: [PATCH 1/7] nixos.shibboleth-sp: remove jammerful from meta.maintainers --- .../services/security/shibboleth-sp.nix | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/nixos/modules/services/security/shibboleth-sp.nix b/nixos/modules/services/security/shibboleth-sp.nix index e7897c3324cf..975de1efa2f2 100644 --- a/nixos/modules/services/security/shibboleth-sp.nix +++ b/nixos/modules/services/security/shibboleth-sp.nix @@ -1,44 +1,43 @@ -{pkgs, config, lib, ...}: +{ config, lib, pkgs, ... }: -with lib; let cfg = config.services.shibboleth-sp; in { options = { services.shibboleth-sp = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = lib.mdDoc "Whether to enable the shibboleth service"; }; - configFile = mkOption { - type = types.path; - example = literalExpression ''"''${pkgs.shibboleth-sp}/etc/shibboleth/shibboleth2.xml"''; + configFile = lib.mkOption { + type = lib.types.path; + example = lib.literalExpression ''"''${pkgs.shibboleth-sp}/etc/shibboleth/shibboleth2.xml"''; description = lib.mdDoc "Path to shibboleth config file"; }; - fastcgi.enable = mkOption { - type = types.bool; + fastcgi.enable = lib.mkOption { + type = lib.types.bool; default = false; description = lib.mdDoc "Whether to include the shibauthorizer and shibresponder FastCGI processes"; }; - fastcgi.shibAuthorizerPort = mkOption { - type = types.int; + fastcgi.shibAuthorizerPort = lib.mkOption { + type = lib.types.int; default = 9100; description = lib.mdDoc "Port for shibauthorizer FastCGI process to bind to"; }; - fastcgi.shibResponderPort = mkOption { - type = types.int; + fastcgi.shibResponderPort = lib.mkOption { + type = lib.types.int; default = 9101; description = lib.mdDoc "Port for shibauthorizer FastCGI process to bind to"; }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.services.shibboleth-sp = { description = "Provides SSO and federation for web applications"; after = lib.optionals cfg.fastcgi.enable [ "shibresponder.service" "shibauthorizer.service" ]; @@ -48,7 +47,7 @@ in { }; }; - systemd.services.shibresponder = mkIf cfg.fastcgi.enable { + systemd.services.shibresponder = lib.mkIf cfg.fastcgi.enable { description = "Provides SSO through Shibboleth via FastCGI"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; @@ -59,7 +58,7 @@ in { }; }; - systemd.services.shibauthorizer = mkIf cfg.fastcgi.enable { + systemd.services.shibauthorizer = lib.mkIf cfg.fastcgi.enable { description = "Provides SSO through Shibboleth via FastCGI"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; @@ -71,5 +70,5 @@ in { }; }; - meta.maintainers = with lib.maintainers; [ jammerful ]; + meta.maintainers = with lib.maintainers; [ ]; } From faf405f1144047daac734d228172281249b6b8cf Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 24 Nov 2023 11:49:22 -0300 Subject: [PATCH 2/7] log4shib: remove jammerful from meta.maintainers --- pkgs/development/libraries/log4shib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix index e204fa92bfd1..42a428b35c7e 100644 --- a/pkgs/development/libraries/log4shib/default.nix +++ b/pkgs/development/libraries/log4shib/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A forked version of log4cpp that has been created for the Shibboleth project"; - maintainers = [ maintainers.jammerful ]; + maintainers = [ ]; license = licenses.lgpl21; homepage = "http://log4cpp.sf.net"; }; From 6019cc9756b777d03bd5618e19062e7134a28a85 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 24 Nov 2023 11:49:39 -0300 Subject: [PATCH 3/7] opensaml-cpp: remove jammerful from meta.maintainers --- pkgs/development/libraries/opensaml-cpp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/development/libraries/opensaml-cpp/default.nix index 327956f8a7db..9e8ab07b3aa4 100644 --- a/pkgs/development/libraries/opensaml-cpp/default.nix +++ b/pkgs/development/libraries/opensaml-cpp/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { description = "A low-level library written in C++ that provides support for producing and consuming SAML messages"; platforms = platforms.unix; license = licenses.asl20; - maintainers = [ maintainers.jammerful ]; + maintainers = [ ]; }; } From 320582300cce46ddafbacff49491da112c41e98a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 24 Nov 2023 11:49:58 -0300 Subject: [PATCH 4/7] shibboleth-sp: remove jammerful from meta.maintainers --- pkgs/development/libraries/shibboleth-sp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix index 964d15e9546b..ba9956471310 100644 --- a/pkgs/development/libraries/shibboleth-sp/default.nix +++ b/pkgs/development/libraries/shibboleth-sp/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { description = "Enables SSO and Federation web applications written with any programming language or framework"; platforms = platforms.unix; license = licenses.asl20; - maintainers = [ maintainers.jammerful ]; + maintainers = [ ]; }; } From 21a7f6131edd9d22044185436eeadf3ca060b85c Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 24 Nov 2023 11:50:10 -0300 Subject: [PATCH 5/7] xml-tooling-c: remove jammerful from meta.maintainers --- pkgs/development/libraries/xml-tooling-c/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/development/libraries/xml-tooling-c/default.nix index b1ae52a8c77b..8a415a4df77c 100644 --- a/pkgs/development/libraries/xml-tooling-c/default.nix +++ b/pkgs/development/libraries/xml-tooling-c/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "A low-level library that provides a high level interface to XML processing for OpenSAML 2"; platforms = platforms.unix; license = licenses.asl20; - maintainers = [ maintainers.jammerful ]; + maintainers = [ ]; }; } From be36b62bea5592b30355319192b28faaad86a2ab Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 24 Nov 2023 11:50:22 -0300 Subject: [PATCH 6/7] gerrit: remove jammerful from meta.maintainers --- pkgs/applications/version-management/gerrit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index 4ec89b050931..49c5371af9a3 100644 --- a/pkgs/applications/version-management/gerrit/default.nix +++ b/pkgs/applications/version-management/gerrit/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { license = licenses.asl20; description = "A web based code review and repository management for the git version control system"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; - maintainers = with maintainers; [ flokli jammerful zimbatm ]; + maintainers = with maintainers; [ flokli zimbatm ]; platforms = platforms.unix; }; } From c933413f2f4766e09ded216430d1e66ae892a4f6 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 24 Nov 2023 12:29:42 -0300 Subject: [PATCH 7/7] maintainers: remove jammerful No contributions to GitHub since 2021-10-21. --- maintainers/maintainer-list.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b22356e713c7..d71b933aa932 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8156,12 +8156,6 @@ githubId = 1358764; name = "Jamie Magee"; }; - jammerful = { - email = "jammerful@gmail.com"; - github = "jammerful"; - githubId = 20176306; - name = "jammerful"; - }; janik = { name = "Janik"; email = "janik@aq0.de";