Skip to content

cpio: 2.13 -> 2.14#229377

Merged
risicle merged 1 commit intoNixOS:stagingfrom
eliasnaur:cpio-2.14
May 6, 2023
Merged

cpio: 2.13 -> 2.14#229377
risicle merged 1 commit intoNixOS:stagingfrom
eliasnaur:cpio-2.14

Conversation

@eliasnaur
Copy link
Contributor

@eliasnaur eliasnaur commented May 1, 2023

Description of changes

Changelog: https://git.savannah.gnu.org/cgit/cpio.git/tree/NEWS

Personally, I'm interested in the hard link fix to --reproducible.

Question for reviewers: is the cygwin patch,

  preConfigure = lib.optionalString stdenv.isCygwin ''
    sed -i gnu/fpending.h -e 's,include <stdio_ext.h>,,'
  '';

still necessary? I don't see a gnu/fpending.h file in the tarball.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@eliasnaur eliasnaur changed the title cpio: upgrade to 2.14 cpio: 2.13 -> 2.14 May 1, 2023
@ofborg ofborg bot added 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 May 2, 2023
@eliasnaur eliasnaur changed the base branch from master to staging May 2, 2023 03:34
@eliasnaur eliasnaur mentioned this pull request May 2, 2023
Merged
12 tasks
LeSuisse
LeSuisse reviewed May 4, 2023
View reviewed changes
Copy link
Member

@LeSuisse LeSuisse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Question for reviewers: is the cygwin patch,

  preConfigure = lib.optionalString stdenv.isCygwin ''
    sed -i gnu/fpending.h -e 's,include <stdio_ext.h>,,'
  '';

still necessary? I don't see a gnu/fpending.h file in the tarball.

Are you sure? I'm seeing the file and patched content is present in the file in the tarball.

@eliasnaur
Copy link
Contributor Author

eliasnaur commented May 5, 2023

Question for reviewers: is the cygwin patch,

  preConfigure = lib.optionalString stdenv.isCygwin ''
    sed -i gnu/fpending.h -e 's,include <stdio_ext.h>,,'
  '';

still necessary? I don't see a gnu/fpending.h file in the tarball.

Are you sure? I'm seeing the file and patched content is present in the file in the tarball.

You're right, I was looking in the source tarball, not the release tarball.

risicle
risicle approved these changes May 6, 2023
View reviewed changes
Copy link
Contributor

@risicle risicle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Built rpm on nixos x86_64, git.tests.withInstallCheck on macos 10.15 & nixos x86_64. Built pkgsStatic variant, pkgsMusl variant, pkgsCross.aarch64-multiplatform variant. Builds on aarch64-linux.

@risicle risicle merged commit 5303a4d into NixOS:staging May 6, 2023
@eliasnaur eliasnaur deleted the cpio-2.14 branch May 6, 2023 13:26
@risicle risicle mentioned this pull request May 6, 2023
Merged
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@LeSuisse LeSuisse LeSuisse left review comments

@risicle risicle risicle approved these changes

Assignees

No one assigned

Labels

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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@eliasnaur @LeSuisse @risicle