Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

{pv,mosh}: fix on aarch64-darwin #137605

Merged
merged 3 commits into from
Sep 13, 2021
Merged

{pv,mosh}: fix on aarch64-darwin #137605

merged 3 commits into from
Sep 13, 2021

Conversation

emilazy
Copy link
Member

@emilazy emilazy commented Sep 13, 2021

Motivation for this change

These fix some trivial incompatibilities with the Apple Silicon toolchain using patches that are already in Homebrew.

I also bumped the (tragically orphaned for >2 years) pv package while I was at it.

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 via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 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.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Sep 13, 2021
@ofborg ofborg bot requested a review from viric September 13, 2021 03:43
@r-rmcgibbo
Copy link

Result of nixpkgs-review pr 137605 at 97813ef8 run on aarch64-linux 1

3 packages built successfully:
  • mosh
  • pv
  • sanoid
1 suggestion:
  • warning: maintainers-missing

    Package does not have a maintainer. Consider adding yourself?

    Near pkgs/tools/misc/pv/default.nix:27:5:

       |
27 |     maintainers = with lib.maintainers; [ ];
   |     ^

@emilazy
pv: 1.6.6 -> 1.6.20
765dd20
@emilazy
pv: fix on aarch64-darwin
a48dff9 
Homebrew carries a patch that has been sent upstream. Since it's
designed to be suitable for inclusion as-is and strictly improves
correctness, we just apply it unconditionally on all platforms.
@emilazy
mosh: fix on aarch64-darwin
0ce7438 
The build failure here is not due to Apple Silicon per se but instead
an artifact of the aarch64-darwin toolchain using a newer version of the
Xcode SDK as a basis. This causes issues building on case-insensitive
filesystems due to the collision between the standard <version> header
and a mosh source file called VERSION.

Fix with a MacPorts backport of an upstream mosh commit, via Homebrew.
@emilazy emilazy force-pushed the aarch64-darwin-fixes branch from 97813ef to 0ce7438 Compare September 13, 2021 04:42
kloenk
kloenk approved these changes Sep 13, 2021
View reviewed changes
Copy link
Member

@kloenk kloenk left a comment

Choose a reason for hiding this comment

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

pv works on aarch64 and via rosetta on x86_64, mosh does build under aarch64, only testit it briefly though.

@domenkozar domenkozar merged commit 7a36468 into NixOS:master Sep 13, 2021
@bobby285271 bobby285271 mentioned this pull request Sep 24, 2022
Merged
13 tasks
@emilazy emilazy mentioned this pull request Jun 20, 2023
Closed
@emilazy emilazy deleted the aarch64-darwin-fixes branch August 26, 2024 01:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Luflosi Luflosi Luflosi left review comments

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@kloenk kloenk kloenk approved these changes

@viric viric Awaiting requested review from viric

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@emilazy @r-rmcgibbo @SuperSandro2000 @kloenk @Luflosi @domenkozar