From aa0ce1d98aa3447cea5ce8f2bb7434ecc89be691 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 22:12:07 +0100 Subject: [PATCH 01/23] apacheHttpdPackages.mod_ca: add passthru.updateScript --- .../http/apache-modules/mod_ca/default.nix | 32 +++++++++++++++---- 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_ca/default.nix b/pkgs/servers/http/apache-modules/mod_ca/default.nix index a357f0291ce5..06929b6024dd 100644 --- a/pkgs/servers/http/apache-modules/mod_ca/default.nix +++ b/pkgs/servers/http/apache-modules/mod_ca/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, fetchurl, pkg-config, apacheHttpd, openssl, openldap, apr, aprutil }: +{ + apacheHttpd, + apr, + aprutil, + directoryListingUpdater, + fetchurl, + lib, + openldap, + openssl, + pkg-config, + stdenv, +}: stdenv.mkDerivation rec { pname = "mod_ca"; @@ -10,24 +21,33 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ apacheHttpd openssl openldap apr aprutil ]; + + buildInputs = [ + apacheHttpd + apr + aprutil + openldap + openssl + ]; # Note that configureFlags and installFlags are inherited by # the various submodules. # - configureFlags = [ - "--with-apxs=${apacheHttpd.dev}/bin/apxs" - ]; + configureFlags = [ "--with-apxs=${apacheHttpd.dev}/bin/apxs" ]; installFlags = [ "INCLUDEDIR=${placeholder "out"}/include" "LIBEXECDIR=${placeholder "out"}/modules" ]; + passthru.updateScript = directoryListingUpdater { + url = "https://redwax.eu/dist/rs/"; + }; + meta = with lib; { description = "RedWax CA service module"; - homepage = "https://redwax.eu"; + changelog = "https://source.redwax.eu/projects/RS/repos/mod_ca/browse/ChangeLog"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ dirkx ]; From b207361921acdb2c68650cec23cf0fd6c86a1a28 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 22:13:29 +0100 Subject: [PATCH 02/23] apacheHttpdPackages.mod_ca: 0.2.2 -> 0.2.3 https://redwax.eu/dist/rs/ChangeLog-mod_ca-0.2.3 --- pkgs/servers/http/apache-modules/mod_ca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_ca/default.nix b/pkgs/servers/http/apache-modules/mod_ca/default.nix index 06929b6024dd..4eb67f02c9a0 100644 --- a/pkgs/servers/http/apache-modules/mod_ca/default.nix +++ b/pkgs/servers/http/apache-modules/mod_ca/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "mod_ca"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; - sha256 = "0gs66br3aig749rzifxn6j1rz2kps4hc4jppscly48lypgyygy8s"; + hash = "sha256-HGnhypOO0WOgRw9i9oqO4da131zAwBXOdrc9dypFjyk="; }; nativeBuildInputs = [ pkg-config ]; From b9b1badb720da902accdd6834bd56aa9a53e973a Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 22:19:10 +0100 Subject: [PATCH 03/23] apacheHttpdPackages.mod_crl: add passthru.updateScript --- .../http/apache-modules/mod_crl/default.nix | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_crl/default.nix b/pkgs/servers/http/apache-modules/mod_crl/default.nix index a8025c153e05..eb56634ced82 100644 --- a/pkgs/servers/http/apache-modules/mod_crl/default.nix +++ b/pkgs/servers/http/apache-modules/mod_crl/default.nix @@ -1,5 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: - +{ + apr, + aprutil, + directoryListingUpdater, + fetchurl, + lib, + mod_ca, + pkg-config, + stdenv, +}: stdenv.mkDerivation rec { pname = "mod_crl"; @@ -11,13 +19,23 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ mod_ca apr aprutil ]; + + buildInputs = [ + apr + aprutil + mod_ca + ]; + inherit (mod_ca) configureFlags installFlags; + passthru.updateScript = directoryListingUpdater { + url = "https://redwax.eu/dist/rs/"; + }; + meta = with lib; { description = "RedWax module for Certificate Revocation Lists"; - homepage = "https://redwax.eu"; + changelog = "https://source.redwax.eu/projects/RS/repos/mod_crl/browse/ChangeLog"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ dirkx ]; From 1efb3be4fd97cb018a8f8fa3e22854321a89b9ca Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 22:19:18 +0100 Subject: [PATCH 04/23] apacheHttpdPackages.mod_crl: 0.2.3 -> 0.2.4 https://redwax.eu/dist/rs/ChangeLog-mod_crl-0.2.4 --- pkgs/servers/http/apache-modules/mod_crl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_crl/default.nix b/pkgs/servers/http/apache-modules/mod_crl/default.nix index eb56634ced82..340bc3a962ed 100644 --- a/pkgs/servers/http/apache-modules/mod_crl/default.nix +++ b/pkgs/servers/http/apache-modules/mod_crl/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "mod_crl"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; - sha256 = "1x186kp6fr8nwg0jlv5phagxndvw4rjqfga9mkibmn6dx252p61d"; + hash = "sha256-w8YIhed9J1uo5uwhfOVe5LhNLUvFZCgUO4FrHm344Rg="; }; nativeBuildInputs = [ pkg-config ]; From 8779fda68c845d7c9e43386b64b02ebbc755972e Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 22:21:19 +0100 Subject: [PATCH 05/23] apacheHttpdPackages.mod_csr: add passthru.updateScript --- .../http/apache-modules/mod_csr/default.nix | 26 ++++++++++++++++--- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_csr/default.nix b/pkgs/servers/http/apache-modules/mod_csr/default.nix index c334939a1c53..ce3ad1b92018 100644 --- a/pkgs/servers/http/apache-modules/mod_csr/default.nix +++ b/pkgs/servers/http/apache-modules/mod_csr/default.nix @@ -1,5 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: - +{ + apr, + aprutil, + directoryListingUpdater, + fetchurl, + lib, + mod_ca, + pkg-config, + stdenv, +}: stdenv.mkDerivation rec { pname = "mod_csr"; @@ -11,13 +19,23 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ mod_ca apr aprutil ]; + + buildInputs = [ + apr + aprutil + mod_ca + ]; + inherit (mod_ca) configureFlags installFlags; + passthru.updateScript = directoryListingUpdater { + url = "https://redwax.eu/dist/rs/"; + }; + meta = with lib; { description = "RedWax CA service module to handle Certificate Signing Requests"; - homepage = "https://redwax.eu"; + changelog = "https://source.redwax.eu/projects/RS/repos/mod_csr/browse/ChangeLog"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ dirkx ]; From e52c766c4ab1bd4b51d8ef98669fdee3d1f667c2 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 22:22:05 +0100 Subject: [PATCH 06/23] apacheHttpdPackages.mod_csr: 0.2.3 -> 0.2.4 https://redwax.eu/dist/rs/ChangeLog-mod_csr-0.2.4 --- pkgs/servers/http/apache-modules/mod_csr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_csr/default.nix b/pkgs/servers/http/apache-modules/mod_csr/default.nix index ce3ad1b92018..0fb6d8d0a0ac 100644 --- a/pkgs/servers/http/apache-modules/mod_csr/default.nix +++ b/pkgs/servers/http/apache-modules/mod_csr/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "mod_csr"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; - sha256 = "1p4jc0q40453wpvwqgnr1n007b4jxpkizzy3r4jygsxxgg4x9w7x"; + hash = "sha256-JVd5N5UnAxDwq6AavEHA0HsY2TRa+9RmLLJeRZbj+4Q="; }; nativeBuildInputs = [ pkg-config ]; From 056b001496c39f94c823ec40b4a7a81c018be1f4 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 22:24:49 +0100 Subject: [PATCH 07/23] apacheHttpdPackages.mod_ocsp: add passthru.updateScript --- .../http/apache-modules/mod_ocsp/default.nix | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_ocsp/default.nix b/pkgs/servers/http/apache-modules/mod_ocsp/default.nix index 116a9822291f..3b065ac97cbf 100644 --- a/pkgs/servers/http/apache-modules/mod_ocsp/default.nix +++ b/pkgs/servers/http/apache-modules/mod_ocsp/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: +{ + apr, + aprutil, + directoryListingUpdater, + fetchurl, + lib, + mod_ca, + pkg-config, + stdenv, +}: stdenv.mkDerivation rec { pname = "mod_ocsp"; @@ -10,13 +19,23 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ mod_ca apr aprutil ]; + + buildInputs = [ + apr + aprutil + mod_ca + ]; + inherit (mod_ca) configureFlags installFlags; + passthru.updateScript = directoryListingUpdater { + url = "https://redwax.eu/dist/rs/"; + }; + meta = with lib; { description = "RedWax CA service modules of OCSP Online Certificate Validation"; - homepage = "https://redwax.eu"; + changelog = "https://source.redwax.eu/projects/RS/repos/mod_csr/browse/ChangeLog"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ dirkx ]; From 7b7a71ab01ef172028c3a834c8c8a0783f1632d0 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 22:25:34 +0100 Subject: [PATCH 08/23] apacheHttpdPackages.mod_ocsp: 0.2.2 -> 0.2.3 https://redwax.eu/dist/rs/ChangeLog-mod_ocsp-0.2.3 --- pkgs/servers/http/apache-modules/mod_ocsp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_ocsp/default.nix b/pkgs/servers/http/apache-modules/mod_ocsp/default.nix index 3b065ac97cbf..2f4b754cfc6b 100644 --- a/pkgs/servers/http/apache-modules/mod_ocsp/default.nix +++ b/pkgs/servers/http/apache-modules/mod_ocsp/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "mod_ocsp"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; - sha256 = "0wy5363m4gq1w08iny2b3sh925bnznlln88pr9lgj9vgbn8pqnrn"; + hash = "sha256-G+m/KdJCCTlSMeJzUnCRJkBEQ8cOQ+rJhA3NPrwh1Us="; }; nativeBuildInputs = [ pkg-config ]; From 65759dbf08519483c1d2a311a8fd2bc715b2a3f4 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 22:29:23 +0100 Subject: [PATCH 09/23] apacheHttpdPackages.mod_perl: add passthru.updateScript --- .../http/apache-modules/mod_perl/default.nix | 35 ++++++++++++++++--- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_perl/default.nix b/pkgs/servers/http/apache-modules/mod_perl/default.nix index 1c150b7f957b..002cfef2505f 100644 --- a/pkgs/servers/http/apache-modules/mod_perl/default.nix +++ b/pkgs/servers/http/apache-modules/mod_perl/default.nix @@ -1,4 +1,12 @@ -{ stdenv, fetchurl, apacheHttpd, perl, nixosTests }: +{ + apacheHttpd, + directoryListingUpdater, + fetchurl, + lib, + nixosTests, + perl, + stdenv, +}: stdenv.mkDerivation rec { pname = "mod_perl"; @@ -9,12 +17,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-9bghtZsP3JZw5G7Q/PMtiRHyUSYYmotowWUvkiHu4mk="; }; - buildInputs = [ apacheHttpd perl ]; + buildInputs = [ + apacheHttpd + perl + ]; + buildPhase = '' perl Makefile.PL \ MP_APXS=${apacheHttpd.dev}/bin/apxs make ''; + installPhase = '' mkdir -p $out make install DESTDIR=$out @@ -24,6 +37,20 @@ stdenv.mkDerivation rec { rm $out/nix -rf ''; - passthru.tests = nixosTests.mod_perl; - meta.mainProgram = "mp2bug"; + passthru = { + updateScript = directoryListingUpdater { + url = "https://archive.apache.org/dist/perl/"; + }; + tests = nixosTests.mod_perl; + }; + + meta = with lib; { + description = "Integration of perl with the Apache2 web server"; + homepage = "https://perl.apache.org/download/index.html"; + changelog = "https://github.com/apache/mod_perl/blob/trunk/Changes"; + license = licenses.asl20; + mainProgram = "mp2bug"; + maintainers = with maintainers; [ ]; + platforms = platforms.unix; + }; } From 08ed5d80d1e8784745415ac368e5323ccde4612d Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 22:29:28 +0100 Subject: [PATCH 10/23] apacheHttpdPackages.mod_perl: 2.0.12 -> 2.0.13 https://svn.apache.org/repos/asf/perl/modperl/tags/2_0_13/Changes --- pkgs/servers/http/apache-modules/mod_perl/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_perl/default.nix b/pkgs/servers/http/apache-modules/mod_perl/default.nix index 002cfef2505f..c0a9e11a6ce5 100644 --- a/pkgs/servers/http/apache-modules/mod_perl/default.nix +++ b/pkgs/servers/http/apache-modules/mod_perl/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "mod_perl"; - version = "2.0.12"; + version = "2.0.13"; src = fetchurl { url = "mirror://apache/perl/${pname}-${version}.tar.gz"; - sha256 = "sha256-9bghtZsP3JZw5G7Q/PMtiRHyUSYYmotowWUvkiHu4mk="; + sha256 = "sha256-reO+McRHuESIaf7N/KziWNbVh7jGx3PF8ic19w2C1to="; }; buildInputs = [ @@ -44,6 +44,8 @@ stdenv.mkDerivation rec { tests = nixosTests.mod_perl; }; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "Integration of perl with the Apache2 web server"; homepage = "https://perl.apache.org/download/index.html"; From a86463f93f528cbe9ca433319b7555865d36fffc Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 22:32:01 +0100 Subject: [PATCH 11/23] apacheHttpdPackages.mod_pkcs12: add passthru.updateScript --- .../apache-modules/mod_pkcs12/default.nix | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix b/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix index 1632ed381b0e..1a1337301a5a 100644 --- a/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix +++ b/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: +{ + apr, + aprutil, + directoryListingUpdater, + fetchurl, + lib, + mod_ca, + pkg-config, + stdenv, +}: stdenv.mkDerivation rec { pname = "mod_pkcs12"; @@ -10,13 +19,23 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ mod_ca apr aprutil ]; + + buildInputs = [ + apr + aprutil + mod_ca + ]; + inherit (mod_ca) configureFlags installFlags; + passthru.updateScript = directoryListingUpdater { + url = "https://redwax.eu/dist/rs/"; + }; + meta = with lib; { description = "RedWax CA service modules for PKCS#12 format files"; - homepage = "https://redwax.eu"; + changelog = "https://source.redwax.eu/projects/RS/repos/mod_pkcs12/browse/ChangeLog"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ dirkx ]; From 12f1b8f192d23132c3ad6f294ce614e92f2a3eb0 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 22:32:42 +0100 Subject: [PATCH 12/23] apacheHttpdPackages.mod_pkcs12: 0.2.2 -> 0.2.3 https://redwax.eu/dist/rs/ChangeLog-mod_pkcs12-0.2.3 --- pkgs/servers/http/apache-modules/mod_pkcs12/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix b/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix index 1a1337301a5a..0f8962b275c0 100644 --- a/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix +++ b/pkgs/servers/http/apache-modules/mod_pkcs12/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "mod_pkcs12"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; - sha256 = "1jfyax3qrw9rpf2n0pn6iw4dpn2nl4j0i2a998n5p1mdmjx9ch73"; + hash = "sha256-k7BZ5d0WigyTmoUyFds7UCJ/tFBiUxd5pS4cVxmAI1g="; }; nativeBuildInputs = [ pkg-config ]; From fe949d046efe36facc87b92b27201e0e27481ce8 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 22:35:49 +0100 Subject: [PATCH 13/23] apacheHttpdPackages.mod_python: add passthru.updateScript --- .../apache-modules/mod_python/default.nix | 24 +++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index cb611dfcc605..7cc8c102f593 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, apacheHttpd, python3, libintl }: +{ + apacheHttpd, + fetchFromGitHub, + lib, + libintl, + nix-update-script, + python3, + stdenv, +}: stdenv.mkDerivation rec { pname = "mod_python"; @@ -18,13 +26,21 @@ stdenv.mkDerivation rec { "BINDIR=$(out)/bin" ]; - passthru = { inherit apacheHttpd; }; + buildInputs = [ + apacheHttpd + python3 + ] ++ lib.optionals stdenv.isDarwin [ + libintl + ]; - buildInputs = [ apacheHttpd python3 ] - ++ lib.optional stdenv.isDarwin libintl; + passthru = { + inherit apacheHttpd; + updateScript = nix-update-script { }; + }; meta = with lib; { homepage = "https://modpython.org/"; + changelog = "https://github.com/grisha/mod_python/blob/${version}/NEWS"; description = "An Apache module that embeds the Python interpreter within the server"; mainProgram = "mod_python"; platforms = platforms.unix; From b0477d1e811c9f2de6870cbc763abca07124712d Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 22:36:31 +0100 Subject: [PATCH 14/23] apacheHttpdPackages.mod_python: unstable-2022-10-18 -> 3.5.0.2 https://github.com/grisha/mod_python/blob/3.5.0.2/NEWS --- pkgs/servers/http/apache-modules/mod_python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index 7cc8c102f593..8b4fcd5d94be 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { pname = "mod_python"; - version = "unstable-2022-10-18"; + version = "3.5.0.2"; src = fetchFromGitHub { owner = "grisha"; repo = pname; - rev = "d066b07564d2194839eceb535485eb1ba0c292d8"; + rev = "refs/tags/${version}"; hash = "sha256-EH8wrXqUAOFWyPKfysGeiIezgrVc789RYO4AHeSA6t4="; }; From b36e76a1ad645599a2a030a1463d9dd86cada67a Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 22:38:58 +0100 Subject: [PATCH 15/23] apacheHttpdPackages.mod_scep: add passthru.updateScript --- .../http/apache-modules/mod_scep/default.nix | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_scep/default.nix b/pkgs/servers/http/apache-modules/mod_scep/default.nix index 68aeded93d00..e2ae43d9fb72 100644 --- a/pkgs/servers/http/apache-modules/mod_scep/default.nix +++ b/pkgs/servers/http/apache-modules/mod_scep/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: +{ + apr, + aprutil, + directoryListingUpdater, + fetchurl, + lib, + mod_ca, + pkg-config, + stdenv, +}: stdenv.mkDerivation rec { pname = "mod_scep"; @@ -10,13 +19,23 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ mod_ca apr aprutil ]; + + buildInputs = [ + apr + aprutil + mod_ca + ]; + inherit (mod_ca) configureFlags installFlags; + passthru.updateScript = directoryListingUpdater { + url = "https://redwax.eu/dist/rs/"; + }; + meta = with lib; { description = "RedWax CA service modules for SCEP (Automatic ceritifcate issue/renewal)"; - homepage = "https://redwax.eu"; + changelog = "https://source.redwax.eu/projects/RS/repos/mod_scep/browse/ChangeLog"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ dirkx ]; From fc8e8f678063469683bb8600770fd70d12df7f60 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 22:39:38 +0100 Subject: [PATCH 16/23] apacheHttpdPackages.mod_scep: 0.2.3 -> 0.2.4 https://redwax.eu/dist/rs/ChangeLog-mod_scep-0.2.4 --- pkgs/servers/http/apache-modules/mod_scep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_scep/default.nix b/pkgs/servers/http/apache-modules/mod_scep/default.nix index e2ae43d9fb72..40561e41ba88 100644 --- a/pkgs/servers/http/apache-modules/mod_scep/default.nix +++ b/pkgs/servers/http/apache-modules/mod_scep/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "mod_scep"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; - sha256 = "1imddqyi81l90valvndx9r0ywn32ggijrdfrjmbx8j1abaccagrc"; + hash = "sha256-HFPQ1A3ULtT2MduIQZS1drdQvCdZqJqKpOsJLEw67sI="; }; nativeBuildInputs = [ pkg-config ]; From 02a60230366168d7a4d44ed2224733b6b3497e12 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 22:40:37 +0100 Subject: [PATCH 17/23] apacheHttpdPackages.mod_spkac: add passthru.updateScript --- .../http/apache-modules/mod_spkac/default.nix | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_spkac/default.nix b/pkgs/servers/http/apache-modules/mod_spkac/default.nix index 01ecae55b2ed..b1983d83224c 100644 --- a/pkgs/servers/http/apache-modules/mod_spkac/default.nix +++ b/pkgs/servers/http/apache-modules/mod_spkac/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: +{ + apr, + aprutil, + directoryListingUpdater, + fetchurl, + lib, + mod_ca, + pkg-config, + stdenv, +}: stdenv.mkDerivation rec { pname = "mod_spkac"; @@ -10,13 +19,23 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ mod_ca apr aprutil ]; + + buildInputs = [ + apr + aprutil + mod_ca + ]; + inherit (mod_ca) configureFlags installFlags; + passthru.updateScript = directoryListingUpdater { + url = "https://redwax.eu/dist/rs/"; + }; + meta = with lib; { description = "RedWax CA service module for handling the Netscape keygen requests. "; - homepage = "https://redwax.eu"; + changelog = "https://source.redwax.eu/projects/RS/repos/mod_spkac/browse/ChangeLog"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ dirkx ]; From c4e713b21317acdf5c372b345a788ae2e08b23b0 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 22:41:21 +0100 Subject: [PATCH 18/23] apacheHttpdPackages.mod_spkac: 0.2.2 -> 0.2.3 https://redwax.eu/dist/rs/ChangeLog-mod_spkac-0.2.3 --- pkgs/servers/http/apache-modules/mod_spkac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_spkac/default.nix b/pkgs/servers/http/apache-modules/mod_spkac/default.nix index b1983d83224c..639045d18aff 100644 --- a/pkgs/servers/http/apache-modules/mod_spkac/default.nix +++ b/pkgs/servers/http/apache-modules/mod_spkac/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "mod_spkac"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; - sha256 = "0hpr58yazbi21m0sjn22a8ns4h81s4jlab9szcdw7j9w9jdc7j0h"; + hash = "sha256-J1pGz+/AD0IPwRPBA+wt9PgV9qnZEHX66VCBGqhf0b8="; }; nativeBuildInputs = [ pkg-config ]; From d27284b103d9068c319f15e175b2fbf24144fefd Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 22:42:24 +0100 Subject: [PATCH 19/23] apacheHttpdPackages.mod_tile: add passthru.updateScript --- pkgs/servers/http/apache-modules/mod_tile/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/http/apache-modules/mod_tile/default.nix b/pkgs/servers/http/apache-modules/mod_tile/default.nix index 85ff5a97e636..0c829c1dfd8a 100644 --- a/pkgs/servers/http/apache-modules/mod_tile/default.nix +++ b/pkgs/servers/http/apache-modules/mod_tile/default.nix @@ -15,6 +15,7 @@ , iniparser , libmemcached , mapnik +, nix-update-script }: stdenv.mkDerivation rec { @@ -64,6 +65,8 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.updateScript = nix-update-script { }; + meta = with lib; { homepage = "https://github.com/openstreetmap/mod_tile"; description = "Efficiently render and serve OpenStreetMap tiles using Apache and Mapnik"; From 75d65a2b68b702d25d654471cde2326cee6effbf Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 22:43:07 +0100 Subject: [PATCH 20/23] apacheHttpdPackages.mod_tile: 0.7.0 -> 0.7.1 https://github.com/openstreetmap/mod_tile/releases/tag/v0.7.1 https://github.com/openstreetmap/mod_tile/compare/v0.7.0...v0.7.1 --- pkgs/servers/http/apache-modules/mod_tile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_tile/default.nix b/pkgs/servers/http/apache-modules/mod_tile/default.nix index 0c829c1dfd8a..f97ae6269011 100644 --- a/pkgs/servers/http/apache-modules/mod_tile/default.nix +++ b/pkgs/servers/http/apache-modules/mod_tile/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "mod_tile"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "openstreetmap"; repo = "mod_tile"; - rev = "v${version}"; - hash = "sha256-jDuOcmKzZGU6L0aOfPKRGpDLbX0O9ueTufBy7Bd6KMU="; + rev = "refs/tags/v${version}"; + hash = "sha256-zXUwTG8cqAkY5MC1jAc2TtMgNMQPLc5nc22okVYP4ME="; }; nativeBuildInputs = [ From d3e35ef7c8a5b8ac9d010fe4af727752b22e7283 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 22:43:51 +0100 Subject: [PATCH 21/23] apacheHttpdPackages.mod_timestamp: add passthru.updateScript --- .../apache-modules/mod_timestamp/default.nix | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_timestamp/default.nix b/pkgs/servers/http/apache-modules/mod_timestamp/default.nix index d1d254c30b4b..1841cf8d369a 100644 --- a/pkgs/servers/http/apache-modules/mod_timestamp/default.nix +++ b/pkgs/servers/http/apache-modules/mod_timestamp/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, mod_ca, apr, aprutil }: +{ + apr, + aprutil, + directoryListingUpdater, + fetchurl, + lib, + mod_ca, + pkg-config, + stdenv, +}: stdenv.mkDerivation rec { pname = "mod_timestamp"; @@ -10,13 +19,23 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ mod_ca apr aprutil ]; + + buildInputs = [ + apr + aprutil + mod_ca + ]; + inherit (mod_ca) configureFlags installFlags; + passthru.updateScript = directoryListingUpdater { + url = "https://redwax.eu/dist/rs/"; + }; + meta = with lib; { description = "RedWax CA service module for issuing signed timestamps"; - homepage = "https://redwax.eu"; + changelog = "https://source.redwax.eu/projects/RS/repos/mod_timestamp/browse/ChangeLog"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ dirkx ]; From 4b042b57678a27708d152617f638c7aebec8a527 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 22:44:27 +0100 Subject: [PATCH 22/23] apacheHttpdPackages.mod_timestamp: 0.2.2 -> 0.2.3 https://redwax.eu/dist/rs/ChangeLog-mod_timestamp-0.2.3 --- .../http/apache-modules/mod_timestamp/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-modules/mod_timestamp/default.nix b/pkgs/servers/http/apache-modules/mod_timestamp/default.nix index 1841cf8d369a..1dbe4101dfe6 100644 --- a/pkgs/servers/http/apache-modules/mod_timestamp/default.nix +++ b/pkgs/servers/http/apache-modules/mod_timestamp/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "mod_timestamp"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { url = "https://redwax.eu/dist/rs/${pname}-${version}.tar.gz"; - sha256 = "1p18mgxx2ainfrc2wm27rl3lh6yl0ihx6snib60jnp694587bfwg"; + hash = "sha256-X49gJ1wQtwQT3GOZkluxdMIY2ZRpM9Y7DZln6Ag9DvM="; }; nativeBuildInputs = [ pkg-config ]; @@ -26,6 +26,11 @@ stdenv.mkDerivation rec { mod_ca ]; + env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ + "-Wno-error=int-conversion" + "-Wno-error=implicit-function-declaration" + ]); + inherit (mod_ca) configureFlags installFlags; passthru.updateScript = directoryListingUpdater { From fbbf8be029a2b054da72612b4e90619a3617f641 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 22:47:35 +0100 Subject: [PATCH 23/23] apacheHttpdPackages.mod_dnssd: fix meta.homepage --- pkgs/servers/http/apache-modules/mod_dnssd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix index 4f4236e91b58..7f574f9fd962 100644 --- a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix +++ b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "http://0pointer.de/lennart/projects/mod_dnssd"; + homepage = "https://0pointer.de/lennart/projects/mod_dnssd"; description = "Provide Zeroconf support via DNS-SD using Avahi"; license = licenses.asl20; platforms = platforms.linux;