From c9147f2880727e38695f1843e5175132eb90f5de Mon Sep 17 00:00:00 2001 From: arcayr Date: Wed, 10 Jun 2026 11:31:40 +1000 Subject: [PATCH 1/2] maintainers: add arcayr (cherry picked from commit 5d18c5f6ab73d6a4f6852745e41ef74c088ea459) --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3e997fda83f5..fe9eb3d367a9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2124,6 +2124,12 @@ githubId = 56009; name = "Arcadio Rubio García"; }; + arcayr = { + email = "nixpkgs@arcayr.online"; + github = "arcayr"; + githubId = 11192354; + name = "Elliot Speck"; + }; archer-65 = { email = "mario.liguori.056@gmail.com"; github = "archer-65"; From a707b724ad286e901f9fa48e9f975c7b2b5f519d Mon Sep 17 00:00:00 2001 From: arcayr Date: Wed, 10 Jun 2026 11:32:25 +1000 Subject: [PATCH 2/2] apacheHttpd: 2.4.67 -> 2.4.68 (cherry picked from commit 8bae9e015bc75289968a93d039efd5099a214240) --- pkgs/servers/http/apache-httpd/2.4.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 81d4ea6199d5..0fbc54e192ac 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { pname = "apache-httpd"; - version = "2.4.67"; + version = "2.4.68"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - hash = "sha256-Zs0gZjew1cRG+n2r51/gNSXaj7VYVYdsRiiM2IsTaqQ="; + hash = "sha256-aMdNTfOMJr7U372487rx61MvOHI1e+zBu6XRNva2PAY="; }; patches = [ @@ -164,6 +164,6 @@ stdenv.mkDerivation rec { homepage = "https://httpd.apache.org/"; license = lib.licenses.asl20; platforms = lib.platforms.linux ++ lib.platforms.darwin; - maintainers = [ ]; + maintainers = with lib.maintainers; [ arcayr ]; }; }