diff options
| -rw-r--r-- | pkgs/development/perl-modules/mod_perl2-PL_hash_seed.patch | 13 | ||||
| -rw-r--r-- | pkgs/servers/http/apache-modules/mod_perl/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 11 |
3 files changed, 5 insertions, 28 deletions
diff --git a/pkgs/development/perl-modules/mod_perl2-PL_hash_seed.patch b/pkgs/development/perl-modules/mod_perl2-PL_hash_seed.patch deleted file mode 100644 index a8aac88de319d..0000000000000 --- a/pkgs/development/perl-modules/mod_perl2-PL_hash_seed.patch +++ /dev/null @@ -1,13 +0,0 @@ -From https://github.com/Perl/perl5/issues/18617#issuecomment-822056978 by Leont - ---- a/src/modules/perl/modperl_perl.c -+++ a/src/modules/perl/modperl_perl.c -@@ -268,7 +268,7 @@ - #ifdef MP_NEED_HASH_SEED_FIXUP - if (MP_init_hash_seed_set) { - #if MP_PERL_VERSION_AT_LEAST(5, 17, 6) -- memcpy(&PL_hash_seed, &MP_init_hash_seed, -+ memcpy(PL_hash_seed, &MP_init_hash_seed, - sizeof(PL_hash_seed) > sizeof(MP_init_hash_seed) ? - sizeof(MP_init_hash_seed) : sizeof(PL_hash_seed)); - PL_hash_seed_set = MP_init_hash_seed_set; diff --git a/pkgs/servers/http/apache-modules/mod_perl/default.nix b/pkgs/servers/http/apache-modules/mod_perl/default.nix index e511429bfc447..bbb38eb969bd2 100644 --- a/pkgs/servers/http/apache-modules/mod_perl/default.nix +++ b/pkgs/servers/http/apache-modules/mod_perl/default.nix @@ -2,18 +2,13 @@ stdenv.mkDerivation rec { pname = "mod_perl"; - version = "2.0.11"; + version = "2.0.12"; src = fetchurl { url = "mirror://apache/perl/${pname}-${version}.tar.gz"; - sha256 = "0x3gq4nz96y202cymgrf56n8spm7bffkd1p74dh9q3zrrlc9wana"; + sha256 = "sha256-9bghtZsP3JZw5G7Q/PMtiRHyUSYYmotowWUvkiHu4mk="; }; - patches = [ - # Fix build on perl-5.34.0, https://github.com/Perl/perl5/issues/18617 - ../../../../development/perl-modules/mod_perl2-PL_hash_seed.patch - ]; - buildInputs = [ apacheHttpd perl ]; buildPhase = '' perl Makefile.PL \ diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e920d570ff713..7b2cfb4762284 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -15732,17 +15732,12 @@ let mod_perl2 = buildPerlPackage { pname = "mod_perl"; - version = "2.0.11"; + version = "2.0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.11.tar.gz"; - hash = "sha256-yiqeGM35D5xgI+eGNp1bp16NrCkuv+qZAMKb9C3Bb3Q="; + url = "mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.12.tar.gz"; + hash = "sha256-9bghtZsP3JZw5G7Q/PMtiRHyUSYYmotowWUvkiHu4mk="; }; - patches = [ - # Fix build on perl-5.34.0, https://github.com/Perl/perl5/issues/18617 - ../development/perl-modules/mod_perl2-PL_hash_seed.patch - ]; - makeMakerFlags = "MP_AP_DESTDIR=$out"; buildInputs = [ pkgs.apacheHttpd ]; doCheck = false; # would try to start Apache HTTP server |