Skip to content

keyutils: fix build for s390#219030

Merged
mweinelt merged 1 commit intoNixOS:stagingfrom
alyssais:keyutils-s390
Mar 4, 2023
Merged

keyutils: fix build for s390#219030
mweinelt merged 1 commit intoNixOS:stagingfrom
alyssais:keyutils-s390

Conversation

@alyssais
Copy link
Member

@alyssais alyssais commented Mar 1, 2023

Description of changes
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.

@alyssais alyssais changed the base branch from master to staging March 1, 2023 18:15
./0001-Remove-unused-function-after_eq.patch

# Fix build for s390-linux, where size_t is different from ptrdiff_t.
(fetchurl {
Copy link
Member

Choose a reason for hiding this comment

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

Did you try using fetchpatch?

Copy link
Member Author

Choose a reason for hiding this comment

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

  1. # Note: this package is used for bootstrapping fetchurl, and thus
    # cannot use fetchpatch! All mutable patches (generated by GitHub or
    # cgit) that are needed here should be included directly in Nixpkgs as
    # files.
  2. It's better to use fetchurl instead of fetchpatch for patches that aren't generated, and so won't change under us. It has fewer dependencies, and it doesn't depend on specifics of a single version of patchutils.

@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 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 Mar 1, 2023
@alyssais alyssais added the 6.topic: exotic Exotic hardware or software platform label Mar 2, 2023
@mweinelt mweinelt merged commit 8c859b5 into NixOS:staging Mar 4, 2023
@alyssais alyssais deleted the keyutils-s390 branch March 9, 2023 19:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: exotic Exotic hardware or software platform 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 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

Development

Successfully merging this pull request may close these issues.

3 participants