diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-20 12:00:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-20 12:00:53 +0000 |
| commit | 176c80219db0befaadf84838560f59f088f49646 (patch) | |
| tree | b1681ed74bf3ae07c5aaf7038547b70ee9de1697 /pkgs/development/tools | |
| parent | d6f7a57f9fb974b3ea47cc8bec0db98de6f3ecec (diff) | |
| parent | 6b25f0686e4ecd27d76cda06103453c5b875ddd4 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/continuous-integration/jenkins/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/hydra/unstable.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 3b43f32c711ae..0298fe20055a3 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { homepage = "https://jenkins.io/"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; - maintainers = with maintainers; [ coconnor earldouglas nequissimus ajs124 ]; + maintainers = with maintainers; [ coconnor earldouglas nequissimus ] ++ teams.helsinki-systems.members; changelog = "https://www.jenkins.io/changelog-stable/#v${version}"; mainProgram = "jenkins-cli"; platforms = platforms.all; diff --git a/pkgs/development/tools/misc/hydra/unstable.nix b/pkgs/development/tools/misc/hydra/unstable.nix index 8ee7c7f6fb929..2ded3b9a66c98 100644 --- a/pkgs/development/tools/misc/hydra/unstable.nix +++ b/pkgs/development/tools/misc/hydra/unstable.nix @@ -260,6 +260,6 @@ stdenv.mkDerivation rec { homepage = "https://nixos.org/hydra"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ lheckemann mindavi das_j ]; + maintainers = with maintainers; [ lheckemann mindavi ] ++ teams.helsinki-systems.members; }; } |