Skip to content

[staging] perl: 5.36.0 -> 5.38.0#241848

Merged
mweinelt merged 12 commits intoNixOS:stagingfrom
stigtsp:perl/5.38.0
Jul 27, 2023
Merged

[staging] perl: 5.36.0 -> 5.38.0#241848
mweinelt merged 12 commits intoNixOS:stagingfrom
stigtsp:perl/5.38.0

Conversation

@stigtsp
Copy link
Member

@stigtsp stigtsp commented Jul 6, 2023 •
edited
Loading

Description of changes

Patches:

  • Add patches from perl: fix modules for compatibility with miniperl #225640 by @ck3d to support Module::Build and friends for cross-compilation, modify them to work with 5.38.0
  • Update no-sys-dirs patch for 5.38.0
  • Only apply HTTP-Tiny patch for 5.36.1, as it is fixed in 5.38.0
  • Set USE_ZLIB_NG=False for Compress::Raw::Zlib

Related:

  • slimserver: replace perl534Packages with perlPackages (builds - but untested)
  • unit: add perl538 as default, remove perl534
  • perlPackages.TestWithoutModule: 0.20 -> 0.21
  • perlPackages.TestTrap: 0.3.4 -> 0.3.5
  • perlPackages.TestSimple13: 1.302183 -> 1.302195
  • perlPackages.MIMECharset: 1.012.2 -> 1.013.1
  • perlPackages.BKeywords: 1.24 -> 1.26
  • perlPackages.XSParseKeyword: 0.25 -> 0.34
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin

Build Tests:

  • nix-build -A pkgsCross.aarch64-multiplatform.perlPackages.ModuleBuild OK
  • nix-build -A pkgsCross.aarch64-multiplatform.perl536Packages.ModuleBuild OK
  • nix-build -A pkgsCross.aarch64-multiplatform.xdg-utils OK
  • nix-build -A hydra-unstable OK
  • nix-build -A convos OK

@stigtsp stigtsp mentioned this pull request Jul 6, 2023
Closed
@stigtsp stigtsp marked this pull request as ready for review July 6, 2023 09:23
@stigtsp stigtsp requested review from dasJ and zakame as code owners July 6, 2023 09:23
@stigtsp stigtsp requested a review from ck3d July 6, 2023 09:24
@stigtsp stigtsp mentioned this pull request Jul 6, 2023
Closed
12 tasks
@ofborg ofborg bot added ofborg-internal-error Ofborg encountered an error 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jul 6, 2023
@stigtsp stigtsp removed the ofborg-internal-error Ofborg encountered an error label Jul 6, 2023
@mweinelt
Copy link
Member

mweinelt commented Jul 6, 2023

I already prepared the libxcrypt update in #241779.

@stigtsp
Copy link
Member Author

stigtsp commented Jul 6, 2023

I already prepared the libxcrypt update in #241779.

The patch is not in 4.4.6 though, but looks like they are about to release 4.4.7?

@mweinelt
Copy link
Member

mweinelt commented Jul 6, 2023

image

Pretty sure it is.

@stigtsp
Copy link
Member Author

stigtsp commented Jul 6, 2023

Pretty sure it is.

You are indeed correct! :-)

stigtsp and others added 8 commits July 6, 2023 14:14
@stigtsp
perl: 5.36.0 -> 5.38.0
f416214 
- perl538: init at 5.38.0
- perl536: 5.36.0 -> 5.36.1
- perl-cross: c8760457 -> 1.5
- perl: perl536 -> perl538
- perlPackages: perl536Packages -> perl538Packages
- perldevel: 5.37.0 -> 5.38.0
- perl534: remove

- patch: Add conditional no-sys-dirs patch for 5.38.0
- patch: Only apply HTTP-Tiny patch for 5.36.1, as it is fixed in 5.38.0
- patch: Set `USE_ZLIB_NG=False` for Compress::Raw::Zlib
@stigtsp
unit: add perl538 as default, remove perl534
5173b56
@stigtsp
slimserver: replace perl534Packages with perlPackages
ae7c95e
@ck3d @stigtsp
perl.mini: fix modules for compatibility with miniperl
c7387bb 
Added compatibility for

- CPAN::Meta
- JSON::PP
- Data::Dumper
@ck3d @stigtsp
perlPackages.ModuleBuild: fix cross-compilation
c865c30
@stigtsp
perlPackages.BKeywords: 1.24 -> 1.26
c16e614
@stigtsp
perlPackages.MIMECharset: 1.012.2 -> 1.013.1
4da042f
@stigtsp
perlPackages.TestSimple13: 1.302183 -> 1.302195
b99636d
@stigtsp stigtsp changed the title perl: 5.36.0 -> 5.38.0 [staging] perl: 5.36.0 -> 5.38.0 Jul 14, 2023
@stigtsp stigtsp added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Jul 24, 2023
@stigtsp stigtsp requested review from mweinelt and vcunat July 26, 2023 22:51
@mweinelt mweinelt merged commit fd5d030 into NixOS:staging Jul 27, 2023
@magneticflux-
Copy link
Contributor

magneticflux- commented Aug 20, 2023

@stigtsp Was there an incompatibility with enableParallelBuilding from the other changes? As far as I know, Perl still supports parallel builds with make -jN according to various build instructions.

@datafoo datafoo mentioned this pull request Dec 20, 2023
Open
@Atemu
Copy link
Member

Atemu commented Feb 29, 2024

@stigtsp could you explain the necessity for disabling enableParallelBuilding in non-cross circumstances?

@stigtsp
Copy link
Member Author

stigtsp commented Feb 29, 2024

@Atemu @magneticflux- Sorry for the late response, the specifics for this is a bit lost in time for me.

I'm not aware of any reason why parallel builds shouldn't work, but vaguely remember having some problems with it when testing builds locally.

@stigtsp stigtsp mentioned this pull request Mar 1, 2024
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@zakame zakame Awaiting requested review from zakame

@dasJ dasJ Awaiting requested review from dasJ

@ck3d ck3d Awaiting requested review from ck3d

@vcunat vcunat Awaiting requested review from vcunat

@mweinelt mweinelt Awaiting requested review from mweinelt

Assignees

No one assigned

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch.

Projects

No open projects
Staging
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@stigtsp @mweinelt @magneticflux- @Atemu @ck3d