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.

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

difftastic: fix build on x86_64-darwin #316950

Merged
merged 1 commit into from
Jun 3, 2024
Merged

Conversation

konradmalik
Copy link
Contributor

@konradmalik konradmalik commented Jun 3, 2024

closes #315634

a regression introduced in: a84abaa

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

Add a 👍 reaction to pull requests you find important.

@konradmalik konradmalik marked this pull request as ready for review June 3, 2024 16:08
Copy link
Contributor

@drupol drupol left a comment

Choose a reason for hiding this comment

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

Hi,

Thank you for addressing the issue introduced in PR #314533 by @matthiasbeyer. I hope this serves as a lesson regarding the importance of avoiding self-merging PRs in the future.

I've left some comments. Please let me know if anything needs further clarification.

pkgs/tools/text/difftastic/default.nix Outdated Show resolved Hide resolved
pkgs/tools/text/difftastic/default.nix Show resolved Hide resolved
@eclairevoyant eclairevoyant removed their request for review June 3, 2024 17:39
@eclairevoyant
Copy link
Contributor

don't have a darwin machine, so I don't feel I can review this

@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Jun 3, 2024
@drupol drupol merged commit 26c40e2 into NixOS:master Jun 3, 2024
26 of 27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Build failure: difftastic
3 participants